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: 14-Oct-2007 17:15:15
Branch: HEAD Handle: 2007101416151401
Modified files:
rpm CHANGES
rpm/build files.c
rpm/lib rpmlib.h rpmte.c
rpm/python header-py.c
Log:
- clean up some warnings.
- change HGE_t prototype to see what remains to be fixed.
Summary:
Revision Changes Path
1.1694 +2 -0 rpm/CHANGES
1.269 +1 -1 rpm/build/files.c
2.441 +4 -4 rpm/lib/rpmlib.h
2.57 +0 -1 rpm/lib/rpmte.c
1.59 +0 -3 rpm/python/header-py.c
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/CHANGES
============================================================================
$ cvs diff -u -r1.1693 -r1.1694 CHANGES
--- rpm/CHANGES 14 Oct 2007 01:24:05 -0000 1.1693
+++ rpm/CHANGES 14 Oct 2007 15:15:14 -0000 1.1694
@@ -1,4 +1,6 @@
4.5 -> 5.0:
+ - jbj: clean up some warnings.
+ - jbj: change HGE_t prototype to see what remains to be fixed.
- jbj: rpmsignature.c: use headerGetExtension everywhere.
- jbj: rpmrollback.c: use headerGetExtension everywhere.
- jbj: use (*hge), not headerGetExtension, everywhere.
@@ .
patch -p0 <<'@@ .'
Index: rpm/build/files.c
============================================================================
$ cvs diff -u -r1.268 -r1.269 files.c
--- rpm/build/files.c 14 Oct 2007 00:36:21 -0000 1.268
+++ rpm/build/files.c 14 Oct 2007 15:15:14 -0000 1.269
@@ -2194,7 +2194,7 @@
}
}
(void) Fclose(fd);
- } while(token=strtok_r(NULL, ",", &saveptr));
+ } while((token = strtok_r(NULL, ",", &saveptr)) != NULL);
free(filesFiles);
}
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/rpmlib.h
============================================================================
$ cvs diff -u -r2.440 -r2.441 rpmlib.h
--- rpm/lib/rpmlib.h 12 Oct 2007 18:53:48 -0000 2.440
+++ rpm/lib/rpmlib.h 14 Oct 2007 15:15:14 -0000 2.441
@@ -616,10 +616,10 @@
* @return 1 on success, 0 on failure
*/
typedef int (*HGE_t) (Header h, rpmTag tag,
- /[EMAIL PROTECTED]@*/ /[EMAIL PROTECTED]@*/ rpmTagType
* type,
- /[EMAIL PROTECTED]@*/ /[EMAIL PROTECTED]@*/ void * p,
- /[EMAIL PROTECTED]@*/ /[EMAIL PROTECTED]@*/ int_32 * c)
- /[EMAIL PROTECTED] *type, *p, *c @*/;
+ /[EMAIL PROTECTED]@*/ /[EMAIL PROTECTED]@*/ hTYP_t t,
+ /[EMAIL PROTECTED]@*/ /[EMAIL PROTECTED]@*/ hRET_t * p,
+ /[EMAIL PROTECTED]@*/ /[EMAIL PROTECTED]@*/ hCNT_t c)
+ /[EMAIL PROTECTED] *t, *p, *c @*/;
/**
* Prototype for headerAddEntry() vector.
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/rpmte.c
============================================================================
$ cvs diff -u -r2.56 -r2.57 rpmte.c
--- rpm/lib/rpmte.c 13 Oct 2007 23:57:36 -0000 2.56
+++ rpm/lib/rpmte.c 14 Oct 2007 15:15:14 -0000 2.57
@@ -225,7 +225,6 @@
HE_s he_s = { .tag = 0, .t = &he_t, .p = &he_p, .c = &he_c, .freeData =
0 };
HE_t he = &he_s;
rpmte p = xcalloc(1, sizeof(*p));
- int_32 * ep;
int xx;
p->type = type;
@@ .
patch -p0 <<'@@ .'
Index: rpm/python/header-py.c
============================================================================
$ cvs diff -u -r1.58 -r1.59 header-py.c
--- rpm/python/header-py.c 14 Oct 2007 00:36:22 -0000 1.58
+++ rpm/python/header-py.c 14 Oct 2007 15:15:15 -0000 1.59
@@ -179,8 +179,6 @@
HE_t he = &he_s;
HAE_t hae = (HAE_t)headerAddEntry;
HRE_t hre = (HRE_t)headerRemoveEntry;
- hRET_t fileNames = { .ptr = NULL };
- int count = 0;
int xx;
/[EMAIL PROTECTED]@*/
@@ -308,7 +306,6 @@
int_32 he_c = 0;
HE_s he_s = { .tag = 0, .t = &he_t, .p = &he_p, .c = &he_c, .freeData =
0 };
HE_t he = &he_s;
- int count = 0;
int xx;
if (!headerIsEntry (h, RPMTAG_BASENAMES)
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
