From: Wilfried Göesgens <willi@citadel.org>
Date: Mon, 26 Feb 2007 23:54:54 +0000 (+0000)
Subject: * fix some warnings
X-Git-Tag: v7.86~3553
X-Git-Url: https://code.citadel.org/?p=citadel.git;a=commitdiff_plain;h=566a76281118d7433b3266c747879f166b38e50f

* fix some warnings
* install locales as the last, because of this may fail
---

diff --git a/webcit/Makefile.in b/webcit/Makefile.in
index 73afa4ef3..259ac6701 100644
--- a/webcit/Makefile.in
+++ b/webcit/Makefile.in
@@ -90,7 +90,7 @@ $(srcdir)/configure: $(srcdir)/configure.ac $(srcdir)/aclocal.m4
 $(srcdir)/aclocal.m4: $(srcdir)/acinclude.m4
 	cd $(srcdir) && $(ACLOCAL)
 
-install:  install-bin install-setupbin install-locale install-wwwdata install-tinymce
+install:  install-bin install-setupbin install-wwwdata install-tinymce install-locale
 
 install-bin:
 	test -d $(DESTDIR)$(prefix) || mkdir -p $(DESTDIR)$(prefix)
diff --git a/webcit/tools.c b/webcit/tools.c
index f6ef5088d..bf3578122 100644
--- a/webcit/tools.c
+++ b/webcit/tools.c
@@ -516,10 +516,10 @@ int CtdlDecodeBase64(char *dest, const char *source, size_t length)
 void generate_uuid(char *buf) {
 	static int seq = 0;
 
-	sprintf(buf, "%s-%lx-%x-%x",
+	sprintf(buf, "%s-%lx-%lx-%x",
 		serv_info.serv_nodename,
 		(long)time(NULL),
-		getpid(),
+		(long)getpid(),
 		(seq++)
 	);
 }
diff --git a/webcit/webserver.c b/webcit/webserver.c
index 78ee06f31..ff6f9c707 100644
--- a/webcit/webserver.c
+++ b/webcit/webserver.c
@@ -519,7 +519,7 @@ void start_daemon(char *pid_file)
 			if (pid_file) {
 				fp = fopen(pid_file, "w");
 				if (fp != NULL) {
-					fprintf(fp, "%d\n", current_child);
+					fprintf(fp, "%ld\n", current_child);
 					fclose(fp);
 				}
 			}