aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPer Øyvind Karlsen <peroyvind@mandriva.org>2010-10-03 10:11:10 +0000
committerPer Øyvind Karlsen <peroyvind@mandriva.org>2010-10-03 10:11:10 +0000
commit0769ed515b873d0b1fa67df5e20d35a50992619f (patch)
tree0da92be0ede8a2a30c63b00fc6a60b8ee8c09132
parent79d883bb7511144bf2f667fed3c214db439ad86d (diff)
downloadperl-URPM-0769ed515b873d0b1fa67df5e20d35a50992619f.tar
perl-URPM-0769ed515b873d0b1fa67df5e20d35a50992619f.tar.gz
perl-URPM-0769ed515b873d0b1fa67df5e20d35a50992619f.tar.bz2
perl-URPM-0769ed515b873d0b1fa67df5e20d35a50992619f.tar.xz
perl-URPM-0769ed515b873d0b1fa67df5e20d35a50992619f.zip
* apply some cosmetics to get_name()
* be sure to use index in get_int()
-rw-r--r--URPM.xs10
1 files changed, 5 insertions, 5 deletions
diff --git a/URPM.xs b/URPM.xs
index 05cdc80..43b0e4a 100644
--- a/URPM.xs
+++ b/URPM.xs
@@ -209,13 +209,12 @@ get_name(Header header, rpmTag tag) {
val->tag = tag;
headerGet(header, val, 0);
+
if (val->t == RPM_STRING_TYPE)
return val->p.str;
- else if(val->t == RPM_STRING_ARRAY_TYPE ||
- val->t == RPM_I18NSTRING_TYPE)
+ else if(val->t == RPM_STRING_ARRAY_TYPE || val->t == RPM_I18NSTRING_TYPE)
return val->p.argv[val->ix];
- else
- return "";
+ return "";
}
static int
@@ -224,7 +223,8 @@ get_int(Header header, rpmTag tag) {
val->tag = tag;
headerGet(header, val, 0);
- return (val->t == RPM_UINT32_TYPE) ? *(val->p.ui32p) : 0;
+
+ return (val->t == RPM_UINT32_TYPE) ? val->p.ui32p[val->ix >= 0 ? val->ix : 0] : 0;
}
static int