[Cvs-cvs] ccvs/src ChangeLog mkmodules.c [cvs1-11-x-branch]

[Larry Jones]

CVSROOT:        /cvsroot/cvs
Module name:    ccvs
Branch:         cvs1-11-x-branch
Changes by:     Larry Jones <scjones>   07/08/26 18:14:17

Modified files:
        src            : ChangeLog mkmodules.c 

Log message:
        * mkmodules.c (in_root, init): Unmix declarations and code.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/ChangeLog?cvsroot=cvs&only_with_tag=cvs1-11-x-branch&r1=1.2336.2.490&r2=1.2336.2.491
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/mkmodules.c?cvsroot=cvs&only_with_tag=cvs1-11-x-branch&r1=1.66.6.10&r2=1.66.6.11

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/ChangeLog,v
retrieving revision 1.2336.2.490
retrieving revision 1.2336.2.491
diff -u -b -r1.2336.2.490 -r1.2336.2.491
--- ChangeLog   22 Aug 2007 21:42:54 -0000      1.2336.2.490
+++ ChangeLog   26 Aug 2007 18:14:15 -0000      1.2336.2.491
@@ -1,3 +1,7 @@
+2007-08-26  Larry Jones  <address@hidden>
+
+       * mkmodules.c (in_root, init): Unmix declarations and code.
+
 2007-08-22  Derek Price  <address@hidden>
 
        * add.c (add): Check last component of argument paths instead of the

Index: mkmodules.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/mkmodules.c,v
retrieving revision 1.66.6.10
retrieving revision 1.66.6.11
diff -u -b -r1.66.6.10 -r1.66.6.11
--- mkmodules.c 22 Aug 2007 21:33:17 -0000      1.66.6.10
+++ mkmodules.c 26 Aug 2007 18:14:16 -0000      1.66.6.11
@@ -862,9 +862,10 @@
 
        if (isdir (cp))
        {
+           int foundit;
            char *adm = xmalloc (strlen(cp) + strlen(CVSROOTADM) + 2);
            sprintf (adm, "%s/%s", cp, CVSROOTADM);
-           int foundit = isdir (adm);
+           foundit = isdir (adm);
            free (adm);
            if (foundit) return cp;
        }
@@ -903,6 +904,7 @@
     /* Exit status.  */
     int err = 0;
 
+    char *root_dir;
     const struct admin_file *fileptr;
 
     assert (!server_active);
@@ -923,7 +925,7 @@
     }
 #endif /* CLIENT_SUPPORT */
 
-    char *root_dir = in_root (current_parsed_root->directory);
+    root_dir = in_root (current_parsed_root->directory);
 
     if (root_dir && strcmp (root_dir, current_parsed_root->directory))
        error (1, 0,