diff options
| author | Panu Matilainen <pmatilai@redhat.com> | 2008-04-16 10:17:19 +0300 |
|---|---|---|
| committer | Panu Matilainen <pmatilai@redhat.com> | 2008-04-16 10:17:19 +0300 |
| commit | 9a2b4cba0501235345ea42e068bff86bd17d15d3 (patch) | |
| tree | 431cf8c7a9615efa76b77e2c534fd16d083d54e3 /rpmdb | |
| parent | 72b200fe591bf13ecd238c1b3bae785a2907a0fc (diff) | |
| download | rpm-9a2b4cba0501235345ea42e068bff86bd17d15d3.tar.gz rpm-9a2b4cba0501235345ea42e068bff86bd17d15d3.tar.bz2 rpm-9a2b4cba0501235345ea42e068bff86bd17d15d3.zip | |
Make headerNVR() just a special case of headerNEVRA()
Diffstat (limited to 'rpmdb')
| -rw-r--r-- | rpmdb/hdrNVR.c | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/rpmdb/hdrNVR.c b/rpmdb/hdrNVR.c index 5d026f4d1..367d165a1 100644 --- a/rpmdb/hdrNVR.c +++ b/rpmdb/hdrNVR.c @@ -12,6 +12,13 @@ int headerNVR(Header h, const char **np, const char **vp, const char **rp) { + return headerNEVRA(h, np, NULL, vp, rp, NULL); +} + +int headerNEVRA(Header h, const char **np, + int32_t **ep, const char **vp, const char **rp, + const char **ap) +{ rpmTagType type; rpm_count_t count; @@ -30,17 +37,6 @@ int headerNVR(Header h, const char **np, const char **vp, const char **rp) && type == RPM_STRING_TYPE && count == 1)) *rp = NULL; } - return 0; -} - -int headerNEVRA(Header h, const char **np, - int32_t **ep, const char **vp, const char **rp, - const char **ap) -{ - rpmTagType type; - rpm_count_t count; - - headerNVR(h, np, vp, rp); if (ap) { if (!(headerGetEntry(h, RPMTAG_ARCH, &type, (rpm_data_t *) ap, &count) && type == RPM_STRING_TYPE && count == 1)) |