[Cvs-cvs] Changes to ccvs/src/base.c [signed-commits2]

[Derek Robert Price]

Index: ccvs/src/base.c
diff -u ccvs/src/base.c:1.1.2.6 ccvs/src/base.c:1.1.2.7
--- ccvs/src/base.c:1.1.2.6     Wed Nov 30 05:04:14 2005
+++ ccvs/src/base.c     Wed Nov 30 19:58:46 2005
@@ -249,13 +249,13 @@
 int
 base_checkout (RCSNode *rcs, struct file_info *finfo,
               const char *prev, const char *rev, const char *tag,
-              const char *options)
+              const char *poptions, const char *options)
 {
     int status;
     char *basefile;
 
-    TRACE (TRACE_FUNCTION, "base_checkout (%s, %s, %s, %s, %s)",
-          finfo->fullname, prev, rev, tag, options);
+    TRACE (TRACE_FUNCTION, "base_checkout (%s, %s, %s, %s, %s, %s)",
+          finfo->fullname, prev, rev, tag, poptions, options);
 
     mkdir_if_needed (CVSADM_BASE);
 
@@ -272,7 +272,7 @@
     free (basefile);
 
     if (server_active && strcmp (cvs_cmd_name, "export"))
-       server_base_checkout (rcs, finfo, prev, rev, tag, options);
+       server_base_checkout (rcs, finfo, prev, rev, tag, poptions, options);
 
     return status;
 }
@@ -332,11 +332,11 @@
        fails is not very informative -- it is taken verbatim from RCS 5.7,
        and relies on RCS_checkout saying something intelligent upon failure. */
 
-    if (base_checkout (rcs, finfo, urev, rev1, rev1, options))
+    if (base_checkout (rcs, finfo, urev, rev1, rev1, NULL, options))
        error (1, 0, "checkout of revision %s of `%s' failed.\n",
               rev1, finfo->fullname);
 
-    if (base_checkout (rcs, finfo, urev, rev2, rev2, options))
+    if (base_checkout (rcs, finfo, urev, rev2, rev2, NULL, options))
        error (1, 0, "checkout of revision %s of `%s' failed.\n",
               rev2, finfo->fullname);