From: didg <didg>
Date: Mon, 14 Sep 2009 01:24:40 +0000 (+0000)
Subject: remove 'ISO C90 forbids mixed declarations and code' warning
X-Git-Tag: before-ipv6~127
X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4fe195ce5bf4dd149e9a175a4efc83c500105ec0;hp=3adfc34b14bf40a472c82eb328b9c3160df7e127;p=netatalk.git

remove 'ISO C90 forbids mixed declarations and code' warning
---

diff --git a/bin/cnid/ad_ls.c b/bin/cnid/ad_ls.c
index 58ab5d99..ab1385a6 100644
--- a/bin/cnid/ad_ls.c
+++ b/bin/cnid/ad_ls.c
@@ -1,5 +1,5 @@
 /* 
-   $Id: ad_ls.c,v 1.1 2009-09-01 14:28:07 franklahm Exp $
+   $Id: ad_ls.c,v 1.2 2009-09-14 01:24:40 didg Exp $
 
    Copyright (c) 2009 Frank Lahm <franklahm@gmail.com>
    
@@ -184,6 +184,8 @@ static void print_flags(char *path, afpvol_t *vol, const struct stat *st)
     uint16_t AFPattributes;
     char type[5] = "----";
     char creator[5] = "----";
+    int i;
+    uint32_t cnid;
 
     if (S_ISDIR(st->st_mode))
         adflags = ADFLAGS_DIR;
@@ -319,7 +321,6 @@ static void print_flags(char *path, afpvol_t *vol, const struct stat *st)
     printf(" %s ", labels[(FinderFlags & FINDERINFO_COLOR) >> 1]);
 
     /* Type & Creator */
-    int i;
     for(i=0; i<4; i++) {
         if (isalnum(type[i]))
             putchar(type[i]);
@@ -336,7 +337,7 @@ static void print_flags(char *path, afpvol_t *vol, const struct stat *st)
     putchar(' '); 
 
     /* CNID */
-    uint32_t cnid = ad_forcegetid(&ad);
+    cnid = ad_forcegetid(&ad);
     if (cnid)
         printf(" %10u ", ntohl(cnid));
     else
@@ -584,10 +585,11 @@ int ad_ls(int argc, char **argv)
         freevol(&vol);
     }
     else {
+        int havefile = 0;
+
         firstarg = optind;
 
         /* First run: only print files from argv paths */
-        int havefile = 0;
         while(optind < argc) {
             if (stat(argv[optind], &st) != 0)
                 goto next;
diff --git a/etc/cnid_dbd/cmd_dbd.c b/etc/cnid_dbd/cmd_dbd.c
index 86ff5ec4..ef79b5f9 100644
--- a/etc/cnid_dbd/cmd_dbd.c
+++ b/etc/cnid_dbd/cmd_dbd.c
@@ -1,5 +1,5 @@
 /* 
-   $Id: cmd_dbd.c,v 1.6 2009-09-03 08:35:15 franklahm Exp $
+   $Id: cmd_dbd.c,v 1.7 2009-09-14 01:24:40 didg Exp $
 
    Copyright (c) 2009 Frank Lahm <franklahm@gmail.com>
    
@@ -275,6 +275,7 @@ int main(int argc, char **argv)
     dbd_flags_t flags = 0;
     char *volpath;
     struct volinfo volinfo;
+    int cdir;
 
     if (geteuid() != 0) {
         usage();
@@ -334,7 +335,6 @@ int main(int argc, char **argv)
     volpath = argv[optind];
 
     /* Remember cwd */
-    int cdir;
     if ((cdir = open(".", O_RDONLY)) < 0) {
         dbd_log( LOGSTD, "Can't open dir: %s", strerror(errno));
         exit(EXIT_FAILURE);
diff --git a/libatalk/util/logger.c b/libatalk/util/logger.c
index 97fd32a2..30cc4739 100644
--- a/libatalk/util/logger.c
+++ b/libatalk/util/logger.c
@@ -150,6 +150,7 @@ static void generate_message_details(char *message_details_buffer,
     int    templen;
     int    len = message_details_buffer_length;
     struct timeval tv;
+    pid_t  pid;
 
     *ptr = 0;
 
@@ -171,7 +172,7 @@ static void generate_message_details(char *message_details_buffer,
     ptr += templen;
 
     /* PID */
-    pid_t pid = getpid();
+    pid = getpid();
     templen = snprintf(ptr, len, "[%d]", pid);
     len -= templen;
     ptr += templen;