Various small cleanups

Author: Clifford Wolf

cfgfile_parser.y

@@ -24,6 +24,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <fnmatch.h>
+#include <ctype.h>
 
 struct csync_group  *csync_group  = 0;
 struct csync_prefix *csync_prefix = 0;

check.c

@@ -163,7 +163,7 @@ int csync_check_mod(const char *file, int recursive, int ignnoent, int init_run)
 	}
 
 	if ( check_type>0 && lstat(prefixsubst(file), &st) != 0 ) {
-		if ( ignnoent ) return;
+		if ( ignnoent ) return 0;
 		csync_fatal("This should not happen: "
 				"Can't stat %s.\n", file);
 	}

conn.c

@@ -109,7 +109,7 @@ static int dummy_ssl_verify_callback(int preverify_ok, X509_STORE_CTX *x509_ctx)
 
 int conn_activate_ssl(int role)
 {
-	static sslinit = 0;
+	static int sslinit = 0;
 
 	if (conn_usessl)
 		return 0;

csync2.c

@@ -35,6 +35,7 @@
 #include <assert.h>
 #include <errno.h>
 #include <signal.h>
+#include <ctype.h>
 
 #ifdef REAL_DBDIR
 #  undef DBDIR

csync2.h

@@ -77,6 +77,7 @@ extern int conn_write(const void *buf, size_t count);
 
 extern void conn_printf(const char *fmt, ...);
 extern int conn_fgets(char *s, int size);
+extern int conn_gets(char *s, int size);
 
 
 /* db.c */

error.c

@@ -24,6 +24,8 @@
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
+#include <sys/types.h>
+#include <unistd.h>
 
 long csync_last_printtime = 0;
 FILE *csync_timestamp_out = 0;
@@ -47,7 +49,7 @@ void csync_printtime()
 			strftime(ftbuffer, 128, "%Y-%m-%d %H:%M:%S %Z (GMT%z)", localtime(&now));
 
 			if (csync_timestamp_out)
-				fprintf(csync_timestamp_out, "<%d> TIMESTAMP: %s\n", getpid(), ftbuffer);
+				fprintf(csync_timestamp_out, "<%d> TIMESTAMP: %s\n", (int)getpid(), ftbuffer);
 
 			if (csync_timestamps) {
 				if (csync_server_child_pid)
@@ -70,7 +72,7 @@ void csync_printtotaltime()
 
 		if (csync_timestamp_out)
 			fprintf(csync_timestamp_out, "<%d> TOTALTIME: %d:%02d:%02d\n",
-				getpid(), seconds / (60*60), (seconds/60) % 60, seconds % 60);
+				(int)getpid(), seconds / (60*60), (seconds/60) % 60, seconds % 60);
 
 		if (csync_timestamps) {
 			if (csync_server_child_pid)

rsync.c

@@ -112,7 +112,7 @@ int csync_recv_file(FILE *out)
 
 int csync_rs_check(const char *filename, int isreg)
 {
-	FILE *basis_file, *sig_file;
+	FILE *basis_file = 0, *sig_file = 0;
 	char buffer1[512], buffer2[512];
 	int rc, chunk, found_diff = 0;
 	int backup_errno;

update.c

@@ -259,7 +259,6 @@ void csync_update_file_del(const char *peername,
 
 got_error:
 	if (auto_resolve_run)
-got_error_in_autoresolve:
 		csync_debug(0, "ERROR: Auto-resolving failed. Giving up.\n");
 	csync_debug(1, "File stays in dirty state. Try again later...\n");
 }