[Cvs-cvs] ccvs/src ChangeLog client.c commit.c fileattr.c...

[Derek Robert Price]

CVSROOT:        /cvsroot/cvs
Module name:    ccvs
Changes by:     Derek Robert Price <dprice>     08/09/18 17:43:57

Modified files:
        src            : ChangeLog client.c commit.c fileattr.c 
                         find_names.c 

Log message:
        * client.c, commit.c, fileattr.c, find_names.c: Some cleanup.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/ChangeLog?cvsroot=cvs&r1=1.3598&r2=1.3599
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/client.c?cvsroot=cvs&r1=1.476&r2=1.477
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/commit.c?cvsroot=cvs&r1=1.285&r2=1.286
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/fileattr.c?cvsroot=cvs&r1=1.43&r2=1.44
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/find_names.c?cvsroot=cvs&r1=1.52&r2=1.53

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/ChangeLog,v
retrieving revision 1.3598
retrieving revision 1.3599
diff -u -b -r1.3598 -r1.3599
--- ChangeLog   18 Sep 2008 16:49:07 -0000      1.3598
+++ ChangeLog   18 Sep 2008 17:43:55 -0000      1.3599
@@ -1,5 +1,7 @@
 2008-09-18  Derek R. Price  <address@hidden>
 
+       * client.c, commit.c, fileattr.c, find_names.c: Some cleanup.
+
        * hash.c (walklist): Make it OK for callback procs to delete the node
        they were passed.
 

Index: client.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/client.c,v
retrieving revision 1.476
retrieving revision 1.477
diff -u -b -r1.476 -r1.477
--- client.c    17 Sep 2008 19:53:29 -0000      1.476
+++ client.c    18 Sep 2008 17:43:56 -0000      1.477
@@ -810,11 +810,9 @@
      * arbitrary files on the client.
      */
     if (!is_valid_client_path (short_pathname))
-    {
-       error (0, 0,
-               "Server attempted to update a file via an invalid pathname:");
-        error (1, 0, "`%s'.", short_pathname);
-    }
+       error (1, 0,
+               "Server attempted to update a file via invalid pathname %s.",
+              quote (short_pathname));
 
     if (ISSLASH (pathname[strlen (pathname) - 1]))
     {
@@ -1827,7 +1825,7 @@
        char *file_timestamp;
        bool ignore_merge;
 
-       (void) time (&last_register_time);
+       time (&last_register_time);
 
        local_timestamp = data->timestamp;
        if (!local_timestamp || ts[0] == '+' || last_merge_conflict)
@@ -3266,13 +3264,16 @@
                if (repository_len > update_dir_len
                    && STREQ (repository + repository_len - update_dir_len,
                              update_dir)
-                   /* TOPLEVEL_REPOS shouldn't be above 
current_parsed_root->directory */
+                   /* TOPLEVEL_REPOS shouldn't be above
+                    * CURRENT_PARSED_ROOT->directory.
+                    */
                    && ((size_t)(repository_len - update_dir_len)
                        > strlen (current_parsed_root->directory)))
                {
                    /* The repository name contains UPDATE_DIR.  Set
-                       toplevel_repos to the repository name without
-                       UPDATE_DIR. */
+                    * toplevel_repos to the repository name without
+                    * UPDATE_DIR.
+                    */
 
                    toplevel_repos = xmalloc (repository_len - update_dir_len);
                    /* Note that we don't copy the trailing '/'.  */
@@ -3281,12 +3282,10 @@
                    toplevel_repos[repository_len - update_dir_len - 1] = '\0';
                }
                else
-               {
                    toplevel_repos = xstrdup (current_parsed_root->directory);
                }
            }
        }
-    }
 
     send_repository (dir, repository, update_dir);
     free (update_dir);
@@ -5230,8 +5229,9 @@
 
 
 /* The address of an instance of this structure is passed to
-   send_fileproc, send_filesdoneproc, and send_direntproc, as the
-   callerdat parameter.  */
+ * send_fileproc, send_filesdoneproc, and send_dirent_proc, as the
+ * callerdat parameter.
+ */
 struct send_data
 {
     /* Each of the following flags are zero for clear or nonzero for set.  */

Index: commit.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/commit.c,v
retrieving revision 1.285
retrieving revision 1.286
diff -u -b -r1.285 -r1.286
--- commit.c    17 Sep 2008 19:53:29 -0000      1.285
+++ commit.c    18 Sep 2008 17:43:56 -0000      1.286
@@ -1382,12 +1382,12 @@
     Node *p;
     List *saved_ulist;
 
-    TRACE (TRACE_FLOW, "check_filesdoneproc (%d, %s, %s)",
-          err, repos, update_dir);
+    TRACE (TRACE_FLOW, "check_filesdoneproc (%d, %s, %s, %s)",
+          err, repos, update_dir, TRACE_BOOL (use_editor));
 
     /* find the update list for this dir */
-    p = findnode (mulist, update_dir);
-    if (p != NULL)
+    p = findnode (mulist, NULL2DOT (update_dir));
+    if (p)
        saved_ulist = ((struct master_lists *) p->data)->ulist;
     else
        saved_ulist = NULL;
@@ -1653,7 +1653,7 @@
     TRACE (TRACE_FLOW, "commit_filesdoneproc (%d, %s, %s)",
           err, repository, update_dir);
 
-    p = findnode (mulist, update_dir);
+    p = findnode (mulist, NULL2DOT (update_dir));
     if (p == NULL)
        return err;
 

Index: fileattr.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/fileattr.c,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -b -r1.43 -r1.44
--- fileattr.c  17 Sep 2008 19:53:29 -0000      1.43
+++ fileattr.c  18 Sep 2008 17:43:56 -0000      1.44
@@ -698,7 +698,6 @@
 void
 fileattr_free (void)
 {
-
     TRACE (TRACE_MINUTIA, "fileattr_free()");
 
     /* Note that attrs_modified will ordinarily be zero, but there are

Index: find_names.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/find_names.c,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -b -r1.52 -r1.53
--- find_names.c        17 Sep 2008 19:53:29 -0000      1.52
+++ find_names.c        18 Sep 2008 17:43:57 -0000      1.53
@@ -1,7 +1,7 @@
 /*
- * Copyright (C) 1986-2007 The Free Software Foundation, Inc.
+ * Copyright (C) 1986-2008 The Free Software Foundation, Inc.
  *
- * Portions Copyright (C) 1998-2007 Derek Price,
+ * Portions Copyright (C) 1998-2008 Derek Price,
  *                                  Ximbiot LLC <http://ximbiot.com>,
  *                                  and others.
  *
@@ -115,9 +115,10 @@
 
 
 /* Find files in the repository and/or working directory.  On error,
-   may either print a nonfatal error and return NULL, or just give
-   a fatal error.  On success, return non-NULL (even if it is an empty
-   list).  */
+ * may either print a nonfatal error and return NULL, or just give
+ * a fatal error.  On success, return non-NULL (even if it is an empty
+ * list).
+ */
 List *
 Find_Names (const char *repository, const char *update_dir,
            int which, int aflag, List **optentries)
@@ -308,7 +309,7 @@
                           &tmp_size,
                           (strlen (dir) + strlen (dp->d_name)
                            + sizeof (CVSADM) + 10));
-           (void) sprintf (tmp, "%s/%s/%s", dir, dp->d_name, CVSADM);
+           sprintf (tmp, "%s/%s/%s", dir, dp->d_name, CVSADM);
            if (!isdir (tmp))
                goto do_it_again;
        }
@@ -323,16 +324,15 @@
     do_it_again:
        errno = 0;
     }
-    if (errno != 0)
+    if (errno)
     {
        int save_errno = errno;
-       (void) CVS_CLOSEDIR (dirp);
+       CVS_CLOSEDIR (dirp);
        errno = save_errno;
        return 1;
     }
-    (void) CVS_CLOSEDIR (dirp);
-    if (tmp != NULL)
-       free (tmp);
+    CVS_CLOSEDIR (dirp);
+    if (tmp) free (tmp);
     return 0;
 }