summaryrefslogtreecommitdiffstats
path: root/runtime
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2011-12-20 18:35:20 +0100
committerRainer Gerhards <rgerhards@adiscon.com>2011-12-20 18:35:20 +0100
commit22b7ecfe76fefcbf7f911e8737d2c9fd55f60edd (patch)
tree86bd79e8254879f6668152f25fd33b4bd7101d36 /runtime
parent55db71963e312634f78c25b61dd4800036fe25f9 (diff)
parentaf720e9f9dffa205cf4b323c2a420c1cca6ddc17 (diff)
downloadrsyslog-22b7ecfe76fefcbf7f911e8737d2c9fd55f60edd.tar.gz
rsyslog-22b7ecfe76fefcbf7f911e8737d2c9fd55f60edd.tar.xz
rsyslog-22b7ecfe76fefcbf7f911e8737d2c9fd55f60edd.zip
Merge branch 'v5-stable-newstats' into v5-devel
Conflicts: plugins/imuxsock/imuxsock.c
Diffstat (limited to 'runtime')
-rw-r--r--runtime/statsobj.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/runtime/statsobj.c b/runtime/statsobj.c
index e1a89cf4..131605e0 100644
--- a/runtime/statsobj.c
+++ b/runtime/statsobj.c
@@ -154,9 +154,11 @@ addCounter(statsobj_t *pThis, uchar *ctrName, statsCtrType_t ctrType, void *pCtr
switch(ctrType) {
case ctrType_IntCtr:
ctr->val.pIntCtr = (intctr_t*) pCtr;
+ *(ctr->val.pIntCtr) = 0;
break;
case ctrType_Int:
ctr->val.pInt = (int*) pCtr;
+ *(ctr->val.pInt) = 0;
break;
}
addCtrToList(pThis, ctr);