CVS User Account cvsuser
Fri Sep 24 23:33:47 PDT 2004
Log Message:
-----------
Opps copy/paste function prototypeing is bad mojo, fix complier warnings and make work in the process

Modified Files:
--------------
    slony1-engine/src/slon:
        confoptions.c (r1.2 -> r1.3)
        confoptions.h (r1.2 -> r1.3)

-------------- next part --------------
Index: confoptions.h
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/src/slon/confoptions.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -Lsrc/slon/confoptions.h -Lsrc/slon/confoptions.h -u -w -r1.2 -r1.3
--- src/slon/confoptions.h
+++ src/slon/confoptions.h
@@ -169,7 +169,7 @@
 #endif
         NULL
 };
-static struct config_int ConfigureNamesBool[] =
+static struct config_bool ConfigureNamesBool[] =
 {
         {
                 {
@@ -194,7 +194,7 @@
 	NULL
 };
 
-static struct config_int ConfigureNamesReal[] =
+static struct config_real ConfigureNamesReal[] =
 {
         {
                 {
@@ -211,7 +211,7 @@
         NULL
 };
 
-static struct config_int ConfigureNamesString[] =
+static struct config_string ConfigureNamesString[] =
 {
         {
                 {
Index: confoptions.c
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/src/slon/confoptions.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -Lsrc/slon/confoptions.c -Lsrc/slon/confoptions.c -u -w -r1.2 -r1.3
--- src/slon/confoptions.c
+++ src/slon/confoptions.c
@@ -1,4 +1,5 @@
 #include <pthread.h>
+#include <string.h>
 #include "libpq-fe.h"
 #include "confoptions.h"
 #include "postgres.h"
@@ -164,14 +165,14 @@
 			}
 		case SLON_C_REAL:
 			{
-				struct config_int *conf = (struct config_int *) gconf;
+				struct config_real *conf = (struct config_real *) gconf;
 				*conf->variable = conf->default_val;
 				break;
 			}
 		case SLON_C_STRING:
 			{
 				char           *str;
-				struct config_int *conf = (struct config_int *) gconf;
+				struct config_string *conf = (struct config_string *) gconf;
 				*conf->variable = NULL;
 				if (conf->default_val)
 				{


More information about the Slony1-commit mailing list