cvs-cvs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Cvs-cvs] ccvs/src ChangeLog mkmodules.c


From: Larry Jones
Subject: [Cvs-cvs] ccvs/src ChangeLog mkmodules.c
Date: Sun, 26 Aug 2007 18:40:47 +0000

CVSROOT:        /cvsroot/cvs
Module name:    ccvs
Changes by:     Larry Jones <scjones>   07/08/26 18:40:47

Modified files:
        src            : ChangeLog mkmodules.c 

Log message:
        merge changes from cvs1-11-x-branch

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/ChangeLog?cvsroot=cvs&r1=1.3523&r2=1.3524
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/mkmodules.c?cvsroot=cvs&r1=1.102&r2=1.103

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/ChangeLog,v
retrieving revision 1.3523
retrieving revision 1.3524
diff -u -b -r1.3523 -r1.3524
--- ChangeLog   25 Aug 2007 03:17:57 -0000      1.3523
+++ ChangeLog   26 Aug 2007 18:40:46 -0000      1.3524
@@ -1,3 +1,7 @@
+2007-08-26  Larry Jones  <address@hidden>
+
+       * mkmodules.c (in_root, init): Unmix declarations and code.
+
 2007-08-24  Derek Price  <address@hidden>
 
        Simplify code using new GNULIB modules.

Index: mkmodules.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/mkmodules.c,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -b -r1.102 -r1.103
--- mkmodules.c 25 Aug 2007 03:17:59 -0000      1.102
+++ mkmodules.c 26 Aug 2007 18:40:47 -0000      1.103
@@ -1164,8 +1164,9 @@
 
        if (isdir (cp))
        {
+           bool foundit;
            char *adm = Xasprintf ("%s/%s", cp, CVSROOTADM);
-           bool foundit = isdir (adm);
+           foundit = isdir (adm);
            free (adm);
            if (foundit) return cp;
        }
@@ -1204,6 +1205,7 @@
     /* Exit status.  */
     int err = 0;
 
+    char *root_dir;
     const struct admin_file *fileptr;
 
     assert (!server_active);
@@ -1224,7 +1226,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,




reply via email to

[Prev in Thread] Current Thread [Next in Thread]