[Cvs-cvs] ccvs/src ChangeLog history.c server.c update.c [cvs1-11-x-branch]

[Larry Jones]

CVSROOT:        /cvsroot/cvs
Module name:    ccvs
Branch:         cvs1-11-x-branch
Changes by:     Larry Jones <address@hidden>    06/04/15 18:33:19

Modified files:
        src            : ChangeLog history.c server.c update.c 

Log message:
        * history.c (sort_order): Add prototype.
        * server.c (template_proc): Add prototype and make args const.
        * update.c (RegisterMerge): Make static to match prototype.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/src/ChangeLog.diff?only_with_tag=cvs1-11-x-branch&tr1=1.2336.2.437&tr2=1.2336.2.438&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/src/history.c.diff?only_with_tag=cvs1-11-x-branch&tr1=1.58.4.14&tr2=1.58.4.15&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/src/server.c.diff?only_with_tag=cvs1-11-x-branch&tr1=1.284.2.45&tr2=1.284.2.46&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/src/update.c.diff?only_with_tag=cvs1-11-x-branch&tr1=1.202.4.28&tr2=1.202.4.29&r1=text&r2=text

Patches:
Index: ccvs/src/ChangeLog
diff -u ccvs/src/ChangeLog:1.2336.2.437 ccvs/src/ChangeLog:1.2336.2.438
--- ccvs/src/ChangeLog:1.2336.2.437     Fri Apr  7 17:16:04 2006
+++ ccvs/src/ChangeLog  Sat Apr 15 18:33:18 2006
@@ -1,3 +1,9 @@
+2006-04-15  Larry Jones  <address@hidden>
+
+       * history.c (sort_order): Add prototype.
+       * server.c (template_proc): Add prototype and make args const.
+       * update.c (RegisterMerge): Make static to match prototype.
+
 2006-04-07  Derek Price  <address@hidden>
 
        * client.c (strto_file_size): New function which checks for errors when
Index: ccvs/src/history.c
diff -u ccvs/src/history.c:1.58.4.14 ccvs/src/history.c:1.58.4.15
--- ccvs/src/history.c:1.58.4.14        Wed Feb  1 21:15:48 2006
+++ ccvs/src/history.c  Sat Apr 15 18:33:19 2006
@@ -327,6 +327,9 @@
    - Always sort timestamp last.
 */
 static int
+sort_order PROTO((const PTR l, const PTR r));
+
+static int
 sort_order (l, r)
     const PTR l;
     const PTR r;
Index: ccvs/src/server.c
diff -u ccvs/src/server.c:1.284.2.45 ccvs/src/server.c:1.284.2.46
--- ccvs/src/server.c:1.284.2.45        Fri Apr  7 01:48:51 2006
+++ ccvs/src/server.c   Sat Apr 15 18:33:19 2006
@@ -4552,9 +4552,12 @@
 static struct template_proc_data *tpd;
 
 static int
+template_proc PROTO((const char *repository, const char *template));
+
+static int
 template_proc (repository, template)
-    char *repository;
-    char *template;
+    const char *repository;
+    const char *template;
 {
     FILE *fp;
     char buf[1024];
Index: ccvs/src/update.c
diff -u ccvs/src/update.c:1.202.4.28 ccvs/src/update.c:1.202.4.29
--- ccvs/src/update.c:1.202.4.28        Sat Sep 24 18:02:28 2005
+++ ccvs/src/update.c   Sat Apr 15 18:33:19 2006
@@ -1922,7 +1922,7 @@
 static void
 RegisterMerge PROTO((struct file_info *finfo, Vers_TS *vers,
                     const char *backup, int has_conflicts));
-void
+static void
 RegisterMerge (finfo, vers, backup, has_conflicts)
     struct file_info *finfo;
     Vers_TS *vers;