From 0769ed515b873d0b1fa67df5e20d35a50992619f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Per=20=C3=98yvind=20Karlsen?= Date: Sun, 3 Oct 2010 10:11:10 +0000 Subject: * apply some cosmetics to get_name() * be sure to use index in get_int() --- URPM.xs | 10 +++++----- 1 file 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 -- cgit v1.2.1