C warning cleanup

diff --git a/IkiWiki/Wrapper.pm b/IkiWiki/Wrapper.pm
index 5427a5c80b1f0762775231eadb9663b6f8841d2f..830b0487734e352fe4b6c2585616c480d794713a 100644 (file)
--- a/IkiWiki/Wrapper.pm
+++ b/IkiWiki/Wrapper.pm
@@ -76,8 +76,8 @@ EOF
        {
                int fd=open("$config{wikistatedir}/cgilock", O_CREAT | O_RDWR, 0666);
                if (fd != -1 && flock(fd, LOCK_EX) == 0) {
        {
                int fd=open("$config{wikistatedir}/cgilock", O_CREAT | O_RDWR, 0666);
                if (fd != -1 && flock(fd, LOCK_EX) == 0) {

-                       char *fd_s;
-                       asprintf(&fd_s, "%i", fd);
+                       char *fd_s=malloc(8);
+                       sprintf(fd_s, "%i", fd);

                        setenv("IKIWIKI_CGILOCK_FD", fd_s, 1);
                }
        }
                        setenv("IKIWIKI_CGILOCK_FD", fd_s, 1);
                }
        }


@@ -105,7 +105,7 @@ extern char **environ;
 char *newenviron[$#envsave+6];
 int i=0;
 
 char *newenviron[$#envsave+6];
 int i=0;
 

-addenv(char *var, char *val) {
+void addenv(char *var, char *val) {

        char *s=malloc(strlen(var)+1+strlen(val)+1);
        if (!s)
                perror("malloc");
        char *s=malloc(strlen(var)+1+strlen(val)+1);
        if (!s)
                perror("malloc");