summaryrefslogtreecommitdiff
path: root/lib/rpmtd.c
diff options
context:
space:
mode:
Diffstat (limited to 'lib/rpmtd.c')
-rw-r--r--lib/rpmtd.c92
1 files changed, 43 insertions, 49 deletions
diff --git a/lib/rpmtd.c b/lib/rpmtd.c
index 550d733ab..e33c8cb53 100644
--- a/lib/rpmtd.c
+++ b/lib/rpmtd.c
@@ -19,7 +19,7 @@ rpmtd rpmtdFree(rpmtd td)
{
/* permit free on NULL td */
if (td != NULL) {
- /* XXX should we free data too - a flag maybe? */
+ rpmtdFreeData(td);
free(td);
}
return NULL;
@@ -27,19 +27,16 @@ rpmtd rpmtdFree(rpmtd td)
void rpmtdReset(rpmtd td)
{
- assert(td != NULL);
-
- memset(td, 0, sizeof(*td));
- td->ix = -1;
+ if (td) {
+ memset(td, 0, sizeof(*td));
+ td->ix = -1;
+ }
}
void rpmtdFreeData(rpmtd td)
{
- assert(td != NULL);
-
- if (td->flags & RPMTD_ALLOCED) {
+ if (td && td->data && td->flags & RPMTD_ALLOCED) {
if (td->flags & RPMTD_PTR_ALLOCED) {
- assert(td->data != NULL);
char **data = td->data;
for (int i = 0; i < td->count; i++) {
free(data[i]);
@@ -52,27 +49,32 @@ void rpmtdFreeData(rpmtd td)
rpm_count_t rpmtdCount(rpmtd td)
{
- assert(td != NULL);
- /* fix up for binary type abusing count as data length */
- return (td->type == RPM_BIN_TYPE) ? 1 : td->count;
+ rpm_count_t count = 0;
+ if (td != NULL) {
+ /* fix up for binary type abusing count as data length */
+ count = (td->type == RPM_BIN_TYPE) ? 1 : td->count;
+ }
+ return count;
+}
+
+rpm_count_t rpmtdSize(rpmtd td)
+{
+ return (td != NULL) ? td->size : 0;
}
rpmTagVal rpmtdTag(rpmtd td)
{
- assert(td != NULL);
- return td->tag;
+ return (td != NULL) ? td->tag : 0;
}
rpmTagType rpmtdType(rpmtd td)
{
- assert(td != NULL);
- return td->type;
+ return (td != NULL) ? td->type : 0;
}
rpmTagClass rpmtdClass(rpmtd td)
{
- assert(td != NULL);
- return rpmTagTypeGetClass(td->type);
+ return (td != NULL) ? rpmTagTypeGetClass(td->type) : 0;
}
rpmtdFlags rpmtdGetFlags(rpmtd td)
@@ -82,15 +84,12 @@ rpmtdFlags rpmtdGetFlags(rpmtd td)
int rpmtdGetIndex(rpmtd td)
{
- assert(td != NULL);
- return td->ix;
+ return (td != NULL) ? td->ix : -1;
}
int rpmtdSetIndex(rpmtd td, int index)
{
- assert(td != NULL);
-
- if (index < 0 || index >= rpmtdCount(td)) {
+ if (td == NULL || index < 0 || index >= rpmtdCount(td)) {
return -1;
}
td->ix = index;
@@ -99,7 +98,8 @@ int rpmtdSetIndex(rpmtd td, int index)
int rpmtdInit(rpmtd td)
{
- assert(td != NULL);
+ if (td == NULL)
+ return -1;
/* XXX check that this is an array type? */
td->ix = -1;
@@ -108,11 +108,9 @@ int rpmtdInit(rpmtd td)
int rpmtdNext(rpmtd td)
{
- assert(td != NULL);
-
int i = -1;
- if (++td->ix >= 0) {
+ if (td != NULL && ++td->ix >= 0) {
if (td->ix < rpmtdCount(td)) {
i = td->ix;
} else {
@@ -124,7 +122,6 @@ int rpmtdNext(rpmtd td)
uint32_t *rpmtdNextUint32(rpmtd td)
{
- assert(td != NULL);
uint32_t *res = NULL;
if (rpmtdNext(td) >= 0) {
res = rpmtdGetUint32(td);
@@ -134,7 +131,6 @@ uint32_t *rpmtdNextUint32(rpmtd td)
uint64_t *rpmtdNextUint64(rpmtd td)
{
- assert(td != NULL);
uint64_t *res = NULL;
if (rpmtdNext(td) >= 0) {
res = rpmtdGetUint64(td);
@@ -144,7 +140,6 @@ uint64_t *rpmtdNextUint64(rpmtd td)
const char *rpmtdNextString(rpmtd td)
{
- assert(td != NULL);
const char *res = NULL;
if (rpmtdNext(td) >= 0) {
res = rpmtdGetString(td);
@@ -156,9 +151,7 @@ char * rpmtdGetChar(rpmtd td)
{
char *res = NULL;
- assert(td != NULL);
-
- if (td->type == RPM_CHAR_TYPE) {
+ if (td != NULL && td->type == RPM_CHAR_TYPE) {
int ix = (td->ix >= 0 ? td->ix : 0);
res = (char *) td->data + ix;
}
@@ -168,9 +161,7 @@ uint16_t * rpmtdGetUint16(rpmtd td)
{
uint16_t *res = NULL;
- assert(td != NULL);
-
- if (td->type == RPM_INT16_TYPE) {
+ if (td != NULL && td->type == RPM_INT16_TYPE) {
int ix = (td->ix >= 0 ? td->ix : 0);
res = (uint16_t *) td->data + ix;
}
@@ -181,9 +172,7 @@ uint32_t * rpmtdGetUint32(rpmtd td)
{
uint32_t *res = NULL;
- assert(td != NULL);
-
- if (td->type == RPM_INT32_TYPE) {
+ if (td != NULL && td->type == RPM_INT32_TYPE) {
int ix = (td->ix >= 0 ? td->ix : 0);
res = (uint32_t *) td->data + ix;
}
@@ -194,9 +183,7 @@ uint64_t * rpmtdGetUint64(rpmtd td)
{
uint64_t *res = NULL;
- assert(td != NULL);
-
- if (td->type == RPM_INT64_TYPE) {
+ if (td != NULL && td->type == RPM_INT64_TYPE) {
int ix = (td->ix >= 0 ? td->ix : 0);
res = (uint64_t *) td->data + ix;
}
@@ -207,7 +194,8 @@ const char * rpmtdGetString(rpmtd td)
{
const char *str = NULL;
- assert(td != NULL);
+ if (td == NULL)
+ return NULL;
if (td->type == RPM_STRING_TYPE) {
str = (const char *) td->data;
@@ -222,10 +210,12 @@ const char * rpmtdGetString(rpmtd td)
uint64_t rpmtdGetNumber(rpmtd td)
{
- assert(td != NULL);
uint64_t val = 0;
int ix = (td->ix >= 0 ? td->ix : 0);
+ if (td == NULL)
+ return 0;
+
switch (td->type) {
case RPM_INT64_TYPE:
val = *((uint64_t *) td->data + ix);
@@ -248,12 +238,12 @@ uint64_t rpmtdGetNumber(rpmtd td)
char *rpmtdFormat(rpmtd td, rpmtdFormats fmt, const char *errmsg)
{
- headerTagFormatFunction func = rpmHeaderFormatFuncByValue(fmt);
+ headerFmt ext = rpmHeaderFormatByValue(fmt);
const char *err = NULL;
char *str = NULL;
- if (func) {
- str = func(td);
+ if (ext) {
+ str = rpmHeaderFormatCall(ext, td);
} else {
err = _("Unknown format");
}
@@ -267,10 +257,12 @@ char *rpmtdFormat(rpmtd td, rpmtdFormats fmt, const char *errmsg)
int rpmtdSetTag(rpmtd td, rpmTagVal tag)
{
- assert(td != NULL);
rpmTagType newtype = rpmTagGetTagType(tag);
int rc = 0;
+ if (td == NULL)
+ goto exit;
+
/*
* Sanity checks:
* - is the new tag valid at all
@@ -425,8 +417,10 @@ rpmtd rpmtdDup(rpmtd td)
rpmtd newtd = NULL;
char **data = NULL;
int i;
+
+ if (td == NULL)
+ return NULL;
- assert(td != NULL);
/* TODO: permit other types too */
if (td->type != RPM_STRING_ARRAY_TYPE && td->type != RPM_I18NSTRING_TYPE) {
return NULL;
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-29 14:34:13 +0000