diff options
| author | Panu Matilainen <pmatilai@redhat.com> | 2007-09-20 15:09:52 +0300 |
|---|---|---|
| committer | Panu Matilainen <pmatilai@redhat.com> | 2007-09-20 15:09:52 +0300 |
| commit | 3b8da4ed118c6da6dab1cb7c0ecd0933c6d14f14 (patch) | |
| tree | f1e29034af384acc2a63ab7cd5e7fcf423c6d6a5 /build | |
| parent | bbf7574d7f368e8d11600b54dfd24a0dafd555fb (diff) | |
| download | rpm-3b8da4ed118c6da6dab1cb7c0ecd0933c6d14f14.tar.gz rpm-3b8da4ed118c6da6dab1cb7c0ecd0933c6d14f14.tar.bz2 rpm-3b8da4ed118c6da6dab1cb7c0ecd0933c6d14f14.zip | |
Rename tagName/Value/Type() to rpmTagGet*()
- namespacing
- avoid collisions with tagtype definitions
Diffstat (limited to 'build')
| -rw-r--r-- | build/parsePreamble.c | 10 | ||||
| -rw-r--r-- | build/spec.c | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/build/parsePreamble.c b/build/parsePreamble.c index 34098ef90..5568f066c 100644 --- a/build/parsePreamble.c +++ b/build/parsePreamble.c @@ -255,7 +255,7 @@ static int checkForRequired(Header h, const char * NVR) if (!headerIsEntry(h, *p)) { rpmError(RPMERR_BADSPEC, _("%s field must be present in package: %s\n"), - tagName(*p), NVR); + rpmTagGetName(*p), NVR); res = 1; } } @@ -282,7 +282,7 @@ static int checkForDuplicates(Header h, const char * NVR) if (tag != lastTag) continue; rpmError(RPMERR_BADSPEC, _("Duplicate %s entries in package: %s\n"), - tagName(tag), NVR); + rpmTagGetName(tag), NVR); res = 1; } hi = headerFreeIterator(hi); @@ -398,7 +398,7 @@ spectag stashSt(Spec spec, Header h, int tag, const char * lang) char *n; if (hge(h, RPMTAG_NAME, NULL, (void **) &n, NULL)) { char buf[1024]; - sprintf(buf, "%s(%s)", n, tagName(tag)); + sprintf(buf, "%s(%s)", n, rpmTagGetName(tag)); t->t_msgid = xstrdup(buf); } } @@ -612,7 +612,7 @@ static int handlePreambleTag(Spec spec, Package pkg, rpmTag tag, if ((rc = parseBits(lang, buildScriptBits, &tagflags))) { rpmError(RPMERR_BADSPEC, _("line %d: Bad %s: qualifiers: %s\n"), - spec->lineNum, tagName(tag), spec->line); + spec->lineNum, rpmTagGetName(tag), spec->line); return rc; } if ((rc = parseRCPOT(spec, pkg, field, tag, 0, tagflags))) @@ -623,7 +623,7 @@ static int handlePreambleTag(Spec spec, Package pkg, rpmTag tag, if ((rc = parseBits(lang, installScriptBits, &tagflags))) { rpmError(RPMERR_BADSPEC, _("line %d: Bad %s: qualifiers: %s\n"), - spec->lineNum, tagName(tag), spec->line); + spec->lineNum, rpmTagGetName(tag), spec->line); return rc; } if ((rc = parseRCPOT(spec, pkg, field, tag, 0, tagflags))) diff --git a/build/spec.c b/build/spec.c index c3272b334..cb67097e0 100644 --- a/build/spec.c +++ b/build/spec.c @@ -550,7 +550,7 @@ printNewSpecfile(Spec spec) for (i = 0; i < st->st_ntags; i++) { spectag t = st->st_t + i; - const char * tn = tagName(t->t_tag); + const char * tn = rpmTagGetName(t->t_tag); const char * errstr; char fmt[1024]; |