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

Don't bother checking for rasprintf() return codes in rpmProblemString() 

- We dont check them elsewhere either and there's little that could
  actually fail here
This commit is contained in:
Panu Matilainen 2011-03-04 14:42:38 +02:00
parent d69ebf18f1
commit 10ed98db01
1 changed files with 16 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
lib/rpmprob.c
View File

@ -108,43 +108,40 @@ char * rpmProblemString(rpmProblem prob)
const char * altNEVR = (prob->altNEVR ? prob->altNEVR : "? ?altNEVR?"); const char * altNEVR = (prob->altNEVR ? prob->altNEVR : "? ?altNEVR?");
const char * str1 = (prob->str1 ? prob->str1 : N_("different")); const char * str1 = (prob->str1 ? prob->str1 : N_("different"));
char * buf = NULL; char * buf = NULL;
int rc;
switch (prob->type) { switch (prob->type) {
case RPMPROB_BADARCH: case RPMPROB_BADARCH:
rc = rasprintf(&buf, _("package %s is intended for a %s architecture"), rasprintf(&buf, _("package %s is intended for a %s architecture"),
pkgNEVR, str1); pkgNEVR, str1);
break; break;
case RPMPROB_BADOS: case RPMPROB_BADOS:
rc = rasprintf(&buf, rasprintf(&buf, _("package %s is intended for a %s operating system"),
_("package %s is intended for a %s operating system"),
pkgNEVR, str1); pkgNEVR, str1);
break; break;
case RPMPROB_PKG_INSTALLED: case RPMPROB_PKG_INSTALLED:
rc = rasprintf(&buf, _("package %s is already installed"), rasprintf(&buf, _("package %s is already installed"), pkgNEVR);
pkgNEVR);
break; break;
case RPMPROB_BADRELOCATE: case RPMPROB_BADRELOCATE:
rc = rasprintf(&buf, _("path %s in package %s is not relocatable"), rasprintf(&buf, _("path %s in package %s is not relocatable"),
str1, pkgNEVR); str1, pkgNEVR);
break; break;
case RPMPROB_NEW_FILE_CONFLICT: case RPMPROB_NEW_FILE_CONFLICT:
rc = rasprintf(&buf, rasprintf(&buf,
_("file %s conflicts between attempted installs of %s and %s"), _("file %s conflicts between attempted installs of %s and %s"),
str1, pkgNEVR, altNEVR); str1, pkgNEVR, altNEVR);
break; break;
case RPMPROB_FILE_CONFLICT: case RPMPROB_FILE_CONFLICT:
rc = rasprintf(&buf, rasprintf(&buf,
_("file %s from install of %s conflicts with file from package %s"), _("file %s from install of %s conflicts with file from package %s"),
str1, pkgNEVR, altNEVR); str1, pkgNEVR, altNEVR);
break; break;
case RPMPROB_OLDPACKAGE: case RPMPROB_OLDPACKAGE:
rc = rasprintf(&buf, rasprintf(&buf,
_("package %s (which is newer than %s) is already installed"), _("package %s (which is newer than %s) is already installed"),
altNEVR, pkgNEVR); altNEVR, pkgNEVR);
break; break;
case RPMPROB_DISKSPACE: case RPMPROB_DISKSPACE:
rc = rasprintf(&buf, rasprintf(&buf,
_("installing package %s needs %" PRIu64 "%cB on the %s filesystem"), _("installing package %s needs %" PRIu64 "%cB on the %s filesystem"),
pkgNEVR, pkgNEVR,
prob->num1 > (1024*1024) prob->num1 > (1024*1024)
@ -154,27 +151,24 @@ char * rpmProblemString(rpmProblem prob)
str1); str1);
break; break;
case RPMPROB_DISKNODES: case RPMPROB_DISKNODES:
rc = rasprintf(&buf, rasprintf(&buf,
_("installing package %s needs %" PRIu64 " inodes on the %s filesystem"), _("installing package %s needs %" PRIu64 " inodes on the %s filesystem"),
pkgNEVR, prob->num1, str1); pkgNEVR, prob->num1, str1);
break; break;
case RPMPROB_REQUIRES: case RPMPROB_REQUIRES:
rc = rasprintf(&buf, _("%s is needed by %s%s"), rasprintf(&buf, _("%s is needed by %s%s"),
prob->str1, prob->str1, (prob->num1 ? _("(installed) ") : ""), altNEVR);
(prob->num1 ? _("(installed) ") : ""), altNEVR);
break; break;
case RPMPROB_CONFLICT: case RPMPROB_CONFLICT:
rc = rasprintf(&buf, _("%s conflicts with %s%s"), rasprintf(&buf, _("%s conflicts with %s%s"),
prob->str1, prob->str1, (prob->num1 ? _("(installed) ") : ""), altNEVR);
(prob->num1 ? _("(installed) ") : ""), altNEVR);
break; break;
case RPMPROB_OBSOLETES: case RPMPROB_OBSOLETES:
rc = rasprintf(&buf, _("%s is obsoleted by %s%s"), rasprintf(&buf, _("%s is obsoleted by %s%s"),
prob->str1, prob->str1, (prob->num1 ? _("(installed) ") : ""), altNEVR);
(prob->num1 ? _("(installed) ") : ""), altNEVR);
break; break;
default: default:
rc = rasprintf(&buf, rasprintf(&buf,
_("unknown error %d encountered while manipulating package %s"), _("unknown error %d encountered while manipulating package %s"),
prob->type, pkgNEVR); prob->type, pkgNEVR);
break; break;