[Cvs-cvs] ccvs/src ChangeLog parseinfo.c parseinfo.h

[Derek Robert Price]

CVSROOT:        /cvsroot/cvs
Module name:    ccvs
Changes by:     Derek Robert Price <dprice>     09/08/29 18:18:02

Modified files:
        src            : ChangeLog parseinfo.c parseinfo.h 

Log message:
        * parseinfo.c (new_config): Initialize new property.
        (parse_config): Store existence of user-specified LogHistory directive
        per config file rather than globally.
        * parseinfo.h (struct config): Add new usingDefaultLogHistory boolean.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/ChangeLog?cvsroot=cvs&r1=1.3642&r2=1.3643
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/parseinfo.c?cvsroot=cvs&r1=1.98&r2=1.99
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/parseinfo.h?cvsroot=cvs&r1=1.10&r2=1.11

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/ChangeLog,v
retrieving revision 1.3642
retrieving revision 1.3643
diff -u -b -r1.3642 -r1.3643
--- ChangeLog   4 Aug 2009 11:03:28 -0000       1.3642
+++ ChangeLog   29 Aug 2009 18:18:01 -0000      1.3643
@@ -1,3 +1,10 @@
+2009-08-29  Derek R. Price  <address@hidden>
+
+       * parseinfo.c (new_config): Initialize new property.
+       (parse_config): Store existence of user-specified LogHistory directive
+       per config file rather than globally.
+       * parseinfo.h (struct config): Add new usingDefaultLogHistory boolean.
+
 2009-08-03  Derek R. Price  <address@hidden>
 
        * parseinfo.c (parse_config): Find alternate config files correctly.

Index: parseinfo.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/parseinfo.c,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -b -r1.98 -r1.99
--- parseinfo.c 4 Aug 2009 11:03:28 -0000       1.98
+++ parseinfo.c 29 Aug 2009 18:18:01 -0000      1.99
@@ -316,6 +316,7 @@
     TRACE (TRACE_FLOW, "new_config ()");
 
     new->logHistory = xstrdup (ALL_HISTORY_REC_TYPES);
+    new->usingDefaultLogHistory = true;
     new->RereadLogAfterVerify = LOGMSG_REREAD_ALWAYS;
     new->FirstVerifyLogErrorFatal = true;
     new->UserAdminOptions = xstrdup ("k");
@@ -677,13 +678,12 @@
        {
            if (!STREQ (p, "all"))
            {
-               static bool gotone = false;
-               if (gotone)
+               if (retval->usingDefaultLogHistory)
+                   retval->usingDefaultLogHistory = false;
+               else
                    error (0, 0, "\
 %s [%u]: warning: duplicate LogHistory entry found.",
                           infopath, ln);
-               else
-                   gotone = true;
                free (retval->logHistory);
                retval->logHistory = xstrdup (p);
            }

Index: parseinfo.h
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/parseinfo.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- parseinfo.h 12 Sep 2008 19:55:29 -0000      1.10
+++ parseinfo.h 29 Aug 2009 18:18:01 -0000      1.11
@@ -27,7 +27,10 @@
     void *keywords;
     bool top_level_admin;
     char *lock_dir;
+
     char *logHistory;
+    bool usingDefaultLogHistory;
+
     char *HistoryLogPath;
     char *HistorySearchPath;
     char *TmpDir;