[Apcupsd-commits] apcupsd/src/lib apcconfig.c,1.20,1.21

[Adam K. <ad...@us...>]

Update of /cvsroot/apcupsd/apcupsd/src/lib
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv403/src/lib

Modified Files:
	apcconfig.c 
Log Message:
Move structure definitions to where they're actually used and eliminate
another unused struct.


Index: apcconfig.c
===================================================================
RCS file: /cvsroot/apcupsd/apcupsd/src/lib/apcconfig.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- apcconfig.c	23 Feb 2006 01:49:08 -0000	1.20
+++ apcconfig.c	23 Feb 2006 01:56:40 -0000	1.21
@@ -30,6 +30,8 @@
 
 /* ---------------------------------------------------------------------- */
 
+typedef int (HANDLER) (UPSINFO *, int, const GENINFO *, const char *);
+
 static HANDLER match_int, match_range, match_str;
 static HANDLER match_facility, match_index;
 static HANDLER obsolete;
@@ -115,6 +117,13 @@
    { NULL,       "*invalid-ups-type*",  NO_UPS },
 };
 
+typedef struct {
+   const char *key;
+   HANDLER *handler;
+   size_t offset;
+   const GENINFO *values;
+} PAIRS;
+
 static const PAIRS table[] = {
 
    /* General parameters */