diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2013-11-29 16:59:19 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2013-11-29 16:59:19 +0100 |
| commit | c4501ebb5263b3b85bc6a854fcc3b6a35e94840a (patch) | |
| tree | 8ecca199cfeba599e1465e4426b55ca9a67da3b0 /runtime/errmsg.h | |
| parent | 56e2157bae6e5ad9e64ef672735a6e6e45e34312 (diff) | |
| parent | a98b1822a389cd209cb7a6660060abf995fbf715 (diff) | |
| download | rsyslog-c4501ebb5263b3b85bc6a854fcc3b6a35e94840a.tar.gz rsyslog-c4501ebb5263b3b85bc6a854fcc3b6a35e94840a.tar.bz2 rsyslog-c4501ebb5263b3b85bc6a854fcc3b6a35e94840a.zip | |
Merge branch 'v7-devel' into tmp
Conflicts:
action.c
Diffstat (limited to 'runtime/errmsg.h')
| -rw-r--r-- | runtime/errmsg.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/runtime/errmsg.h b/runtime/errmsg.h index dfa70c00..b1b4741f 100644 --- a/runtime/errmsg.h +++ b/runtime/errmsg.h @@ -1,6 +1,6 @@ /* The errmsg object. It is used to emit error message inside rsyslog. * - * Copyright 2008-2012 Rainer Gerhards and Adiscon GmbH. + * Copyright 2008-2013 Rainer Gerhards and Adiscon GmbH. * * This file is part of the rsyslog runtime library. * @@ -23,7 +23,6 @@ #include "errmsg.h" -/* TODO: define error codes */ #define NO_ERRCODE -1 /* the errmsg object */ @@ -34,9 +33,11 @@ typedef struct errmsg_s { /* interfaces */ BEGINinterface(errmsg) /* name must also be changed in ENDinterface macro! */ - void __attribute__((format(printf, 3, 4))) (*LogError)(int iErrno, int iErrCode, char *pszErrFmt, ... ); + void __attribute__((format(printf, 3, 4))) (*LogError)(const int iErrno, const int iErrCode, const char *pszErrFmt, ... ); + /* v2, 2013-11-29 */ + void __attribute__((format(printf, 4, 5))) (*LogMsg)(const int iErrno, const int iErrCode, const int severity, const char *pszErrFmt, ... ); ENDinterface(errmsg) -#define errmsgCURR_IF_VERSION 1 /* increment whenever you change the interface structure! */ +#define errmsgCURR_IF_VERSION 2 /* increment whenever you change the interface structure! */ /* prototypes */ |