CVS User Account cvsuser
Wed May 25 17:16:05 PDT 2005
Log Message:
-----------
Changes from Neil Conway:

This patch fixes various issues that crop up compiling with -Wall:

- include parser/keywords.h in backend/slony1_funcs.c, to make the declaration of ScanKeywordLookup visible

- make write_void_log() return void -- it's return value has never used,  and in any case write_void_log() didn't actually return a value

- include <sys/wait.h> in slon/slon.c, which is needed to make the declaration of wait(2) visible

- add a missing return statement to slonik_repair_config() in slonik/slonik.c

- initialize the return value of close_log_archive() properly in slon/remote_worker.c

- remove some unused variable declarations

- fix `elevel' in slon/configoptions.c:set_config_option() and get_config_option(). get_config_option() did not initialize `elevel', and set_config_option() initialized it incorrectly: find_option() takes a Postgres error level (e.g. WARNING), not a Slony error level (e.g. SLON_WARN).

Modified Files:
--------------
    slony1-engine/src/slonik:
        slonik.c (r1.41 -> r1.42)

-------------- next part --------------
Index: slonik.c
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/src/slonik/slonik.c,v
retrieving revision 1.41
retrieving revision 1.42
diff -Lsrc/slonik/slonik.c -Lsrc/slonik/slonik.c -u -w -r1.41 -r1.42
--- src/slonik/slonik.c
+++ src/slonik/slonik.c
@@ -44,6 +44,7 @@
 static SlonikAdmInfo *get_adminfo(SlonikStmt * stmt, int no_id);
 static SlonikAdmInfo *get_active_adminfo(SlonikStmt * stmt, int no_id);
 static SlonikAdmInfo *get_checked_adminfo(SlonikStmt * stmt, int no_id);
+static int slonik_repair_config(SlonikStmt_repair_config * stmt);
 
 
 static int	script_check(SlonikScript * script);
@@ -1966,9 +1967,10 @@
 	}
 
 	dstring_free(&query);
+    return 0;
 }
 
-int
+static int
 slonik_repair_config(SlonikStmt_repair_config * stmt)
 {
 	SlonikAdmInfo *adminfo1;


More information about the Slony1-commit mailing list