From 3352d2c605567c29840cc93a358d60881c865cb7 Mon Sep 17 00:00:00 2001 From: Rainer Gerhards Date: Fri, 14 Dec 2012 09:20:51 +0100 Subject: minor cleanup --- plugins/omelasticsearch/omelasticsearch.c | 14 ++++++++++++-- runtime/msg.c | 1 + tools/syslogd.c | 1 - 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/plugins/omelasticsearch/omelasticsearch.c b/plugins/omelasticsearch/omelasticsearch.c index 982f4318..499a2bb2 100644 --- a/plugins/omelasticsearch/omelasticsearch.c +++ b/plugins/omelasticsearch/omelasticsearch.c @@ -405,6 +405,8 @@ writeDataError(instanceData *pData, cJSON **pReplyRoot, uchar *reqmsg) cJSON *errRoot; cJSON *req; cJSON *replyRoot = *pReplyRoot; + size_t toWrite; + ssize_t wrRet; char errStr[1024]; DEFiRet; @@ -432,8 +434,16 @@ writeDataError(instanceData *pData, cJSON **pReplyRoot, uchar *reqmsg) cJSON_AddItemToObject(errRoot, "request", req); cJSON_AddItemToObject(errRoot, "reply", replyRoot); rendered = cJSON_Print(errRoot); -DBGPRINTF("omelasticsearch: error record: '%s'\n", rendered); - write(pData->fdErrFile, rendered, strlen(rendered)); + /* we do not do real error-handling on the err file, as this finally complicates + * things way to much. + */ + DBGPRINTF("omelasticsearch: error record: '%s'\n", rendered); + toWrite = strlen(rendered); + wrRet = write(pData->fdErrFile, rendered, toWrite); + if(wrRet != (ssize_t) toWrite) { + DBGPRINTF("omelasticsearch: error %d writing error file, write returns %lld\n", + errno, (long long) wrRet); + } free(rendered); cJSON_Delete(errRoot); *pReplyRoot = NULL; /* tell caller not to delete once again! */ diff --git a/runtime/msg.c b/runtime/msg.c index ce863299..86805af1 100644 --- a/runtime/msg.c +++ b/runtime/msg.c @@ -1198,6 +1198,7 @@ finalize_it: var.Destruct(&pVar); RETiRet; } +#undef isProp /* Increment reference count - see description of the "msg" diff --git a/tools/syslogd.c b/tools/syslogd.c index 4be8536d..bd5b52ca 100644 --- a/tools/syslogd.c +++ b/tools/syslogd.c @@ -622,7 +622,6 @@ submitMsg(msg_t *pMsg) rsRetVal multiSubmitMsg2(multi_submit_t *pMultiSub) { - int i; qqueue_t *pQueue; ruleset_t *pRuleset; DEFiRet; -- cgit v1.2.3