move compatibility wrapper to rpm5.org upstream

2 files changed, 3 insertions, 216 deletions

diff --git a/URPM.xs b/URPM.xs
index 8f69ce2..70e8e37 100644
--- a/URPM.xs
+++ b/URPM.xs
@@ -52,13 +52,12 @@ typedef struct rpmSpec_s * Spec;
 #include <rpm/rpmevr.h>
 #endif
 #ifdef RPM_500
-#   define _RPMTAG_INTERNAL
+#include <rpm/rpm4compat.h>
 #endif
 
+
 #include <rpm/rpmlib.h>
-#ifdef RPM_500
-#include "rpm5compat.h"
-#else
+#ifndef RPM_500
 #include <rpm/header.h>
 #endif
 #include <rpm/rpmio.h>
diff --git a/rpm5compat.h b/rpm5compat.h
deleted file mode 100644
index 8b6c2c4..0000000
--- a/rpm5compat.h
+++ /dev/null
@@ -1,212 +0,0 @@
-/*
- * Copyright © 2008 Per Øyvind Karlsen <peroyvind@mandriva.org>
- *
- * $Id$
- */
-
-#ifndef	H_RPM4COMPAT
-#define	H_RPM4COMPAT	1
-
-#define RPM_NULL_TYPE   0
-#define RPM_CHAR_TYPE   RPM_UINT8_TYPE
-#define RPM_INT8_TYPE   RPM_UINT8_TYPE
-#define RPM_INT16_TYPE  RPM_UINT16_TYPE
-#define RPM_INT32_TYPE  RPM_UINT32_TYPE
-#define	RPMTRANS_FLAG_NOMD5	RPMTRANS_FLAG_NOFDIGESTS
-
-#include <fcntl.h>
-#include <unistd.h>
-#include <stdint.h>
-#include <stdio.h>
-
-#define	WITH_DB
-#define _RPMPS_INTERNAL
-#define _RPMEVR_INTERNAL
-#define _RPMTAG_INTERNAL
-#include <rpm/rpmlib.h>
-#include <rpm/rpmevr.h>
-#include <rpm/rpmio.h>
-#include <rpm/pkgio.h>
-#include <rpm/rpmcb.h>
-#include <rpm/rpmts.h>
-#include <rpm/rpmmacro.h>
-#include <rpm/rpmpgp.h>
-
-enum hMagic {
-	HEADER_MAGIC_NO             = 0,
-	HEADER_MAGIC_YES            = 1
-};
-
-
-typedef	uint32_t *	hTAG_t;
-typedef	uint32_t *	hTYP_t;
-typedef	const void *	hPTR_t;
-typedef	uint32_t *	hCNT_t;
-typedef	uint32_t	int_32;
-typedef	uint32_t	uint_32;
-typedef	uint16_t	uint_16;
-typedef	uint8_t		byte;
-
-typedef	union hRET_s {
-	const void * ptr;
-	const char ** argv;
-	const char * str;
-	uint32_t * ui32p;
-	uint16_t * ui16p;
-	uint32_t * i32p;
-	uint16_t * i16p;
-	uint8_t * i8p;
-} * hRET_t;
-
-typedef enum pgpVSFlags_e rpmVSFlags_e;
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-static inline int headerGetEntry(Header h, int_32 tag, hTYP_t type, void ** p, hCNT_t c) {
-	HE_t he = (HE_s*)memset(alloca(sizeof(*he)), 0, sizeof(*he));
-	int rc;
-	
-	/* Always ensure to initialize */
-	*(void **)p = NULL;
-	he->tag = (rpmTag)tag;
-	rc = headerGet(h, he, 0);
-	if (rc) {
-		if (type) *type = he->t;
-		if (p) *(void **) p = he->p.ptr;
-		if (c) *c = he->c;
-	}
-
-	return rc;
-}
-
-
-inline int headerGetRawEntry(Header h, int_32 tag, hTYP_t type, void * p, hCNT_t c) {
-	HE_t he = (HE_s*)memset(alloca(sizeof(*he)), 0, sizeof(*he));
-	int rc;
-
-	he->tag = (rpmTag)tag;
-	he->t = *(rpmTagType*)type;
-	he->p.str = (const char*)p;
-	he->c = *(rpmTagCount*)c;
-
-	rc = headerGet(h, he, tag);
-
-	if (rc) {
-		if (type) *type = he->t;
-		if (p) *(void **) p = he->p.ptr;
-		if (c) *c = he->c;
-	}
-	
-	return rc;
-}
-
-static inline int headerAddEntry(Header h, int_32 tag, int_32 type, const void * p, int_32 c) {
-	HE_t he = (HE_s*)memset(alloca(sizeof(*he)), 0, sizeof(*he));
-
-	he->tag = (rpmTag)tag;
-	he->t = (rpmTagType)type;
-	he->p.str = (const char*)p;
-	he->c = (rpmTagCount)c;
-	return headerPut(h, he, 0);
-}
-
-static inline int headerRemoveEntry(Header h, int_32 tag) {
-	HE_t he = (HE_s*)memset(alloca(sizeof(*he)), 0, sizeof(*he));
-
-	he->tag = (rpmTag)tag;
-	return headerDel(h, he, 0);
-}
-
-inline int headerModifyEntry(Header h, int_32 tag, int_32 type, const void * p, int_32 c) {
-	HE_t he = (HE_s*)memset(alloca(sizeof(*he)), 0, sizeof(*he));
-
-	he->tag = (rpmTag)tag;
-	he->t = (rpmTagType)type;
-	he->p.str = (const char*)p;
-	he->c = (rpmTagCount)c;
-	return headerMod(h, he, 0);
-
-}
-
-static inline int headerNextIterator(HeaderIterator hi, hTAG_t tag, hTYP_t type, hPTR_t * p, hCNT_t c) {
-	HE_t he = (HE_s*)memset(alloca(sizeof(*he)), 0, sizeof(*he));
-	
-	he->tag = *(rpmTag*)tag;
-	return headerNext(hi, he, 0);
-}
-
-static inline HeaderIterator headerFreeIterator(HeaderIterator hi) {
-	return headerFini(hi);
-}
-
-static inline HeaderIterator headerInitIterator(Header h){
-	return headerInit(h);
-}
-
-inline void * headerFreeData(const void * data, rpmTagType type) {
-	if (data)
-		free((void *)data);
-	return NULL;
-}
-
-static inline int headerWrite(void * _fd, Header h, enum hMagic magicp) {
-	const char item[] = "Header";
-	const char * msg = NULL;
-	rpmRC rc = rpmpkgWrite(item, (FD_t)_fd, h, &msg);
-	if (rc != RPMRC_OK) {
-		rpmlog(RPMLOG_ERR, "%s: %s: %s\n", "headerWrite", item, msg);
-		rc = RPMRC_FAIL;
-	}
-	msg = (const char*)_free(msg);
-	return rc;
-}
-
-static inline Header headerRead(void * _fd, enum hMagic magicp) {
-	const char item[] = "Header";
-	Header h = NULL;
-	const char * msg = NULL;
-	rpmRC rc = rpmpkgRead(item, (FD_t)_fd, &h, &msg);
-	switch (rc) {
-		default:
-			rpmlog(RPMLOG_ERR, "%s: %s: %s\n", "headerRead", item, msg);
-		case RPMRC_NOTFOUND:
-			h = NULL;
-		case RPMRC_OK:
-			break;
-	}
-	msg = (const char*)_free(msg);
-	return h;
-}
-
-inline int rpmMachineScore(int type, const char * name) {
-	char * platform = rpmExpand(name, "-%{_real_vendor}-%{_target_os}%{?_gnu}", NULL);
-	int score = rpmPlatformScore(platform, NULL, 0);
-
-	_free(platform);
-	return score;
-}
-
-#ifdef __cplusplus
-}
-
-inline rpmds rpmdsSingle(rpmTag tagN, const char * N, const char * EVR, int_32 Flags){
-	return rpmdsSingle(tagN, N, EVR, (evrFlags)Flags);
-}
-
-typedef void * (*rpmCallbackFunction_old)
-		(const void * h,
-		 const rpmCallbackType what,
-		 const unsigned long long amount,
-		 const unsigned long long total,
-		 fnpyKey key,
-		 rpmCallbackData data);
-
-inline int rpmtsSetNotifyCallback(rpmts ts, rpmCallbackFunction_old notify, rpmCallbackData notifyData){
-	return rpmtsSetNotifyCallback(ts, (rpmCallbackFunction)notify, notifyData);
-}
-#endif
-
-#endif /* rpm4compat.h */
-