From 037ceff668aca5985870e4c6cf5250adbddc4dae Mon Sep 17 00:00:00 2001 From: Panu Matilainen Date: Fri, 7 Dec 2007 13:31:31 +0200 Subject: [PATCH] Rename RPMLOG_CONT to RPMLOG_DEFAULT to make purpose clearer (hopefully ;) --- rpmio/rpmlog.c | 4 ++-- rpmio/rpmlog.h | 7 ++++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/rpmio/rpmlog.c b/rpmio/rpmlog.c index 8d13446..7dbc911 100644 --- a/rpmio/rpmlog.c +++ b/rpmio/rpmlog.c @@ -169,7 +169,7 @@ static void vrpmlog (unsigned code, const char *fmt, va_list ap) #endif char *msgbuf, *msg; int msgnb = BUFSIZ, nb; - int cbrc = RPMLOG_CONT; + int cbrc = RPMLOG_DEFAULT; int needexit = 0; struct rpmlogRec_s rec; @@ -221,7 +221,7 @@ static void vrpmlog (unsigned code, const char *fmt, va_list ap) needexit += cbrc & RPMLOG_EXIT; } - if (cbrc & RPMLOG_CONT) { + if (cbrc & RPMLOG_DEFAULT) { cbrc = rpmlogDefault(&rec); needexit += cbrc & RPMLOG_EXIT; } diff --git a/rpmio/rpmlog.h b/rpmio/rpmlog.h index d9f3864..ffeeeee 100644 --- a/rpmio/rpmlog.h +++ b/rpmio/rpmlog.h @@ -152,7 +152,7 @@ RPMCODE facilitynames[] = /* \ingroup rpmlog * Option flags for callback return value. */ -#define RPMLOG_CONT 0x01 /*!< perform default logging */ +#define RPMLOG_DEFAULT 0x01 /*!< perform default logging */ #define RPMLOG_EXIT 0x02 /*!< exit after logging */ /** \ingroup rpmlog @@ -165,8 +165,9 @@ typedef void * rpmlogCallbackData; * @param rec rpmlog record * @param data private callback data * @return flags to define further behavior: - * RPMLOG_CONT to continue to default logger, - * RPMLOG_EXIT to exit after processing + * RPMLOG_DEFAULT to perform default logging, + * RPMLOG_EXIT to exit after processing, + * 0 to return after callback */ typedef int (*rpmlogCallback) (rpmlogRec rec, rpmlogCallbackData data); -- 2.7.4