diff options
| author | Michael Biebl <biebl@debian.org> | 2012-10-11 22:22:19 +0200 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2012-10-11 22:22:19 +0200 |
| commit | 64b89c604c6cec4fd0de51f2776f95b34e388bae (patch) | |
| tree | cfa1988f2f451baaa4a0e145d7263b8e888a8cef /tools | |
| parent | 5b0595cc98c012dfa5ac0f214dbc543a11c982cb (diff) | |
| download | rsyslog-64b89c604c6cec4fd0de51f2776f95b34e388bae.tar.gz | |
Imported Upstream version 7.1.10upstream/7.1.10
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/Makefile.in | 6 | ||||
| -rw-r--r-- | tools/logctl.c | 4 | ||||
| -rw-r--r-- | tools/omfile.c | 3 |
3 files changed, 8 insertions, 5 deletions
diff --git a/tools/Makefile.in b/tools/Makefile.in index 0c9d258..2ee56e7 100644 --- a/tools/Makefile.in +++ b/tools/Makefile.in @@ -41,7 +41,11 @@ bin_PROGRAMS = $(am__EXEEXT_1) subdir = tools DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/atomic_operations.m4 \ + $(top_srcdir)/m4/atomic_operations_64bit.m4 \ + $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d diff --git a/tools/logctl.c b/tools/logctl.c index df332bc..1ab8ead 100644 --- a/tools/logctl.c +++ b/tools/logctl.c @@ -143,7 +143,6 @@ struct ofields* get_data(struct results *res) struct ofields *fields; const char *msg; const char *prog; - const char *level; const char *syslog_tag; gint64 date_r; bson_cursor *c; @@ -263,7 +262,7 @@ struct select_doc* create_select() struct query_doc* create_query(struct queryopt *opt) { struct query_doc *qu_doc; - bson *query_what, *order_what, *order_how, *msg_what, *date_what; + bson *query_what, *order_what, *msg_what, *date_what; struct tm tm; time_t t; gint64 ts; @@ -417,7 +416,6 @@ int main (int argc, char *argv[]) struct queryopt opt; struct ofields *fields; - struct bson_doc *doc; struct select_doc *s_doc; struct query_doc *qu_doc; struct db_connect *db_conn; diff --git a/tools/omfile.c b/tools/omfile.c index 1ccd4a5..5b0bfb4 100644 --- a/tools/omfile.c +++ b/tools/omfile.c @@ -820,6 +820,7 @@ ENDcreateInstance BEGINfreeInstance CODESTARTfreeInstance + free(pData->tplName); free(pData->f_fname); if(pData->bDynamicName) { dynaFileFreeCache(pData); @@ -960,7 +961,7 @@ CODESTARTnewActInst ABORT_FINALIZE(RS_RET_MISSING_CNFPARAMS); } - tplToUse = (pData->tplName == NULL) ? ustrdup(getDfltTpl()) : pData->tplName; + tplToUse = ustrdup((pData->tplName == NULL) ? getDfltTpl() : pData->tplName); CHKiRet(OMSRsetEntry(*ppOMSR, 0, tplToUse, OMSR_NO_RQD_TPL_OPTS)); if(pData->bDynamicName) { |