diff options
| author | Panu Matilainen <pmatilai@redhat.com> | 2007-12-13 18:16:39 +0200 |
|---|---|---|
| committer | Panu Matilainen <pmatilai@redhat.com> | 2007-12-13 18:16:39 +0200 |
| commit | cbd7a684a4cd88bfa3383658790be3c37230707a (patch) | |
| tree | 61c4cbe890438131ad44949fa92f1642508e48a5 /build | |
| parent | c8f2927227471758abbdb36781d885b01798f0f8 (diff) | |
| download | librpm-tizen-cbd7a684a4cd88bfa3383658790be3c37230707a.tar.gz librpm-tizen-cbd7a684a4cd88bfa3383658790be3c37230707a.tar.bz2 librpm-tizen-cbd7a684a4cd88bfa3383658790be3c37230707a.zip | |
Use rpm_count_t everywhere for header data count
- typedef'ed as uint32_t as that's the key size limit imposed by BDB,
relevant for RPM_BIN_TYPE
- easy to change to whatever later on as it's now consistent everywhere
- explicit casts where needed to avoid new warnings from signedness
Diffstat (limited to 'build')
| -rw-r--r-- | build/files.c | 2 | ||||
| -rw-r--r-- | build/parsePreamble.c | 3 | ||||
| -rw-r--r-- | build/parseScript.c | 4 | ||||
| -rw-r--r-- | build/rpmfc.c | 2 |
4 files changed, 6 insertions, 5 deletions
diff --git a/build/files.c b/build/files.c index 1e9b1d09f..54c664639 100644 --- a/build/files.c +++ b/build/files.c @@ -2071,7 +2071,7 @@ void initSourceHeader(rpmSpec spec) if (spec->BANames && spec->BACount > 0) { (void) headerAddEntry(spec->sourceHeader, RPMTAG_BUILDARCHS, RPM_STRING_ARRAY_TYPE, - spec->BANames, spec->BACount); + spec->BANames, (rpm_count_t) spec->BACount); } } diff --git a/build/parsePreamble.c b/build/parsePreamble.c index 71da7ab12..458da39f2 100644 --- a/build/parsePreamble.c +++ b/build/parsePreamble.c @@ -58,7 +58,8 @@ static void addOrAppendListEntry(Header h, int32_t tag, char * line) xx = poptParseArgvString(line, &argc, &argv); if (argc) - xx = headerAddOrAppendEntry(h, tag, RPM_STRING_ARRAY_TYPE, argv, argc); + xx = headerAddOrAppendEntry(h, tag, RPM_STRING_ARRAY_TYPE, + argv, (rpm_count_t) argc); argv = _free(argv); } diff --git a/build/parseScript.c b/build/parseScript.c index 54d85f559..e4c36f621 100644 --- a/build/parseScript.c +++ b/build/parseScript.c @@ -303,12 +303,12 @@ int parseScript(rpmSpec spec, int parsePart) } else { if (progArgc == 1) (void) headerAddEntry(pkg->header, progtag, RPM_STRING_TYPE, - *progArgv, progArgc); + *progArgv, (rpm_count_t) progArgc); else { (void) rpmlibNeedsFeature(pkg->header, "ScriptletInterpreterArgs", "4.0.3-1"); (void) headerAddEntry(pkg->header, progtag, RPM_STRING_ARRAY_TYPE, - progArgv, progArgc); + progArgv, (rpm_count_t) progArgc); } if (*p != '\0') diff --git a/build/rpmfc.c b/build/rpmfc.c index 5eb1b2110..b93bf3e85 100644 --- a/build/rpmfc.c +++ b/build/rpmfc.c @@ -1527,7 +1527,7 @@ rpmRC rpmfcGenerateDepends(const rpmSpec spec, Package pkg) const char * N; const char * EVR; int genConfigDeps; - int c; + rpm_count_t c; int rc = 0; int xx; |