From 82aeadce540240396d13d3355d4ef04e3524acbf Mon Sep 17 00:00:00 2001 From: Rainer Gerhards Date: Wed, 5 Sep 2007 15:59:47 +0000 Subject: - changed part of the CStr interface so that better error tracking is provided and the calling sequence is more intuitive (there were invalid calls based on a too-weired interface) - (hopefully) fixed some remaining bugs rooted in wrong use of the CStr class. These could lead to program abort. --- rsyslog.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'rsyslog.h') diff --git a/rsyslog.h b/rsyslog.h index 33c14ae4..6ecb7440 100644 --- a/rsyslog.h +++ b/rsyslog.h @@ -81,6 +81,8 @@ typedef enum rsRetVal_ rsRetVal; /**< friendly type for global return value */ #define CHKiRet(code) if((iRet = code) != RS_RET_OK) goto finalize_it /* macro below is to be used if we need our own handling, eg for cleanup */ #define CHKiRet_Hdlr(code) if((iRet = code) != RS_RET_OK) +/* macro below is used in conjunction with CHKiRet_Hdlr, else use ABORT_FINALIZE */ +#define FINALIZE goto finalize_it; #define DEFiRet rsRetVal iRet = RS_RET_OK #define ABORT_FINALIZE(errCode) \ do { \ -- cgit