Avoid mixing statements and declarations (#147)

git-svn-id: svn+ssh://projects.linpro.no/svn/varnish/trunk@1823 d4fa192b-c00b-0410-8231-f00ffab90ce4

diff --git a/varnish-cache/bin/varnishadm/varnishadm.c b/varnish-cache/bin/varnishadm/varnishadm.c
index e4da169995a26e034f182151967dbe0323015113..886d942193f2dbff3378804836f61df4b1689e78 100644 (file)
--- a/varnish-cache/bin/varnishadm/varnishadm.c
+++ b/varnish-cache/bin/varnishadm/varnishadm.c
@@ -51,6 +51,7 @@ telnet_mgt(const char* T_arg, int argc, char* argv[])
        struct vss_addr **ta;
        char *addr, *port;
        int i, n;
+       int sock;
        long status, bytes;
        char *answer = NULL;
        char buf[13];
@@ -65,7 +66,7 @@ telnet_mgt(const char* T_arg, int argc, char* argv[])
                exit(2);
        }
        
-       int sock = VSS_connect(ta[0]);
+       sock = VSS_connect(ta[0]);
        
        for (i = 0; i < n; ++i) {
                free(ta[i]);

diff --git a/varnish-cache/bin/varnishd/storage_file.c b/varnish-cache/bin/varnishd/storage_file.c
index dc1da9cb576f601ddd8889ca4a1971e48db2e6c5..9ade7be0d30556ed5405d435413fca8bd3e6191c 100644 (file)
--- a/varnish-cache/bin/varnishd/storage_file.c
+++ b/varnish-cache/bin/varnishd/storage_file.c
@@ -118,6 +118,7 @@ struct smf_sc {
 static void
 smf_calcsize(struct smf_sc *sc, const char *size, int newfile)
 {
+       struct statfs fsst;
        uintmax_t l, fssize;
        unsigned bs;
        char suff[2];
@@ -129,10 +130,7 @@ smf_calcsize(struct smf_sc *sc, const char *size, int newfile)
        AZ(fstat(sc->fd, &st));
        xxxassert(S_ISREG(st.st_mode));
 
-#if defined(HAVE_SYS_MOUNT_H) || defined(HAVE_SYS_VFS_H)
-       struct statfs fsst;
        AZ(fstatfs(sc->fd, &fsst));
-#endif
 
        /* We use units of the larger of filesystem blocksize and pagesize */
        bs = sc->pagesize;