Remove rpmError() and rpmMessage() retrofitting

diff --git a/rpmio/rpmerr.h b/rpmio/rpmerr.h
index 71e63b4..a0864d9 100644 (file)
--- a/rpmio/rpmerr.h
+++ b/rpmio/rpmerr.h
@@ -115,15 +115,6 @@ typedef enum rpmerrCode_e {
     RPMWARN_FLOCK      = _wm(512u+27)  /*!< locking the database failed */
 } rpmerrCode;
 
-/**
- * Retrofit rpmError() onto rpmlog sub-system.
- */
-#define        rpmError                        rpmlog
-#define        rpmErrorCode()                  rpmlogCode()
-#define        rpmErrorString()                rpmlogMessage()
-#define        rpmErrorSetCallback(_cb)        rpmlogSetCallback(_cb)
-typedef rpmlogCallback rpmErrorCallBackType;
-
 #ifdef __cplusplus
 }   
 #endif

diff --git a/rpmio/rpmmessages.h b/rpmio/rpmmessages.h
index 836087b..b5547cd 100644 (file)
--- a/rpmio/rpmmessages.h
+++ b/rpmio/rpmmessages.h
@@ -12,16 +12,6 @@
 extern "C" {
 #endif
 
-#define        RPMMESS_DEBUG           RPMLOG_DEBUG
-#define        RPMMESS_VERBOSE         RPMLOG_INFO
-#define        RPMMESS_NORMAL          RPMLOG_NOTICE
-#define        RPMMESS_WARNING         RPMLOG_WARNING
-#define        RPMMESS_ERROR           RPMLOG_ERR
-#define        RPMMESS_FATALERROR      RPMLOG_CRIT
-
-#define        RPMMESS_QUIET           RPMMESS_WARNING
-
-#define        rpmMessage              rpmlog
 #define        rpmSetVerbosity(_lvl)   \
        ((void)rpmlogSetMask( RPMLOG_UPTO( RPMLOG_PRI(_lvl))))
 #define        rpmIncreaseVerbosity()  \