diff options
| author | Panu Matilainen <pmatilai@redhat.com> | 2007-11-19 16:25:24 +0200 |
|---|---|---|
| committer | Panu Matilainen <pmatilai@redhat.com> | 2007-11-19 16:25:24 +0200 |
| commit | 43c5de66fb90cbc59dc23eb0774d66c66d34b37d (patch) | |
| tree | 1e43219542c3ce060b4ce3c430a38aed45a62767 /build/rpmfc.c | |
| parent | db4e34966ed9d52a920ab1b135309e6e21f12473 (diff) | |
| download | librpm-tizen-43c5de66fb90cbc59dc23eb0774d66c66d34b37d.tar.gz librpm-tizen-43c5de66fb90cbc59dc23eb0774d66c66d34b37d.tar.bz2 librpm-tizen-43c5de66fb90cbc59dc23eb0774d66c66d34b37d.zip | |
Replace all RPMERR_* etc uses with corresponding RPMLOG_* levels
Diffstat (limited to 'build/rpmfc.c')
| -rw-r--r-- | build/rpmfc.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/build/rpmfc.c b/build/rpmfc.c index 0724fbb12..ff995d7b5 100644 --- a/build/rpmfc.c +++ b/build/rpmfc.c @@ -125,12 +125,12 @@ static StringBuf getOutputFrom(const char * dir, ARGV_t argv, unsetenv("MALLOC_CHECK_"); (void) execvp(argv[0], (char *const *)argv); /* XXX this error message is probably not seen. */ - rpmlog(RPMERR_EXEC, _("Couldn't exec %s: %s\n"), + rpmlog(RPMLOG_ERR, _("Couldn't exec %s: %s\n"), argv[0], strerror(errno)); - _exit(RPMERR_EXEC); + _exit(RPMLOG_ERR); } if (child < 0) { - rpmlog(RPMERR_FORK, _("Couldn't fork %s: %s\n"), + rpmlog(RPMLOG_ERR, _("Couldn't fork %s: %s\n"), argv[0], strerror(errno)); return NULL; } @@ -216,11 +216,11 @@ top: (unsigned)child, (unsigned)reaped, status); if (failNonZero && (!WIFEXITED(status) || WEXITSTATUS(status))) { - rpmlog(RPMERR_EXEC, _("%s failed\n"), argv[0]); + rpmlog(RPMLOG_ERR, _("%s failed\n"), argv[0]); return NULL; } if (writeBytesLeft) { - rpmlog(RPMERR_EXEC, _("failed to write all data to %s\n"), argv[0]); + rpmlog(RPMLOG_ERR, _("failed to write all data to %s\n"), argv[0]); return NULL; } return readBuff; @@ -1238,7 +1238,7 @@ int rpmfcClassify(rpmfc fc, ARGV_t argv, int16_t * fmode) ms = magic_open(msflags); if (ms == NULL) { - xx = RPMERR_EXEC; + xx = RPMLOG_ERR; rpmlog(xx, _("magic_open(0x%x) failed: %s\n"), msflags, strerror(errno)); assert(ms != NULL); /* XXX figger a proper return path. */ @@ -1246,7 +1246,7 @@ assert(ms != NULL); /* XXX figger a proper return path. */ xx = magic_load(ms, NULL); if (xx == -1) { - xx = RPMERR_EXEC; + xx = RPMLOG_ERR; rpmlog(xx, _("magic_load failed: %s\n"), magic_error(ms)); assert(xx != -1); /* XXX figger a proper return path. */ } @@ -1290,7 +1290,7 @@ assert(s != NULL); ftype = magic_file(ms, s); if (ftype == NULL) { - xx = RPMERR_EXEC; + xx = RPMLOG_ERR; rpmlog(xx, _("magic_file(ms, \"%s\") failed: mode %06o %s\n"), s, mode, magic_error(ms)); assert(ftype != NULL); /* XXX figger a proper return path. */ @@ -1495,7 +1495,7 @@ static int rpmfcGenerateDependsHelper(const rpmSpec spec, Package pkg, rpmfi fi) s = _free(s); if (sb_stdout == NULL) { - rc = RPMERR_EXEC; + rc = RPMLOG_ERR; rpmlog(rc, _("Failed to find %s:\n"), dm->msg); break; } |