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

[Derek Robert Price]

CVSROOT:        /cvsroot/cvs
Module name:    ccvs
Changes by:     Derek Robert Price <dprice>     08/09/22 16:10:08

Modified files:
        src            : ChangeLog edit.c 

Log message:
        * edit.c (ncheck_fileproc): Rename to...
        (ncheck_filesdoneproc): ...this and call the new function...
        (send_notifications): ...here for efficiency.  Some cleanup.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/ChangeLog?cvsroot=cvs&r1=1.3608&r2=1.3609
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/edit.c?cvsroot=cvs&r1=1.107&r2=1.108

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/ChangeLog,v
retrieving revision 1.3608
retrieving revision 1.3609
diff -u -b -r1.3608 -r1.3609
--- ChangeLog   22 Sep 2008 14:47:52 -0000      1.3608
+++ ChangeLog   22 Sep 2008 16:10:04 -0000      1.3609
@@ -1,5 +1,9 @@
 2008-09-22  Derek R. Price  <address@hidden>
 
+       * edit.c (ncheck_fileproc): Rename to...
+       (ncheck_filesdoneproc): ...this and call the new function...
+       (send_notifications): ...here for efficiency.  Some cleanup.
+
        * find_names.c (find_dirs): Export function.
        * find-names.h (find_dirs): Add prototype.
 

Index: edit.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/edit.c,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -b -r1.107 -r1.108
--- edit.c      19 Sep 2008 17:11:27 -0000      1.107
+++ edit.c      22 Sep 2008 16:10:08 -0000      1.108
@@ -162,13 +162,11 @@
 
 
 
-/* Check for and process notifications.  Local only.  I think that doing
-   this as a fileproc is the only way to catch all the
-   cases (e.g. foo/bar.c), even though that means checking over and over
-   for the same CVSADM_NOTIFY file which we removed the first time we
-   processed the directory.  */
+/* Check for and process notifications.  Local only.
+ */
 static int
-ncheck_fileproc (void *callerdat, struct file_info *finfo)
+ncheck_filesdoneproc (void *callerdat, int err, const char *repository,
+                     const char *update_dir, List *entries)
 {
     int notif_type;
     char *filename;
@@ -220,8 +218,8 @@
            continue;
        *cp = '\0';
 
-       notify_do (notif_type, filename, finfo->update_dir, getcaller(), val,
-                  watches, finfo->repository);
+       notify_do (notif_type, filename, update_dir, getcaller(), val,
+                  watches, repository);
     }
     free (line);
 
@@ -253,8 +251,8 @@
     {
        if (!STREQ (cvs_cmd_name, "release"))
        {
-           start_server ();
-           ign_setup ();
+           start_server();
+           ign_setup();
        }
 
        err += start_recursion (dummy_fileproc, NULL, NULL, NULL, NULL, argc,
@@ -262,19 +260,19 @@
 
        send_to_server ("noop\012", 0);
        if (STREQ (cvs_cmd_name, "release"))
-           err += get_server_responses ();
+           err += get_server_responses();
        else
-           err += get_responses_and_close ();
+           err += get_responses_and_close();
     }
     else
 #endif
     {
        /* Local.  */
 
-       err += start_recursion (ncheck_fileproc, NULL, NULL, NULL, NULL, argc,
-                               argv, local, W_LOCAL, 0, CVS_LOCK_WRITE, NULL,
-                               0, NULL);
-       Lock_Cleanup ();
+       err += start_recursion (NULL, ncheck_filesdoneproc, NULL, NULL, NULL,
+                               argc, argv, local, W_LOCAL, 0, CVS_LOCK_WRITE,
+                               NULL, 0, NULL);
+       Lock_Cleanup();
     }
     return err;
 }