datetime: use new errmsg interface

see also https://github.com/rsyslog/rsyslog/issues/1684
This commit is contained in:
Jan Gerhards 2018-01-17 19:24:16 +01:00
parent 5ece105097
commit 1216952944

View File

@ -45,7 +45,6 @@
/* static data */
DEFobjStaticHelpers
DEFobjCurrIf(errmsg)
/* the following table of ten powers saves us some computation */
static const int tenPowers[6] = { 1, 10, 100, 1000, 10000, 100000 };
@ -1066,7 +1065,7 @@ syslogTime2time_t(const struct syslogTime *ts)
if(ts->year < 1970 || ts->year > 2100) {
TimeInUnixFormat = 0;
errmsg.LogError(0, RS_RET_ERR, "syslogTime2time_t: invalid year %d "
LogError(0, RS_RET_ERR, "syslogTime2time_t: invalid year %d "
"in timestamp - returning 1970-01-01 instead", ts->year);
goto done;
}
@ -1203,7 +1202,7 @@ int getOrdinal(struct syslogTime *ts)
if(ts->year < 1970 || ts->year > 2100) {
yday = 0;
errmsg.LogError(0, RS_RET_ERR, "getOrdinal: invalid year %d "
LogError(0, RS_RET_ERR, "getOrdinal: invalid year %d "
"in timestamp - returning 1970-01-01 instead", ts->year);
goto done;
}
@ -1356,7 +1355,6 @@ ENDobjQueryInterface(datetime)
*/
BEGINAbstractObjClassInit(datetime, 1, OBJ_IS_CORE_MODULE) /* class, version */
/* request objects we use */
CHKiRet(objUse(errmsg, CORE_COMPONENT));
ENDObjClassInit(datetime)
/* vi:set ai: