diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2011-07-22 11:32:26 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2011-07-22 11:32:26 +0200 |
| commit | ca377701e0200a0766abe3bb33f4cab3ccaad451 (patch) | |
| tree | 3515831950fd21bf66ad898cc4d1a9fa56f7e7e8 /runtime | |
| parent | 8ad3716cb230d0c13b6ed6f98a96939c69987509 (diff) | |
| download | rsyslog-ca377701e0200a0766abe3bb33f4cab3ccaad451.tar.gz rsyslog-ca377701e0200a0766abe3bb33f4cab3ccaad451.tar.xz rsyslog-ca377701e0200a0766abe3bb33f4cab3ccaad451.zip | |
milestone: all syntaxes for new config handler implemented
so far, mostly compile-time tested. Real testing happens as
side-activity when implementing other parts of the new config
system
Diffstat (limited to 'runtime')
| -rw-r--r-- | runtime/cfsysline.c | 5 | ||||
| -rw-r--r-- | runtime/cfsysline.h | 2 | ||||
| -rw-r--r-- | runtime/rsconf.c | 1 |
3 files changed, 4 insertions, 4 deletions
diff --git a/runtime/cfsysline.c b/runtime/cfsysline.c index f6581ccd..288e6974 100644 --- a/runtime/cfsysline.c +++ b/runtime/cfsysline.c @@ -3,7 +3,7 @@ * * File begun on 2007-07-30 by RGerhards * - * Copyright (C) 2007, 2008 by Rainer Gerhards and Adiscon GmbH. + * Copyright (C) 2007-2011 by Rainer Gerhards and Adiscon GmbH. * * This file is part of rsyslog. * @@ -544,7 +544,8 @@ finalize_it: * time (TODO). -- rgerhards, 2008-02-14 */ static rsRetVal -doSyslogName(uchar **pp, rsRetVal (*pSetHdlr)(void*, int), void *pVal, syslogName_t *pNameTable) +doSyslogName(uchar **pp, rsRetVal (*pSetHdlr)(void*, int), + void *pVal, syslogName_t *pNameTable) { DEFiRet; cstr_t *pStrB; diff --git a/runtime/cfsysline.h b/runtime/cfsysline.h index a4502672..5e9532fc 100644 --- a/runtime/cfsysline.h +++ b/runtime/cfsysline.h @@ -1,6 +1,6 @@ /* Definition of the cfsysline (config file system line) object. * - * Copyright 2007 Rainer Gerhards and Adiscon GmbH. + * Copyright 2007-2011 Rainer Gerhards and Adiscon GmbH. * * This file is part of the rsyslog runtime library. * diff --git a/runtime/rsconf.c b/runtime/rsconf.c index c4a0ed51..20c3b4f0 100644 --- a/runtime/rsconf.c +++ b/runtime/rsconf.c @@ -430,7 +430,6 @@ void cnfDoCfsysline(char *ln) DBGPRINTF("cnf:global:cfsysline: %s\n", ln); /* the legacy system needs the "$" stripped */ conf.cfsysline((uchar*) ln+1); - free(ln); /* cfsysline is just a simple string */ } void cnfDoBSDTag(char *ln) |