diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-10-10 11:10:20 +0200 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-10-10 11:10:20 +0200 |
commit | 2aa16d3b1ea39622dfc35eb3093ac4c4f4997710 (patch) | |
tree | a253d9a26250f4360bd7abd8810b9f1ee882b039 /tools | |
parent | bf092de0fb3a043dea59900ec9a7b34f7384ca46 (diff) | |
parent | 573a2163dd7314922760f2d9140dfb0b083909d9 (diff) | |
download | rsyslog-2aa16d3b1ea39622dfc35eb3093ac4c4f4997710.tar.gz rsyslog-2aa16d3b1ea39622dfc35eb3093ac4c4f4997710.tar.xz rsyslog-2aa16d3b1ea39622dfc35eb3093ac4c4f4997710.zip |
Merge branch 'beta'
Conflicts:
ChangeLog
configure.ac
doc/manual.html
Diffstat (limited to 'tools')
-rw-r--r-- | tools/logctl.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/tools/logctl.c b/tools/logctl.c index df332bc2..1ab8ead0 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; |