folkslinux
/
rpm
mirror of https://github.com/rpm-software-management/rpm.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Take advantage of rpmtdGetNumber() for numeric format specifiers 

- octalFormat() and hexFormat() now work for any number, not just int32,
  fixing rhbz#471820
- use a common helper-function for both formats, they only differ by o/x
This commit is contained in:
Panu Matilainen 2008-11-17 12:23:19 +02:00
parent d97e357560
commit ee6c147a23
1 changed files with 15 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
lib/formats.c
View File

@ -67,6 +67,19 @@ static char * stringFormat(rpmtd td, char *formatPrefix)
return val;
}
static char * numFormat(rpmtd td, char * formatPrefix, char *format)
{
char * val = NULL;
if (rpmtdClass(td) != RPM_NUMERIC_CLASS) {
val = xstrdup(_("(not a number)"));
} else {
strcat(formatPrefix, format);
rasprintf(&val, formatPrefix, rpmtdGetNumber(td));
}
return val;
}
/**
* octalFormat.
* @param td tag data container
@ -75,16 +88,7 @@ static char * stringFormat(rpmtd td, char *formatPrefix)
*/
static char * octalFormat(rpmtd td, char * formatPrefix)
{
char * val = NULL;
if (rpmtdType(td) != RPM_INT32_TYPE) {
val = xstrdup(_("(not a number)"));
} else {
strcat(formatPrefix, "o");
rasprintf(&val, formatPrefix, *rpmtdGetUint32(td));
}
return val;
return numFormat(td, formatPrefix, "o");
}
/**
@ -95,16 +99,7 @@ static char * octalFormat(rpmtd td, char * formatPrefix)
*/
static char * hexFormat(rpmtd td, char * formatPrefix)
{
char * val = NULL;
if (rpmtdType(td) != RPM_INT32_TYPE) {
val = xstrdup(_("(not a number)"));
} else {
strcat(formatPrefix, "x");
rasprintf(&val, formatPrefix, *rpmtdGetUint32(td));
}
return val;
return numFormat(td, formatPrefix, "x");
}
/**