diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-10-15 12:31:56 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-10-15 12:31:56 +0200 |
| commit | 706ddb492345e53d36084d0b843f237da865c6d4 (patch) | |
| tree | 5c21c06e0f4c0ce15fa2d8413c149d687be43e72 /tools/logctl.c | |
| parent | a3a3a322d8c7d40dfed0765457d26a484a624bce (diff) | |
| parent | 2014cf85627b8774e8c36ddecad04f1ebf43020b (diff) | |
| download | rsyslog-706ddb492345e53d36084d0b843f237da865c6d4.tar.gz rsyslog-706ddb492345e53d36084d0b843f237da865c6d4.tar.bz2 rsyslog-706ddb492345e53d36084d0b843f237da865c6d4.zip | |
Merge branch 'master' into master-ratelimit
Conflicts:
ChangeLog
doc/v7compatibility.html
Diffstat (limited to 'tools/logctl.c')
| -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; |