Mon Dec 13 18:58:16 PST 2004
- Previous message: [Slony1-commit] By darcyb: Remove a not yet commited thread from building
- Next message: [Slony1-commit] By darcyb: Some more minor cleanups in the build environment, make
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
Log Message:
-----------
Cleanup some more compiler warnings
Modified Files:
--------------
slony1-engine/src/slon:
slon.c (r1.37 -> r1.38)
confoptions.c (r1.8 -> r1.9)
confoptions.h (r1.9 -> r1.10)
-------------- next part --------------
Index: confoptions.h
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/src/slon/confoptions.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -Lsrc/slon/confoptions.h -Lsrc/slon/confoptions.h -u -w -r1.9 -r1.10
--- src/slon/confoptions.h
+++ src/slon/confoptions.h
@@ -173,6 +173,7 @@
#endif
NULL
};
+
static struct config_bool ConfigureNamesBool[] =
{
{
Index: confoptions.c
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/src/slon/confoptions.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -Lsrc/slon/confoptions.c -Lsrc/slon/confoptions.c -u -w -r1.8 -r1.9
--- src/slon/confoptions.c
+++ src/slon/confoptions.c
@@ -302,10 +302,8 @@
static struct config_generic *
find_option(const char *name, int elevel)
{
- const char *dot;
const char **key = &name;
struct config_generic **res;
- int i;
res = (struct config_generic **)
bsearch((void *)&key,
@@ -314,8 +312,14 @@
sizeof(struct config_generic *),
conf_var_compare);
if (res)
+ {
return *res;
}
+ else
+ {
+ return NULL;
+ }
+}
static int
conf_var_compare(const void *a, const void *b)
Index: slon.c
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/src/slon/slon.c,v
retrieving revision 1.37
retrieving revision 1.38
diff -Lsrc/slon/slon.c -Lsrc/slon/slon.c -u -w -r1.37 -r1.38
--- src/slon/slon.c
+++ src/slon/slon.c
@@ -69,7 +69,6 @@
int errors = 0;
extern int optind;
extern char *optarg;
- int group_size_set = 0;
InitializeConfOptions();
- Previous message: [Slony1-commit] By darcyb: Remove a not yet commited thread from building
- Next message: [Slony1-commit] By darcyb: Some more minor cleanups in the build environment, make
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
More information about the Slony1-commit mailing list