[Cvs-cvs] ccvs/src ChangeLog client.c rcs.c server.c veri...

[Larry Jones]

CVSROOT:        /cvsroot/cvs
Module name:    ccvs
Changes by:     Larry Jones <scjones>   06/06/21 18:55:21

Modified files:
        src            : ChangeLog client.c rcs.c server.c verify.c 

Log message:
        * client.c: Remove unused global variable last_merge_no_change.
        (send_modified): Cast first arg of send_to_server() to correct type.
        * rcs.c (expand_keywords, RCS_delete_openpgp_signatures): Remove
        unused variables.
        * server.c (do_cvs_command): Remove unused variables.
        * verify.c (iget_verify_commits): Return a valid value in client mode.
        (verify_fileproc): Remove unused variables.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/ChangeLog?cvsroot=cvs&r1=1.3452&r2=1.3453
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/client.c?cvsroot=cvs&r1=1.454&r2=1.455
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/rcs.c?cvsroot=cvs&r1=1.372&r2=1.373
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/server.c?cvsroot=cvs&r1=1.467&r2=1.468
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/verify.c?cvsroot=cvs&r1=1.4&r2=1.5

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/ChangeLog,v
retrieving revision 1.3452
retrieving revision 1.3453
diff -u -b -r1.3452 -r1.3453
--- ChangeLog   20 Jun 2006 17:46:02 -0000      1.3452
+++ ChangeLog   21 Jun 2006 18:55:21 -0000      1.3453
@@ -1,3 +1,13 @@
+2006-06-21  Larry Jones  <address@hidden>
+
+       * client.c: Remove unused global variable last_merge_no_change.
+       (send_modified): Cast first arg of send_to_server() to correct type.
+       * rcs.c (expand_keywords, RCS_delete_openpgp_signatures): Remove
+       unused variables.
+       * server.c (do_cvs_command): Remove unused variables.
+       * verify.c (iget_verify_commits): Return a valid value in client mode.
+       (verify_fileproc): Remove unused variables.
+
 2006-06-20  Derek Price  <address@hidden>
 
        * sanity.sh (require_rsh): Process STDERR output from remote shell.

Index: client.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/client.c,v
retrieving revision 1.454
retrieving revision 1.455
diff -u -b -r1.454 -r1.455
--- client.c    8 Jun 2006 20:20:13 -0000       1.454
+++ client.c    21 Jun 2006 18:55:21 -0000      1.455
@@ -71,7 +71,6 @@
  */
 static bool last_merge;
 static bool last_merge_conflict;
-static bool last_merge_no_change;
 static bool last_merge_made_base;
 static char *base_merge_rev1;
 static char *base_merge_rev2;
@@ -2082,7 +2081,6 @@
        last_merge = false;
        last_merge_conflict = false;
        last_merge_made_base = false;
-       last_merge_no_change = false;
 
        if (file_timestamp)
            free (file_timestamp);
@@ -2728,7 +2726,6 @@
                cvs_output (base_merge_rev2, 0);
                cvs_output ("\n", 1);
            }
-           last_merge_no_change = true;
        }
 
        /* This next is a separate case because a join could restore the file
@@ -5341,7 +5338,7 @@
          sprintf (tmp, "%lu\n", (unsigned long) newsize);
          send_to_server (tmp, 0);
 
-          send_to_server (buf, newsize);
+          send_to_server ((char *) buf, newsize);
         }
     }
     else
@@ -5394,7 +5391,7 @@
         * one.
         */
        if (newsize > 0)
-           send_to_server (buf, newsize);
+           send_to_server ((char *) buf, newsize);
     }
     free (buf);
     free (mode_string);

Index: rcs.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/rcs.c,v
retrieving revision 1.372
retrieving revision 1.373
diff -u -b -r1.372 -r1.373
--- rcs.c       17 Jun 2006 09:57:53 -0000      1.372
+++ rcs.c       21 Jun 2006 18:55:21 -0000      1.373
@@ -3774,7 +3774,7 @@
     char *locker;
     char *srch, *s;
     size_t srch_len;
-    const struct rcs_keyword *keywords, *keyword;
+    const struct rcs_keyword *keyword;
 
     if (!config /* For `cvs init', config may not be set.  */
        ||expand == KFLAG_O || expand == KFLAG_B)
@@ -3785,7 +3785,6 @@
     }
 
     if (!config->keywords) config->keywords = new_keywords ();
-    keywords = config->keywords;
 
     /* If we are using -kkvl, dig out the locker information if any.  */
     locker = NULL;
@@ -4939,7 +4938,6 @@
     char *newsigs = NULL;
     size_t newlen = 0;
     bool found = false;
-    int rc;
 
     TRACE (TRACE_FUNCTION, "RCS_delete_openpgp_signatures (%s, %s, %s)",
           finfo->fullname, rev, gpg_keyid2string (keyid));
@@ -4980,7 +4978,7 @@
     /* Find the signature(s), copying signatures that *do not* match to a new
      * string.
      */
-    while (!(rc = parse_signature (membuf, &sig)))
+    while (!parse_signature (membuf, &sig))
     {
        char *hexid1 = NULL;
        char *hexid2 = NULL;

Index: server.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/server.c,v
retrieving revision 1.467
retrieving revision 1.468
diff -u -b -r1.467 -r1.468
--- server.c    12 Jun 2006 14:33:02 -0000      1.467
+++ server.c    21 Jun 2006 18:55:21 -0000      1.468
@@ -3945,9 +3945,8 @@
 # ifdef SERVER_FLOWCONTROL
        {
            char junk;
-           ssize_t status;
            set_block_fd (flowcontrol_pipe[0]);
-           while ((status = read (flowcontrol_pipe[0], &junk, 1)) > 0);
+           while (read (flowcontrol_pipe[0], &junk, 1) > 0);
        }
        /* FIXME: No point in printing an error message with error(),
         * as STDERR is already closed, but perhaps any read errors could be

Index: verify.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/verify.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- verify.c    17 May 2006 18:17:39 -0000      1.4
+++ verify.c    21 Jun 2006 18:55:21 -0000      1.5
@@ -217,7 +217,7 @@
     verify_state tmp;
 
     /* Only verify checkouts from the server (and in local mode).  */
-    if (current_parsed_root->isremote) return false;
+    if (current_parsed_root->isremote) return VERIFY_OFF;
 
     tmp = verify_commits;
 
@@ -504,7 +504,7 @@
     bool errors = false;
     char *basefn, *basesigfn;
     char *tmpfn = NULL, *tmpsigfn = NULL;
-    const char *signedfn = NULL, *sigfn = NULL;
+    const char *signedfn = NULL;
     char *sigdata = NULL;
     size_t buflen;
     size_t siglen;
@@ -548,7 +548,6 @@
            else
            {
                signedfn = basefn;
-               sigfn = basesigfn;
            }
        }
 
@@ -607,7 +606,7 @@
                errors = true;
            else
            {
-               sigfn = tmpsigfn = Xasprintf ("%s.sig", tmpfn);
+               tmpsigfn = Xasprintf ("%s.sig", tmpfn);
                force_write_file (tmpsigfn, sigdata, siglen);
            }
        }