Skip to content
Snippets Groups Projects
Commit e60a522a authored by dprice's avatar dprice
Browse files

* 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.
parent f888ada1
No related branches found
No related tags found
No related merge requests found
2009-08-29 Derek R. Price <derek@ximbiot.com>
* 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 <derek@ximbiot.com> 2009-08-03 Derek R. Price <derek@ximbiot.com>
   
* parseinfo.c (parse_config): Find alternate config files correctly. * parseinfo.c (parse_config): Find alternate config files correctly.
......
...@@ -316,6 +316,7 @@ new_config (void) ...@@ -316,6 +316,7 @@ new_config (void)
TRACE (TRACE_FLOW, "new_config ()"); TRACE (TRACE_FLOW, "new_config ()");
new->logHistory = xstrdup (ALL_HISTORY_REC_TYPES); new->logHistory = xstrdup (ALL_HISTORY_REC_TYPES);
new->usingDefaultLogHistory = true;
new->RereadLogAfterVerify = LOGMSG_REREAD_ALWAYS; new->RereadLogAfterVerify = LOGMSG_REREAD_ALWAYS;
new->FirstVerifyLogErrorFatal = true; new->FirstVerifyLogErrorFatal = true;
new->UserAdminOptions = xstrdup ("k"); new->UserAdminOptions = xstrdup ("k");
...@@ -677,13 +678,12 @@ parse_config (const char *cvsroot, const char *path) ...@@ -677,13 +678,12 @@ parse_config (const char *cvsroot, const char *path)
{ {
if (!STREQ (p, "all")) if (!STREQ (p, "all"))
{ {
static bool gotone = false; if (retval->usingDefaultLogHistory)
if (gotone) retval->usingDefaultLogHistory = false;
else
error (0, 0, "\ error (0, 0, "\
%s [%u]: warning: duplicate LogHistory entry found.", %s [%u]: warning: duplicate LogHistory entry found.",
infopath, ln); infopath, ln);
else
gotone = true;
free (retval->logHistory); free (retval->logHistory);
retval->logHistory = xstrdup (p); retval->logHistory = xstrdup (p);
} }
......
...@@ -27,7 +27,10 @@ struct config ...@@ -27,7 +27,10 @@ struct config
void *keywords; void *keywords;
bool top_level_admin; bool top_level_admin;
char *lock_dir; char *lock_dir;
char *logHistory; char *logHistory;
bool usingDefaultLogHistory;
char *HistoryLogPath; char *HistoryLogPath;
char *HistorySearchPath; char *HistorySearchPath;
char *TmpDir; char *TmpDir;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment