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

[Larry Jones]

CVSROOT:        /cvsroot/cvs
Module name:    ccvs
Changes by:     Larry Jones <scjones>   08/12/02 19:34:00

Modified files:
        src            : ChangeLog commit.c edit.c hash.c parseinfo.c 
                         recurse.c 

Log message:
        * commit.c: Remove defunct variable (got_message).
        * edit.c (send_notifications, edit, unedit): Use CVS_LOCK_NONE instead
        of 0 in calls to start_recursion to avoid compiler warnings.
        * parseinfo.c: Remove duplicate definition of config (from main.c).
        * hash.c (walklist): Cast function pointers to void * for tracing.
        * recurse.c (start_recursion): Ditto.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/ChangeLog?cvsroot=cvs&r1=1.3639&r2=1.3640
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/commit.c?cvsroot=cvs&r1=1.289&r2=1.290
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/edit.c?cvsroot=cvs&r1=1.108&r2=1.109
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/hash.c?cvsroot=cvs&r1=1.56&r2=1.57
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/parseinfo.c?cvsroot=cvs&r1=1.96&r2=1.97
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/recurse.c?cvsroot=cvs&r1=1.138&r2=1.139

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/ChangeLog,v
retrieving revision 1.3639
retrieving revision 1.3640
diff -u -b -r1.3639 -r1.3640
--- ChangeLog   25 Nov 2008 22:56:26 -0000      1.3639
+++ ChangeLog   2 Dec 2008 19:33:59 -0000       1.3640
@@ -1,3 +1,12 @@
+2008-12-02  Larry Jones  <address@hidden>
+
+       * commit.c: Remove defunct variable (got_message).
+       * edit.c (send_notifications, edit, unedit): Use CVS_LOCK_NONE instead
+       of 0 in calls to start_recursion to avoid compiler warnings.
+       * parseinfo.c: Remove duplicate definition of config (from main.c).
+       * hash.c (walklist): Cast function pointers to void * for tracing.
+       * recurse.c (start_recursion): Ditto.
+
 2008-11-25  Larry Jones  <address@hidden>
 
        * Makefile.in: Regenerated with Autoconf 2.63.

Index: commit.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/commit.c,v
retrieving revision 1.289
retrieving revision 1.290
diff -u -b -r1.289 -r1.290
--- commit.c    5 Nov 2008 15:17:14 -0000       1.289
+++ commit.c    2 Dec 2008 19:33:59 -0000       1.290
@@ -91,7 +91,6 @@
 };
 static int check_valid_edit = 0;
 static int force_ci = 0;
-static int got_message;
 static int aflag;
 static char *saved_tag;
 static char *write_dirtag;
@@ -1430,7 +1429,6 @@
      * check_dirent_proc() and once in commit_fileproc, but putting it here
      * covers both cases (recursion and files specified on the command line).
      */
-    got_message = 1;
     if (!server_active && use_editor)
        do_editor (update_dir, &commit_data->saved_message, repos,
                   saved_ulist);
@@ -1683,8 +1681,6 @@
 
     ulist = ((struct master_lists *) p->data)->ulist;
 
-    got_message = 0;
-
     /* Build the administrative files if necessary.  */
     {
        const char *p;

Index: edit.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/edit.c,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -b -r1.108 -r1.109
--- edit.c      22 Sep 2008 16:10:08 -0000      1.108
+++ edit.c      2 Dec 2008 19:34:00 -0000       1.109
@@ -256,7 +256,8 @@
        }
 
        err += start_recursion (dummy_fileproc, NULL, NULL, NULL, NULL, argc,
-                               argv, local, W_LOCAL, 0, 0, NULL, 0, NULL);
+                               argv, local, W_LOCAL, 0, CVS_LOCK_NONE, NULL,
+                               0, NULL);
 
        send_to_server ("noop\012", 0);
        if (STREQ (cvs_cmd_name, "release"))
@@ -633,7 +634,7 @@
           setting_tedit, setting_tunedit, setting_tcommit, check_edited);
 
     err = start_recursion (edit_fileproc, NULL, NULL, NULL, NULL, argc, argv,
-                          local, W_LOCAL, 0, 0, NULL, 0, NULL);
+                          local, W_LOCAL, 0, CVS_LOCK_NONE, NULL, 0, NULL);
 
     err += send_notifications (argc, argv, local);
 
@@ -794,7 +795,7 @@
     /* No need to readlock since we aren't doing anything to the
        repository.  */
     err = start_recursion (unedit_fileproc, NULL, NULL, NULL, NULL, argc, argv,
-                          local, W_LOCAL, 0, 0, NULL, 0, NULL);
+                          local, W_LOCAL, 0, CVS_LOCK_NONE, NULL, 0, NULL);
 
     err += send_notifications (argc, argv, local);
 

Index: hash.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/hash.c,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -b -r1.56 -r1.57
--- hash.c      18 Sep 2008 16:49:08 -0000      1.56
+++ hash.c      2 Dec 2008 19:34:00 -0000       1.57
@@ -426,7 +426,8 @@
     int err = 0;
 
     TRACE (TRACE_FLOW, "walklist (list=%s, proc=%s, closure=%s)",
-          TRACE_PTR (list, 0), TRACE_PTR (proc, 1), TRACE_PTR (closure, 2));
+          TRACE_PTR (list, 0), TRACE_PTR ((void *)proc, 1),
+          TRACE_PTR (closure, 2));
 
     if (!list) return 0;
 

Index: parseinfo.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/parseinfo.c,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -b -r1.96 -r1.97
--- parseinfo.c 29 Sep 2008 02:56:36 -0000      1.96
+++ parseinfo.c 2 Dec 2008 19:34:00 -0000       1.97
@@ -32,16 +32,6 @@
                             const char *s);
 
 
-
-/***
- ***
- ***   CVSROOT/config options
- ***
- ***/
-struct config *config;
-
-
-
 /*
  * Parse the INFOFILE file for the specified REPOSITORY.  Invoke CALLPROC for
  * the first line in the file that matches the REPOSITORY, or if ALL != 0, any

Index: recurse.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/recurse.c,v
retrieving revision 1.138
retrieving revision 1.139
diff -u -b -r1.138 -r1.139
--- recurse.c   29 Sep 2008 17:46:28 -0000      1.138
+++ recurse.c   2 Dec 2008 19:34:00 -0000       1.139
@@ -209,8 +209,10 @@
       "                      local=%d, which=%d, aflag=%d,\n"
       "                      locktype=%d, update_preload=%s\n"
       "                      dosrcs=%d, repository_in=%s)",
-          TRACE_PTR (fileproc, 0), TRACE_PTR (filesdoneproc, 1),
-          TRACE_PTR (direntproc, 2), TRACE_PTR (dirleaveproc, 3),
+          TRACE_PTR ((void *)fileproc, 0),
+          TRACE_PTR ((void *)filesdoneproc, 1),
+          TRACE_PTR ((void *)direntproc, 2),
+          TRACE_PTR ((void *)dirleaveproc, 3),
           TRACE_PTR (callerdat, 4), argc, TRACE_PTR (argv, 5),
           local, which, aflag, locktype,
           TRACE_NULL (update_preload), dosrcs,