* fix some warnings

* install locales as the last, because of this may fail

diff --git a/webcit/Makefile.in b/webcit/Makefile.in
index 73afa4ef32159e5ef86a002dc3c0d66e2d10309b..259ac670129546ac84170e1db84adc40e669ae6e 100644 (file)
--- 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 f6ef5088d5a0cfe9ec04445eb0664e6a2f3a2789..bf3578122c6a0aed316a019e4fc6e116904689f4 100644 (file)
--- 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 78ee06f3153c58a9c6c385b2f95630e36e8fb28c..ff6f9c70756664e77e8e48d0c865ed19cd605000 100644 (file)
--- 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);
                                }
                        }