summaryrefslogtreecommitdiffstats
path: root/tools/rsgtutil.c
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2013-03-23 12:24:23 +0100
committerRainer Gerhards <rgerhards@adiscon.com>2013-03-23 12:24:23 +0100
commit6bc94b09b219aee8ef81db78fe7f2b280cb40b6a (patch)
tree2c1e442454358b41d6b31db3a995aa862f46c169 /tools/rsgtutil.c
parent21553364368b3b23b4b2007f9526b29c898287ab (diff)
downloadrsyslog-6bc94b09b219aee8ef81db78fe7f2b280cb40b6a.tar.gz
rsyslog-6bc94b09b219aee8ef81db78fe7f2b280cb40b6a.tar.bz2
rsyslog-6bc94b09b219aee8ef81db78fe7f2b280cb40b6a.zip
logsig: refactor 'dump' mode in rsgtutil
The way tlvrecords are processed is changed in order to provide better extensibility for further work.
Diffstat (limited to 'tools/rsgtutil.c')
-rw-r--r--tools/rsgtutil.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/tools/rsgtutil.c b/tools/rsgtutil.c
index 9d9f3568..c5ac5066 100644
--- a/tools/rsgtutil.c
+++ b/tools/rsgtutil.c
@@ -44,8 +44,8 @@ dumpFile(char *name)
{
FILE *fp;
uchar hdr[9];
- uint16_t tlvtype, tlvlen;
void *obj;
+ tlvrecord_t rec;
int r = -1;
if(!strcmp(name, "-"))
@@ -60,13 +60,14 @@ dumpFile(char *name)
if((r = rsgt_tlvrdHeader(fp, hdr)) != 0) goto err;
printf("File Header: '%s'\n", hdr);
while(1) { /* we will err out on EOF */
- if((r = rsgt_tlvrd(fp, &tlvtype, &tlvlen, &obj)) != 0) {
+ if((r = rsgt_tlvrd(fp, &rec, &obj)) != 0) {
if(feof(fp))
break;
else
goto err;
}
- rsgt_tlvprint(stdout, tlvtype, obj, verbose);
+ rsgt_tlvprint(stdout, rec.tlvtype, obj, verbose);
+ rsgt_objfree(rec.tlvtype, obj);
}
if(fp != stdin)