* @return header entry
*/
static
-indexEntry findEntry(Header h, rpmTag tag, rpmTagType type)
+indexEntry findEntry(Header h, rpmTagVal tag, rpmTagType type)
{
indexEntry entry;
struct indexEntry_s key;
return NULL;
}
-int headerDel(Header h, rpmTag tag)
+int headerDel(Header h, rpmTagVal tag)
{
indexEntry last = h->index + h->indexUsed;
indexEntry entry, first;
return h;
}
-Header headerReload(Header h, rpmTag tag)
+Header headerReload(Header h, rpmTagVal tag)
{
Header nh;
size_t length;
return (nb == length ? 0 : 1);
}
-int headerIsEntry(Header h, rpmTag tag)
+int headerIsEntry(Header h, rpmTagVal tag)
{
/* FIX: h modified by sort. */
return (findEntry(h, tag, RPM_NULL_TYPE) ? 1 : 0);
return ((rc == 1) ? 1 : 0);
}
-int headerGet(Header h, rpmTag tag, rpmtd td, headerGetFlags flags)
+int headerGet(Header h, rpmTagVal tag, rpmtd td, headerGetFlags flags)
{
int rc;
headerTagTagFunction tagfunc = intGetTdEntry;
return rc;
}
-int headerAddI18NString(Header h, rpmTag tag, const char * string,
+int headerAddI18NString(Header h, rpmTagVal tag, const char * string,
const char * lang)
{
indexEntry table, entry;
return entry;
}
-rpmTag headerNextTag(HeaderIterator hi)
+rpmTagVal headerNextTag(HeaderIterator hi)
{
indexEntry entry = nextIndex(hi);
return entry ? entry->info.tag : RPMTAG_NOT_FOUND;
* @param tag region tag
* @return on-disk header (with offsets)
*/
-Header headerReload(Header h, rpmTag tag);
+Header headerReload(Header h, rpmTagVal tag);
/** \ingroup header
* Duplicate a header.
* @param tag tag
* @return 1 on success, 0 on failure
*/
-int headerIsEntry(Header h, rpmTag tag);
+int headerIsEntry(Header h, rpmTagVal tag);
/** \ingroup header
* Modifier flags for headerGet() operation.
* @param flags retrieval modifier flags
* @return 1 on success, 0 on failure
*/
-int headerGet(Header h, rpmTag tag, rpmtd td, headerGetFlags flags);
+int headerGet(Header h, rpmTagVal tag, rpmtd td, headerGetFlags flags);
enum headerPutFlags_e {
* @return 1 on success, 0 on failure
*
*/
-int headerPutString(Header h, rpmTag tag, const char *val);
-int headerPutStringArray(Header h, rpmTag tag, const char **val, rpm_count_t size);
-int headerPutBin(Header h, rpmTag tag, const uint8_t *val, rpm_count_t size);
-int headerPutChar(Header h, rpmTag tag, const char *val, rpm_count_t size);
-int headerPutUint8(Header h, rpmTag tag, const uint8_t *val, rpm_count_t size);
-int headerPutUint16(Header h, rpmTag tag, const uint16_t *val, rpm_count_t size);
-int headerPutUint32(Header h, rpmTag tag, const uint32_t *val, rpm_count_t size);
-int headerPutUint64(Header h, rpmTag tag, const uint64_t *val, rpm_count_t size);
+int headerPutString(Header h, rpmTagVal tag, const char *val);
+int headerPutStringArray(Header h, rpmTagVal tag, const char **val, rpm_count_t size);
+int headerPutBin(Header h, rpmTagVal tag, const uint8_t *val, rpm_count_t size);
+int headerPutChar(Header h, rpmTagVal tag, const char *val, rpm_count_t size);
+int headerPutUint8(Header h, rpmTagVal tag, const uint8_t *val, rpm_count_t size);
+int headerPutUint16(Header h, rpmTagVal tag, const uint16_t *val, rpm_count_t size);
+int headerPutUint32(Header h, rpmTagVal tag, const uint32_t *val, rpm_count_t size);
+int headerPutUint64(Header h, rpmTagVal tag, const uint64_t *val, rpm_count_t size);
/** @} */
/** \ingroup header
* @param lang locale
* @return 1 on success, 0 on failure
*/
-int headerAddI18NString(Header h, rpmTag tag, const char * string,
+int headerAddI18NString(Header h, rpmTagVal tag, const char * string,
const char * lang);
/** \ingroup header
* @param tag tag
* @return 0 on success, 1 on failure (INCONSISTENT)
*/
-int headerDel(Header h, rpmTag tag);
+int headerDel(Header h, rpmTagVal tag);
/** \ingroup header
* Return formatted output string from header tags.
* @param tagstocopy array of tags that are copied
*/
void headerCopyTags(Header headerFrom, Header headerTo,
- const rpmTag * tagstocopy);
+ const rpmTagVal * tagstocopy);
/** \ingroup header
* Destroy header tag iterator.
* @param hi header tag iterator
* @return next tag, RPMTAG_NOT_FOUND to stop iteration
*/
-rpmTag headerNextTag(HeaderIterator hi);
+rpmTagVal headerNextTag(HeaderIterator hi);
/** \ingroup header
* Return name, version, release strings from header.
* @param tag tag to retrieve
* @return string pointer (malloced) or NULL on failure
*/
-char * headerGetAsString(Header h, rpmTag tag);
+char * headerGetAsString(Header h, rpmTagVal tag);
/** \ingroup header
* Return a simple string tag from header
* @param tag tag to retrieve
* @return string pointer (to header memory) or NULL on failure
*/
-const char * headerGetString(Header h, rpmTag tag);
+const char * headerGetString(Header h, rpmTagVal tag);
/* \ingroup header
* Return a simple number tag (or extension) from header
* @param tag tag to retrieve
* @return numeric tag value or 0 on failure
*/
-uint64_t headerGetNumber(Header h, rpmTag tag);
+uint64_t headerGetNumber(Header h, rpmTagVal tag);
/** \ingroup header
* Return header color.
typedef struct sprintfTag_s * sprintfTag;
struct sprintfTag_s {
headerTagFormatFunction fmt;
- rpmTag tag;
+ rpmTagVal tag;
int justOne;
char * format;
char * type;
return 0;
}
-static rpmtd getCached(rpmtd *cache, rpmTag tag)
+static rpmtd getCached(rpmtd *cache, rpmTagVal tag)
{
rpmtd td = NULL;
* @retval *countptr
* @return 1 on success, 0 on failure
*/
-static rpmtd getData(headerSprintfArgs hsa, rpmTag tag)
+static rpmtd getData(headerSprintfArgs hsa, rpmTagVal tag)
{
rpmtd td = NULL;
}
void headerCopyTags(Header headerFrom, Header headerTo,
- const rpmTag * tagstocopy)
+ const rpmTagVal * tagstocopy)
{
- const rpmTag * p;
+ const rpmTagVal * p;
struct rpmtd_s td;
if (headerFrom == headerTo)
}
}
-char * headerGetAsString(Header h, rpmTag tag)
+char * headerGetAsString(Header h, rpmTagVal tag)
{
char *res = NULL;
struct rpmtd_s td;
return res;
}
-const char * headerGetString(Header h, rpmTag tag)
+const char * headerGetString(Header h, rpmTagVal tag)
{
const char *res = NULL;
struct rpmtd_s td;
return res;
}
-uint64_t headerGetNumber(Header h, rpmTag tag)
+uint64_t headerGetNumber(Header h, rpmTagVal tag)
{
uint64_t res = 0;
struct rpmtd_s td;
* Sanity check data types against tag table before putting. Assume
* append on all array-types.
*/
-static int headerPutType(Header h, rpmTag tag, rpmTagType reqtype,
+static int headerPutType(Header h, rpmTagVal tag, rpmTagType reqtype,
rpm_constdata_t data, rpm_count_t size)
{
struct rpmtd_s td;
return valid;
}
-int headerPutString(Header h, rpmTag tag, const char *val)
+int headerPutString(Header h, rpmTagVal tag, const char *val)
{
rpmTagType type = rpmTagGetTagType(tag);
const void *sptr = NULL;
return headerPutType(h, tag, type, sptr, 1);
}
-int headerPutStringArray(Header h, rpmTag tag, const char **array, rpm_count_t size)
+int headerPutStringArray(Header h, rpmTagVal tag, const char **array, rpm_count_t size)
{
return headerPutType(h, tag, RPM_STRING_ARRAY_TYPE, array, size);
}
-int headerPutChar(Header h, rpmTag tag, const char *val, rpm_count_t size)
+int headerPutChar(Header h, rpmTagVal tag, const char *val, rpm_count_t size)
{
return headerPutType(h, tag, RPM_CHAR_TYPE, val, size);
}
-int headerPutUint8(Header h, rpmTag tag, const uint8_t *val, rpm_count_t size)
+int headerPutUint8(Header h, rpmTagVal tag, const uint8_t *val, rpm_count_t size)
{
return headerPutType(h, tag, RPM_INT8_TYPE, val, size);
}
-int headerPutUint16(Header h, rpmTag tag, const uint16_t *val, rpm_count_t size)
+int headerPutUint16(Header h, rpmTagVal tag, const uint16_t *val, rpm_count_t size)
{
return headerPutType(h, tag, RPM_INT16_TYPE, val, size);
}
-int headerPutUint32(Header h, rpmTag tag, const uint32_t *val, rpm_count_t size)
+int headerPutUint32(Header h, rpmTagVal tag, const uint32_t *val, rpm_count_t size)
{
return headerPutType(h, tag, RPM_INT32_TYPE, val, size);
}
-int headerPutUint64(Header h, rpmTag tag, const uint64_t *val, rpm_count_t size)
+int headerPutUint64(Header h, rpmTagVal tag, const uint64_t *val, rpm_count_t size)
{
return headerPutType(h, tag, RPM_INT64_TYPE, val, size);
}
-int headerPutBin(Header h, rpmTag tag, const uint8_t *val, rpm_count_t size)
+int headerPutBin(Header h, rpmTagVal tag, const uint8_t *val, rpm_count_t size)
{
return headerPutType(h, tag, RPM_BIN_TYPE, val, size);
}
typedef int (*headerTagTagFunction) (Header h, rpmtd td, headerGetFlags hgflags);
RPM_GNUC_INTERNAL
-headerTagTagFunction rpmHeaderTagFunc(rpmTag tag);
+headerTagTagFunction rpmHeaderTagFunc(rpmTagVal tag);
RPM_GNUC_INTERNAL
headerTagFormatFunction rpmHeaderFormatFuncByName(const char *fmt);
return (td->type == RPM_BIN_TYPE) ? 1 : td->count;
}
-rpmTag rpmtdTag(rpmtd td)
+rpmTagVal rpmtdTag(rpmtd td)
{
assert(td != NULL);
return td->tag;
return str;
}
-int rpmtdSetTag(rpmtd td, rpmTag tag)
+int rpmtdSetTag(rpmtd td, rpmTagVal tag)
{
assert(td != NULL);
rpmTagType newtype = rpmTagGetTagType(tag);
return rc;
}
-static inline int rpmtdSet(rpmtd td, rpmTag tag, rpmTagType type,
+static inline int rpmtdSet(rpmtd td, rpmTagVal tag, rpmTagType type,
rpm_constdata_t data, rpm_count_t count)
{
rpmtdReset(td);
return 1;
}
-int rpmtdFromUint8(rpmtd td, rpmTag tag, uint8_t *data, rpm_count_t count)
+int rpmtdFromUint8(rpmtd td, rpmTagVal tag, uint8_t *data, rpm_count_t count)
{
rpmTagType type = rpmTagGetTagType(tag);
rpmTagReturnType retype = rpmTagGetReturnType(tag);
return rpmtdSet(td, tag, type, data, count);
}
-int rpmtdFromUint16(rpmtd td, rpmTag tag, uint16_t *data, rpm_count_t count)
+int rpmtdFromUint16(rpmtd td, rpmTagVal tag, uint16_t *data, rpm_count_t count)
{
rpmTagType type = rpmTagGetTagType(tag);
rpmTagReturnType retype = rpmTagGetReturnType(tag);
return rpmtdSet(td, tag, type, data, count);
}
-int rpmtdFromUint32(rpmtd td, rpmTag tag, uint32_t *data, rpm_count_t count)
+int rpmtdFromUint32(rpmtd td, rpmTagVal tag, uint32_t *data, rpm_count_t count)
{
rpmTagType type = rpmTagGetTagType(tag);
rpmTagReturnType retype = rpmTagGetReturnType(tag);
return rpmtdSet(td, tag, type, data, count);
}
-int rpmtdFromUint64(rpmtd td, rpmTag tag, uint64_t *data, rpm_count_t count)
+int rpmtdFromUint64(rpmtd td, rpmTagVal tag, uint64_t *data, rpm_count_t count)
{
rpmTagType type = rpmTagGetTagType(tag);
rpmTagReturnType retype = rpmTagGetReturnType(tag);
return rpmtdSet(td, tag, type, data, count);
}
-int rpmtdFromString(rpmtd td, rpmTag tag, const char *data)
+int rpmtdFromString(rpmtd td, rpmTagVal tag, const char *data)
{
rpmTagType type = rpmTagGetTagType(tag);
int rc = 0;
return rc;
}
-int rpmtdFromStringArray(rpmtd td, rpmTag tag, const char **data, rpm_count_t count)
+int rpmtdFromStringArray(rpmtd td, rpmTagVal tag, const char **data, rpm_count_t count)
{
rpmTagType type = rpmTagGetTagType(tag);
if (type != RPM_STRING_ARRAY_TYPE || count < 1)
return rpmtdSet(td, tag, type, data, count);
}
-int rpmtdFromArgv(rpmtd td, rpmTag tag, ARGV_t argv)
+int rpmtdFromArgv(rpmtd td, rpmTagVal tag, ARGV_t argv)
{
int count = argvCount(argv);
rpmTagType type = rpmTagGetTagType(tag);
return rpmtdSet(td, tag, type, argv, count);
}
-int rpmtdFromArgi(rpmtd td, rpmTag tag, ARGI_t argi)
+int rpmtdFromArgi(rpmtd td, rpmTagVal tag, ARGI_t argi)
{
int count = argiCount(argi);
rpmTagType type = rpmTagGetTagType(tag);
* @param td Tag data container
* @return Rpm tag.
*/
-rpmTag rpmtdTag(rpmtd td);
+rpmTagVal rpmtdTag(rpmtd td);
/** \ingroup rpmtd
* Retrieve type of the container.
* @param tag New tag
* @return 1 on success, 0 on error
*/
-int rpmtdSetTag(rpmtd td, rpmTag tag);
+int rpmtdSetTag(rpmtd td, rpmTagVal tag);
/** \ingroup rpmtd
* Construct tag container from uint8_t pointer.
* @param count Number of entries
* @return 1 on success, 0 on error (eg wrong type)
*/
-int rpmtdFromUint8(rpmtd td, rpmTag tag, uint8_t *data, rpm_count_t count);
+int rpmtdFromUint8(rpmtd td, rpmTagVal tag, uint8_t *data, rpm_count_t count);
/** \ingroup rpmtd
* Construct tag container from uint16_t pointer.
* @param count Number of entries
* @return 1 on success, 0 on error (eg wrong type)
*/
-int rpmtdFromUint16(rpmtd td, rpmTag tag, uint16_t *data, rpm_count_t count);
+int rpmtdFromUint16(rpmtd td, rpmTagVal tag, uint16_t *data, rpm_count_t count);
/** \ingroup rpmtd
* Construct tag container from uint32_t pointer.
* @param count Number of entries
* @return 1 on success, 0 on error (eg wrong type)
*/
-int rpmtdFromUint32(rpmtd td, rpmTag tag, uint32_t *data, rpm_count_t count);
+int rpmtdFromUint32(rpmtd td, rpmTagVal tag, uint32_t *data, rpm_count_t count);
/** \ingroup rpmtd
* Construct tag container from uint64_t pointer.
* @param count Number of entries
* @return 1 on success, 0 on error (eg wrong type)
*/
-int rpmtdFromUint64(rpmtd td, rpmTag tag, uint64_t *data, rpm_count_t count);
+int rpmtdFromUint64(rpmtd td, rpmTagVal tag, uint64_t *data, rpm_count_t count);
/** \ingroup rpmtd
* Construct tag container from a string.
* @param data String to use
* @return 1 on success, 0 on error (eg wrong type)
*/
-int rpmtdFromString(rpmtd td, rpmTag tag, const char *data);
+int rpmtdFromString(rpmtd td, rpmTagVal tag, const char *data);
/** \ingroup rpmtd
* Construct tag container from a string array.
* @param count Number of entries
* @return 1 on success, 0 on error (eg wrong type)
*/
-int rpmtdFromStringArray(rpmtd td, rpmTag tag, const char **data, rpm_count_t count);
+int rpmtdFromStringArray(rpmtd td, rpmTagVal tag, const char **data, rpm_count_t count);
/** \ingroup rpmtd
* Construct tag container from ARGV_t array.
* @param argv ARGV array
* @return 1 on success, 0 on error (eg wrong type)
*/
-int rpmtdFromArgv(rpmtd td, rpmTag tag, ARGV_t argv);
+int rpmtdFromArgv(rpmtd td, rpmTagVal tag, ARGV_t argv);
/** \ingroup rpmtd
* Construct tag container from ARGI_t array.
* @param argi ARGI array
* @return 1 on success, 0 on error (eg wrong type)
*/
-int rpmtdFromArgi(rpmtd td, rpmTag tag, ARGI_t argi);
+int rpmtdFromArgi(rpmtd td, rpmTagVal tag, ARGI_t argi);
/* \ingroup rpmtd
* Perform deep copy of container.
{ 0, NULL }
};
-headerTagTagFunction rpmHeaderTagFunc(rpmTag tag)
+headerTagTagFunction rpmHeaderTagFunc(rpmTagVal tag)
{
const struct headerTagFunc_s * ext;
headerTagTagFunction func = NULL;