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

[Derek Robert Price]

CVSROOT:        /cvsroot/cvs
Module name:    ccvs
Changes by:     Derek Robert Price <dprice>     08/08/15 16:55:11

Modified files:
        src            : ChangeLog update.c 

Log message:
        * update.c (send_dirent_proc): Another simplification via hasAdmin().

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/ChangeLog?cvsroot=cvs&r1=1.3564&r2=1.3565
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/update.c?cvsroot=cvs&r1=1.279&r2=1.280

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/ChangeLog,v
retrieving revision 1.3564
retrieving revision 1.3565
diff -u -b -r1.3564 -r1.3565
--- ChangeLog   15 Aug 2008 16:44:47 -0000      1.3564
+++ ChangeLog   15 Aug 2008 16:55:10 -0000      1.3565
@@ -1,5 +1,7 @@
 2008-08-15  Derek R. Price  <address@hidden>
 
+       * update.c (send_dirent_proc): Another simplification via hasAdmin().
+
        * subr.c (has_slash): Rename to...
        (hasSlash): ...this.
        (hasAdmin): New convenience function.

Index: update.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/update.c,v
retrieving revision 1.279
retrieving revision 1.280
diff -u -b -r1.279 -r1.280
--- update.c    1 Feb 2008 19:35:21 -0000       1.279
+++ update.c    15 Aug 2008 16:55:11 -0000      1.280
@@ -971,23 +971,14 @@
     /* Do we need to check noexec here? */
     else if (!pipeout)
     {
-       char *cvsadmdir;
-
        /* The directory exists.  Check to see if it has a CVS
           subdirectory.  */
-
-       cvsadmdir = Xasprintf ("%s/%s", dir, CVSADM);
-
-       if (!isdir (cvsadmdir))
-       {
+       if (!hasAdmin (dir))
            /* We cannot successfully recurse into a directory without a CVS
               subdirectory.  Generally we will have already printed
               "? foo".  */
-           free (cvsadmdir);
            return R_SKIP_ALL;
        }
-       free (cvsadmdir);
-    }
 
     /*
      * If we are building dirs and not going to stdout, we make sure there is