RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: [EMAIL PROTECTED]
Module: rpm Date: 12-Mar-2008 18:11:50
Branch: HEAD Handle: 2008031217115000
Modified files:
rpm/rpmdb header.c pkgio.c sqlite.c
Log:
- jbj: remove -W warnings.
Summary:
Revision Changes Path
1.150 +7 -7 rpm/rpmdb/header.c
1.75 +2 -2 rpm/rpmdb/pkgio.c
1.32 +1 -1 rpm/rpmdb/sqlite.c
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/rpmdb/header.c
============================================================================
$ cvs diff -u -r1.149 -r1.150 header.c
--- rpm/rpmdb/header.c 10 Mar 2008 04:46:18 -0000 1.149
+++ rpm/rpmdb/header.c 12 Mar 2008 17:11:50 -0000 1.150
@@ -281,7 +281,7 @@
type = entry->info.type;
if (typeSizes[type] > 1) {
diff = typeSizes[type] - (size % typeSizes[type]);
- if (diff != typeSizes[type]) {
+ if ((int)diff != typeSizes[type]) {
size += diff;
pad += diff;
}
@@ -444,7 +444,7 @@
type = ie.info.type;
if (typeSizes[type] > 1) {
size_t diff = typeSizes[type] - (dl % typeSizes[type]);
- if (diff != typeSizes[type]) {
+ if ((int)diff != typeSizes[type]) {
dl += diff;
if (ieprev.info.type == RPM_I18NSTRING_TYPE)
ieprev.length += diff;
@@ -581,7 +581,7 @@
type = entry->info.type;
if (typeSizes[type] > 1) {
size_t diff = typeSizes[type] - (dl % typeSizes[type]);
- if (diff != typeSizes[type]) {
+ if ((int)diff != typeSizes[type]) {
drlen += diff;
pad += diff;
dl += diff;
@@ -606,7 +606,7 @@
type = entry->info.type;
if (typeSizes[type] > 1) {
size_t diff = typeSizes[type] - (dl % typeSizes[type]);
- if (diff != typeSizes[type]) {
+ if ((int)diff != typeSizes[type]) {
driplen += diff;
pad += diff;
dl += diff;
@@ -722,9 +722,9 @@
/* Alignment */
type = entry->info.type;
if (typeSizes[type] > 1) {
- unsigned diff;
+ size_t diff;
diff = typeSizes[type] - ((te - dataStart) % typeSizes[type]);
- if (diff != typeSizes[type]) {
+ if ((int)diff != typeSizes[type]) {
memset(te, 0, diff);
te += diff;
pad += diff;
@@ -1354,7 +1354,7 @@
#endif
/* First try a complete match. */
- if (strlen(td) == (le-l) && !strncmp(td, l, (le - l)))
+ if (strlen(td) == (size_t)(le - l) && !strncmp(td, l, (size_t)(le - l)))
return 1;
/* Next, try stripping optional dialect and matching. */
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmdb/pkgio.c
============================================================================
$ cvs diff -u -r1.74 -r1.75 pkgio.c
--- rpm/rpmdb/pkgio.c 10 Mar 2008 04:46:18 -0000 1.74
+++ rpm/rpmdb/pkgio.c 12 Mar 2008 17:11:50 -0000 1.75
@@ -128,7 +128,7 @@
{
rpmop op = NULL;
- if (ts != NULL && opx >= 0 && opx < RPMTS_OP_MAX)
+ if (ts != NULL && (int)opx >= 0 && (int)opx < RPMTS_OP_MAX)
op = ts->ops + opx;
/[EMAIL PROTECTED] -compdef @*/
return op;
@@ -940,7 +940,7 @@
/[EMAIL PROTECTED]@*/
/* Is the offset within the data area? */
- if (entry->info.offset >= (unsigned) dl) {
+ if (entry->info.offset >= (int) dl) {
(void) snprintf(buf, sizeof(buf),
_("region offset: BAD, tag %u type %u offset %d count %u"),
(unsigned) entry->info.tag, (unsigned) entry->info.type,
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmdb/sqlite.c
============================================================================
$ cvs diff -u -r1.31 -r1.32 sqlite.c
--- rpm/rpmdb/sqlite.c 12 Mar 2008 16:58:31 -0000 1.31
+++ rpm/rpmdb/sqlite.c 12 Mar 2008 17:11:50 -0000 1.32
@@ -854,7 +854,7 @@
* @param flags (unused)
* @return 0 on success
*/
-static int sql_close(/[EMAIL PROTECTED]@*/ dbiIndex dbi, unsigned int flags)
+static int sql_close(/[EMAIL PROTECTED]@*/ dbiIndex dbi, UNUSED(unsigned int
flags))
/[EMAIL PROTECTED] fileSystem, internalState @*/
/[EMAIL PROTECTED] dbi, fileSystem, internalState @*/
{
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository [email protected]
