RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Ralf S. Engelschall
Root: /v/rpm/cvs Email: rse@rpm5.org
Module: rpm Date: 28-Jan-2008 21:29:16
Branch: HEAD Handle: 2008012820291501
Modified files:
rpm CHANGES
rpm/rpmdb rpmdb.c sqlite.c
Log:
(again) replace u_int32_t with uint32_t to be consistent across the
code base
Summary:
Revision Changes Path
1.2107 +1 -0 rpm/CHANGES
1.234 +37 -37 rpm/rpmdb/rpmdb.c
1.26 +2 -2 rpm/rpmdb/sqlite.c
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/CHANGES
============================================================================
$ cvs diff -u -r1.2106 -r1.2107 CHANGES
--- rpm/CHANGES 27 Jan 2008 18:30:56 -0000 1.2106
+++ rpm/CHANGES 28 Jan 2008 20:29:15 -0000 1.2107
@@ -1,4 +1,5 @@
5.0.0 -> 5.1a1:
+ - rse: (again) replace u_int32_t with uint32_t to be consistent across the code base
- jbj: use RPM_OS_NTOQNX as manifest constant.
- jbj: updated nl.po (Translation Project).
- rpm.org: Missing space in russian translation (mdvbz#36974).
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmdb/rpmdb.c
============================================================================
$ cvs diff -u -r1.233 -r1.234 rpmdb.c
--- rpm/rpmdb/rpmdb.c 5 Jan 2008 08:42:50 -0000 1.233
+++ rpm/rpmdb/rpmdb.c 28 Jan 2008 20:29:16 -0000 1.234
@@ -546,7 +546,7 @@
return -1;
_dbbyteswapped = dbiByteSwapped(dbi);
- data->size = (u_int32_t)(set->count * (dbi->dbi_jlen));
+ data->size = (uint32_t)(set->count * (dbi->dbi_jlen));
if (data->size == 0) {
data->data = NULL;
return 0;
@@ -1457,7 +1457,7 @@
/*@-temptrans@*/
key->data = (void *) baseName;
/*@=temptrans@*/
-key->size = (u_int32_t) strlen(baseName);
+key->size = (uint32_t) strlen(baseName);
if (key->size == 0) key->size++; /* XXX "/" fixup. */
rc = dbiGet(dbi, dbcursor, key, data, DB_SET);
@@ -1586,7 +1586,7 @@
/*@-temptrans@*/
key->data = (void *) name;
/*@=temptrans@*/
-key->size = (u_int32_t) strlen(name);
+key->size = (uint32_t) strlen(name);
xx = dbiCopen(dbi, dbi->dbi_txnid, &dbcursor, 0);
rc = dbiGet(dbi, dbcursor, key, data, DB_SET);
@@ -1653,7 +1653,7 @@
/*@-temptrans@*/
key->data = (void *) name;
/*@=temptrans@*/
-key->size = (u_int32_t) strlen(name);
+key->size = (uint32_t) strlen(name);
rc = dbiGet(dbi, dbcursor, key, data, DB_SET);
@@ -1860,11 +1860,11 @@
(void) headerGetMagic(mi->mi_h, NULL, &nb);
/*@i@*/ key->data = (void *) &mi->mi_prevoffset;
- key->size = (u_int32_t) sizeof(mi->mi_prevoffset);
+ key->size = (uint32_t) sizeof(mi->mi_prevoffset);
{ size_t len;
len = 0;
data->data = headerUnload(mi->mi_h, &len);
- data->size = (u_int32_t) len; /* XXX data->size is uint32_t */
+ data->size = (uint32_t) len; /* XXX data->size is uint32_t */
#ifdef DYING /* XXX this is needed iff headerSizeof() is used instead. */
data->size -= nb; /* XXX HEADER_MAGIC_NO */
#endif
@@ -2358,9 +2358,9 @@
keylen = sizeof(mi_offset.ui);
} else {
key->data = (void *)mi->mi_keyp;
- key->size = (u_int32_t) mi->mi_keylen;
+ key->size = (uint32_t) mi->mi_keylen;
data->data = uh;
- data->size = (u_int32_t) uhlen;
+ data->size = (uint32_t) uhlen;
#if !defined(_USE_COPY_LOAD)
data->flags |= DB_DBT_MALLOC;
#endif
@@ -2404,7 +2404,7 @@
/* Retrieve next header blob for index iterator. */
if (uh == NULL) {
key->data = keyp;
- key->size = (u_int32_t) keylen;
+ key->size = (uint32_t) keylen;
#if !defined(_USE_COPY_LOAD)
data->flags |= DB_DBT_MALLOC;
#endif
@@ -2714,8 +2714,8 @@
/*@-temptrans@*/
key->data = (void *) keyp;
/*@=temptrans@*/
-key->size = (u_int32_t) keylen;
-if (key->data && key->size == 0) key->size = (u_int32_t) strlen((char *)key->data);
+key->size = (uint32_t) keylen;
+if (key->data && key->size == 0) key->size = (uint32_t) strlen((char *)key->data);
if (key->data && key->size == 0) key->size++; /* XXX "/" fixup. */
/*@-nullstate@*/
@@ -2887,7 +2887,7 @@
_DBSWAP(mi_offset);
key->data = &mi_offset;
/*@=immediatetrans@*/
- key->size = (u_int32_t) sizeof(mi_offset.ui);
+ key->size = (uint32_t) sizeof(mi_offset.ui);
rc = dbiCopen(dbi, dbi->dbi_txnid, &dbcursor, DB_WRITECURSOR);
rc = dbiGet(dbi, dbcursor, key, data, DB_SET);
@@ -2947,23 +2947,23 @@
stringvalued = 0;
switch (he->t) {
case RPM_UINT8_TYPE:
- key->size = (u_int32_t) sizeof(*he->p.ui8p);
+ key->size = (uint32_t) sizeof(*he->p.ui8p);
/*@i@*/ key->data = he->p.ui8p + i;
/*@switchbreak@*/ break;
case RPM_UINT16_TYPE:
- key->size = (u_int32_t) sizeof(*he->p.ui16p);
+ key->size = (uint32_t) sizeof(*he->p.ui16p);
/*@i@*/ key->data = he->p.ui16p + i;
/*@switchbreak@*/ break;
case RPM_UINT32_TYPE:
- key->size = (u_int32_t) sizeof(*he->p.ui32p);
+ key->size = (uint32_t) sizeof(*he->p.ui32p);
/*@i@*/ key->data = he->p.ui32p + i;
/*@switchbreak@*/ break;
case RPM_UINT64_TYPE:
- key->size = (u_int32_t) sizeof(*he->p.ui64p);
+ key->size = (uint32_t) sizeof(*he->p.ui64p);
/*@i@*/ key->data = he->p.ui64p + i;
/*@switchbreak@*/ break;
case RPM_BIN_TYPE:
- key->size = (u_int32_t) he->c;
+ key->size = (uint32_t) he->c;
/*@i@*/ key->data = he->p.ptr;
he->c = 1; /* XXX break out of loop. */
/*@switchbreak@*/ break;
@@ -2986,7 +2986,7 @@
*t = (uint8_t) (nibble(s[0]) << 4) | nibble(s[1]);
/*@=type@*/
key->data = bin;
- key->size = (u_int32_t) dlen;
+ key->size = (uint32_t) dlen;
/*@switchbreak@*/ break;
}
/* Extract the pubkey id from the base64 blob. */
@@ -2997,13 +2997,13 @@
if (nbin <= 0)
/*@innercontinue@*/ continue;
key->data = bin;
- key->size = (u_int32_t) nbin;
+ key->size = (uint32_t) nbin;
/*@switchbreak@*/ break;
}
/*@fallthrough@*/
default:
/*@i@*/ key->data = (void *) he->p.argv[i];
- key->size = (u_int32_t) strlen(he->p.argv[i]);
+ key->size = (uint32_t) strlen(he->p.argv[i]);
stringvalued = 1;
/*@switchbreak@*/ break;
}
@@ -3032,7 +3032,7 @@
set = NULL;
-if (key->size == 0) key->size = (u_int32_t) strlen((char *)key->data);
+if (key->size == 0) key->size = (uint32_t) strlen((char *)key->data);
if (key->size == 0) key->size++; /* XXX "/" fixup. */
/*@-compmempass@*/
@@ -3201,9 +3201,9 @@
/*@-compmempass@*/
key->data = keyp;
- key->size = (u_int32_t) keylen;
+ key->size = (uint32_t) keylen;
/*@i@*/ data->data = datap;
- data->size = (u_int32_t) datalen;
+ data->size = (uint32_t) datalen;
ret = dbiGet(dbi, dbcursor, key, data, DB_SET);
keyp = key->data;
keylen = key->size;
@@ -3230,11 +3230,11 @@
}
key->data = keyp;
- key->size = (u_int32_t) keylen;
+ key->size = (uint32_t) keylen;
/*@-kepttrans@*/
data->data = datap;
/*@=kepttrans@*/
- data->size = (u_int32_t) datalen;
+ data->size = (uint32_t) datalen;
/*@-compmempass@*/
ret = dbiPut(dbi, dbcursor, key, data, DB_KEYLAST);
@@ -3301,13 +3301,13 @@
/*@-immediatetrans@*/
key->data = (void *) &mi_offset;
/*@=immediatetrans@*/
-key->size = (u_int32_t) sizeof(mi_offset.ui);
+key->size = (uint32_t) sizeof(mi_offset.ui);
{ size_t len;
nb = 0;
(void) headerGetMagic(h, NULL, &nb);
len = 0;
data->data = headerUnload(h, &len);
- data->size = (u_int32_t) len; /* XXX data->size is uint32_t */
+ data->size = (uint32_t) len; /* XXX data->size is uint32_t */
#ifdef DYING /* XXX this is needed iff headerSizeof() is used instead. */
data->size -= nb; /* XXX HEADER_MAGIC_NO */
#endif
@@ -3430,23 +3430,23 @@
stringvalued = 0;
switch (he->t) {
case RPM_UINT8_TYPE:
- key->size = (u_int32_t) sizeof(*he->p.ui8p);
+ key->size = (uint32_t) sizeof(*he->p.ui8p);
/*@i@*/ key->data = he->p.ui8p + i;
/*@switchbreak@*/ break;
case RPM_UINT16_TYPE:
- key->size = (u_int32_t) sizeof(*he->p.ui16p);
+ key->size = (uint32_t) sizeof(*he->p.ui16p);
/*@i@*/ key->data = he->p.ui16p + i;
/*@switchbreak@*/ break;
case RPM_UINT32_TYPE:
- key->size = (u_int32_t) sizeof(*he->p.ui32p);
+ key->size = (uint32_t) sizeof(*he->p.ui32p);
/*@i@*/ key->data = he->p.ui32p + i;
/*@switchbreak@*/ break;
case RPM_UINT64_TYPE:
- key->size = (u_int32_t) sizeof(*he->p.ui64p);
+ key->size = (uint32_t) sizeof(*he->p.ui64p);
/*@i@*/ key->data = he->p.ui64p + i;
/*@switchbreak@*/ break;
case RPM_BIN_TYPE:
- key->size = (u_int32_t) he->c;
+ key->size = (uint32_t) he->c;
/*@i@*/ key->data = he->p.ptr;
he->c = 1; /* XXX break out of loop. */
/*@switchbreak@*/ break;
@@ -3469,7 +3469,7 @@
*t = (uint8_t) (nibble(s[0]) << 4) | nibble(s[1]);
/*@=type@*/
key->data = bin;
- key->size = (u_int32_t) dlen;
+ key->size = (uint32_t) dlen;
/*@switchbreak@*/ break;
}
/* Extract the pubkey id from the base64 blob. */
@@ -3480,13 +3480,13 @@
if (nbin <= 0)
/*@innercontinue@*/ continue;
key->data = bin;
- key->size = (u_int32_t) nbin;
+ key->size = (uint32_t) nbin;
/*@switchbreak@*/ break;
}
/*@fallthrough@*/
default:
/*@i@*/ key->data = (void *) he->p.argv[i];
- key->size = (u_int32_t) strlen(he->p.argv[i]);
+ key->size = (uint32_t) strlen(he->p.argv[i]);
stringvalued = 1;
/*@switchbreak@*/ break;
}
@@ -3508,7 +3508,7 @@
set = NULL;
-if (key->size == 0) key->size = (u_int32_t) strlen((char *)key->data);
+if (key->size == 0) key->size = (uint32_t) strlen((char *)key->data);
if (key->size == 0) key->size++; /* XXX "/" fixup. */
/*@-compmempass@*/
@@ -3609,7 +3609,7 @@
/*@-dependenttrans@*/
key->data = (void *) fpList[i].baseName;
/*@=dependenttrans@*/
-key->size = (u_int32_t) strlen((char *)key->data);
+key->size = (uint32_t) strlen((char *)key->data);
if (key->size == 0) key->size++; /* XXX "/" fixup. */
tag = (_db_tagged_file_indices ? taghash(fpList[i].entry->dirName) : 0);
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmdb/sqlite.c
============================================================================
$ cvs diff -u -r1.25 -r1.26 sqlite.c
--- rpm/rpmdb/sqlite.c 22 Nov 2007 18:50:27 -0000 1.25
+++ rpm/rpmdb/sqlite.c 28 Jan 2008 20:29:16 -0000 1.26
@@ -1195,7 +1195,7 @@
scp->keys = xcalloc(scp->nkeys, sizeof(*scp->keys));
for (ix = 0; ix < scp->nkeys; ix++) {
scp->keys[ix] = xmalloc(sizeof(*scp->keys[0]));
- scp->keys[ix]->size = (u_int32_t) scp->avlen[ix+1];
+ scp->keys[ix]->size = (uint32_t) scp->avlen[ix+1];
scp->keys[ix]->data = xmalloc(scp->keys[ix]->size);
memcpy(scp->keys[ix]->data, scp->av[ix+1], scp->avlen[ix+1]);
}
@@ -1274,7 +1274,7 @@
scp->ldata = _free(scp->ldata);
}
- data->size = (u_int32_t) scp->avlen[1];
+ data->size = (uint32_t) scp->avlen[1];
data->data = xmalloc(data->size);
if (! (data->flags & DB_DBT_MALLOC) )
scp->ldata = data->data;
@@ .
Received on Mon Jan 28 21:29:16 2008