diff options
| author | Panu Matilainen <pmatilai@redhat.com> | 2008-01-02 14:37:16 +0200 |
|---|---|---|
| committer | Panu Matilainen <pmatilai@redhat.com> | 2008-01-02 14:37:16 +0200 |
| commit | 84386510030999daa5416eb17816bec9f2aa384b (patch) | |
| tree | 882fb9ed489ad97a72a29b71a5b734d9a83b0fdb /build | |
| parent | 2a27a8fcdb33c69ead5df3701239c8d97c8c6e70 (diff) | |
| download | librpm-tizen-84386510030999daa5416eb17816bec9f2aa384b.tar.gz librpm-tizen-84386510030999daa5416eb17816bec9f2aa384b.tar.bz2 librpm-tizen-84386510030999daa5416eb17816bec9f2aa384b.zip | |
Assorted int -> size_t string size fixes in build code
Diffstat (limited to 'build')
| -rw-r--r-- | build/files.c | 6 | ||||
| -rw-r--r-- | build/parsePreamble.c | 2 | ||||
| -rw-r--r-- | build/poptBT.c | 2 | ||||
| -rw-r--r-- | build/rpmfc.c | 6 |
4 files changed, 8 insertions, 8 deletions
diff --git a/build/files.c b/build/files.c index 76e02b95c..e6fa60cba 100644 --- a/build/files.c +++ b/build/files.c @@ -1039,9 +1039,9 @@ static void genCpioListAndHeader(FileList fl, rpmfi * fip, Header h, int isSrc) { int _addDotSlash = !(isSrc || rpmExpandNumeric("%{_noPayloadPrefix}")); - int apathlen = 0; - int dpathlen = 0; - int skipLen = 0; + size_t apathlen = 0; + size_t dpathlen = 0; + size_t skipLen = 0; size_t fnlen; FileListRec flp; char buf[BUFSIZ]; diff --git a/build/parsePreamble.c b/build/parsePreamble.c index 35c28c531..ebc1b4959 100644 --- a/build/parsePreamble.c +++ b/build/parsePreamble.c @@ -428,7 +428,7 @@ static int handlePreambleTag(rpmSpec spec, Package pkg, rpm_tag_t tag, int multiToken = 0; rpmsenseFlags tagflags; rpm_tagtype_t type; - int len; + size_t len; rpm_count_t num; int rc; int xx; diff --git a/build/poptBT.c b/build/poptBT.c index 7ce5a9c4f..4ee1deed9 100644 --- a/build/poptBT.c +++ b/build/poptBT.c @@ -99,7 +99,7 @@ static void buildArgCallback( poptContext con, break; case POPT_TARGETPLATFORM: if (rba->targets) { - int len = strlen(rba->targets) + 1 + strlen(arg) + 1; + size_t len = strlen(rba->targets) + 1 + strlen(arg) + 1; rba->targets = xrealloc(rba->targets, len); strcat(rba->targets, ","); } else { diff --git a/build/rpmfc.c b/build/rpmfc.c index da0b23346..bc78be5d3 100644 --- a/build/rpmfc.c +++ b/build/rpmfc.c @@ -1,6 +1,6 @@ #include "system.h" -#include <signal.h> /* getOutputFrom() */ +#include <signal.h> #include <rpm/rpmbuild.h> #include <rpm/argv.h> @@ -86,7 +86,7 @@ static int rpmfcExpandAppend(ARGV_t * argvp, const ARGV_t av) * @return buffered stdout from script, NULL on error */ static StringBuf getOutputFrom(const char * dir, ARGV_t argv, - const char * writePtr, int writeBytesLeft, + const char * writePtr, size_t writeBytesLeft, int failNonZero) { pid_t child, reaped; @@ -236,7 +236,7 @@ int rpmfcExec(ARGV_t av, StringBuf sb_stdin, StringBuf * sb_stdoutp, int ec = -1; StringBuf sb = NULL; const char * buf_stdin = NULL; - int buf_stdin_len = 0; + size_t buf_stdin_len = 0; int xx; if (sb_stdoutp) |