RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: jbj@rpm5.org
Module: rpm Date: 09-Jan-2008 01:36:02
Branch: HEAD Handle: 2008010900360101
Modified files:
rpm CHANGES
rpm/build files.c
rpm/lib fsm.c poptQV.c psm.c rpmfi.h transaction.c
Log:
- rpm.org: Assorted int -> size_t corrections for string lengths.
Summary:
Revision Changes Path
1.2057 +1 -0 rpm/CHANGES
1.311 +1 -1 rpm/build/files.c
2.141 +5 -4 rpm/lib/fsm.c
2.49 +1 -1 rpm/lib/poptQV.c
2.279 +4 -4 rpm/lib/psm.c
2.48 +3 -3 rpm/lib/rpmfi.h
1.361 +6 -6 rpm/lib/transaction.c
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/CHANGES
============================================================================
$ cvs diff -u -r1.2056 -r1.2057 CHANGES
--- rpm/CHANGES 9 Jan 2008 00:21:36 -0000 1.2056
+++ rpm/CHANGES 9 Jan 2008 00:36:01 -0000 1.2057
@@ -1,4 +1,5 @@
5.0.0 -> 5.1a1:
+ - rpm.org: Assorted int -> size_t corrections for string lengths.
- rpm.org: More assorted int -> size_t uses.
=============================================================================
@@ .
patch -p0 <<'@@ .'
Index: rpm/build/files.c
============================================================================
$ cvs diff -u -r1.310 -r1.311 files.c
--- rpm/build/files.c 23 Dec 2007 01:56:40 -0000 1.310
+++ rpm/build/files.c 9 Jan 2008 00:36:01 -0000 1.311
@@ -1198,7 +1198,7 @@
const char ** needle;
char savechar;
char * baseName;
- int len;
+ size_t len;
if (fileNames[i] == NULL) /* XXX can't happen */
continue;
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/fsm.c
============================================================================
$ cvs diff -u -r2.140 -r2.141 fsm.c
--- rpm/lib/fsm.c 6 Dec 2007 14:47:49 -0000 2.140
+++ rpm/lib/fsm.c 9 Jan 2008 00:36:02 -0000 2.141
@@ -301,7 +301,8 @@
/* Exclude parent directories that are explicitly included. */
for (i = 0; i < fi->fc; i++) {
- int dil, dnlen, bnlen;
+ int dil;
+ size_t dnlen, bnlen;
if (!S_ISDIR(fi->fmodes[i]))
continue;
@@ -311,7 +312,7 @@
bnlen = strlen(fi->bnl[i]);
for (j = 0; j < fi->dc; j++) {
- int jlen;
+ size_t jlen;
if (!dnli->active[j] || j == dil)
/*@innercontinue@*/ continue;
@@ -1245,7 +1246,7 @@
/*@-observertrans -dependenttrans@*/
if (fsm->ldn != NULL && fsm->dnlx != NULL)
while ((fsm->path = dnlNextIterator(dnli)) != NULL) {
- int dnlen = strlen(fsm->path);
+ size_t dnlen = strlen(fsm->path);
char * te;
dc = dnlIndex(dnli);
@@ -1317,7 +1318,7 @@
/*@-observertrans -dependenttrans@*/
if (fsm->dnlx != NULL)
while ((fsm->path = dnlNextIterator(dnli)) != NULL) {
- int dnlen = strlen(fsm->path);
+ size_t dnlen = strlen(fsm->path);
char * te;
dc = dnlIndex(dnli);
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/poptQV.c
============================================================================
$ cvs diff -u -r2.48 -r2.49 poptQV.c
--- rpm/lib/poptQV.c 24 Nov 2007 18:48:15 -0000 2.48
+++ rpm/lib/poptQV.c 9 Jan 2008 00:36:02 -0000 2.49
@@ -201,7 +201,7 @@
if (arg) {
char * qf = (char *)qva->qva_queryFormat;
if (qf) {
- int len = strlen(qf) + strlen(arg) + 1;
+ size_t len = strlen(qf) + strlen(arg) + 1;
qf = xrealloc(qf, len);
strcat(qf, arg);
} else {
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/psm.c
============================================================================
$ cvs diff -u -r2.278 -r2.279 psm.c
--- rpm/lib/psm.c 16 Dec 2007 17:39:20 -0000 2.278
+++ rpm/lib/psm.c 9 Jan 2008 00:36:02 -0000 2.279
@@ -352,8 +352,8 @@
/* Build dnl/dil with {_sourcedir, _specdir} as values. */
if (i < fi->fc) {
- int speclen = strlen(_specdir) + 2;
- int sourcelen = strlen(_sourcedir) + 2;
+ size_t speclen = strlen(_specdir) + 2;
+ size_t sourcelen = strlen(_sourcedir) + 2;
char * t;
/*@i@*/ fi->dnl = _free(fi->dnl);
@@ -662,8 +662,8 @@
int argc = 0;
const char ** prefixes = NULL;
int numPrefixes;
- int maxPrefixLength;
- int len;
+ size_t maxPrefixLength;
+ size_t len;
char * prefixBuf = NULL;
const char * fn = NULL;
FD_t scriptFd;
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/rpmfi.h
============================================================================
$ cvs diff -u -r2.47 -r2.48 rpmfi.h
--- rpm/lib/rpmfi.h 3 Dec 2007 18:22:32 -0000 2.47
+++ rpm/lib/rpmfi.h 9 Jan 2008 00:36:02 -0000 2.48
@@ -210,10 +210,10 @@
/*@only@*/ /*@null@*/
char * fn; /*!< File name buffer. */
- int fnlen; /*!< File name buffer length. */
+ size_t fnlen; /*!< File name buffer length. */
- int astriplen;
- int striplen;
+ size_t astriplen;
+ size_t striplen;
unsigned long long archivePos;
unsigned long long archiveSize;
mode_t dperms; /*!< Directory perms (0755) if not mapped. */
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/transaction.c
============================================================================
$ cvs diff -u -r1.360 -r1.361 transaction.c
--- rpm/lib/transaction.c 6 Dec 2007 14:47:49 -0000 1.360
+++ rpm/lib/transaction.c 9 Jan 2008 00:36:02 -0000 1.361
@@ -275,12 +275,12 @@
{
const struct fingerPrint_s * a = (const struct fingerPrint_s *)one;
const struct fingerPrint_s * b = (const struct fingerPrint_s *)two;
- int adnlen = strlen(a->entry->dirName);
- int asnlen = (a->subDir ? strlen(a->subDir) : 0);
- int abnlen = strlen(a->baseName);
- int bdnlen = strlen(b->entry->dirName);
- int bsnlen = (b->subDir ? strlen(b->subDir) : 0);
- int bbnlen = strlen(b->baseName);
+ size_t adnlen = strlen(a->entry->dirName);
+ size_t asnlen = (a->subDir ? strlen(a->subDir) : 0);
+ size_t abnlen = strlen(a->baseName);
+ size_t bdnlen = strlen(b->entry->dirName);
+ size_t bsnlen = (b->subDir ? strlen(b->subDir) : 0);
+ size_t bbnlen = strlen(b->baseName);
char * afn, * bfn, * t;
int rc = 0;
@@ .
Received on Wed Jan 9 01:36:02 2008