folkslinux
/
rpm
mirror of https://github.com/rpm-software-management/rpm.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

splint fiddles. 

CVS patchset: 5956
CVS date: 2002/12/21 01:31:24
This commit is contained in:
jbj 2002-12-21 01:31:24 +00:00
parent ec22ac6d3c
commit b2402702ae
4 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build/rpmfc.h
View File

@ -115,9 +115,11 @@ int rpmfcColoring(const char * fmstr)
/**
* @param fc file classifier
*/
/*@-exportlocal@*/
void rpmfcPrint(const char * msg, rpmfc fc, FILE * fp)
/*@globals fileSystem @*/
/*@modifies *fp, fc, fileSystem @*/;
/*@=exportlocal@*/
/**
* Destroy a file classifier.

4
lib/formats.c
View File

@ -747,7 +747,7 @@ static int fileclassTag(Header h, /*@out@*/ rpmTagType * type,
static int fileprovideTag(Header h, /*@out@*/ rpmTagType * type,
/*@out@*/ const void ** data, /*@out@*/ int_32 * count,
/*@out@*/ int * freeData)
/*@modifies *type, *data, *count, *freeData @*/
/*@modifies h, *type, *data, *count, *freeData @*/
/*@requires maxSet(type) >= 0 /\ maxSet(data) >= 0
/\ maxSet(count) >= 0 /\ maxSet(freeData) >= 0 @*/
{
@ -769,7 +769,7 @@ static int fileprovideTag(Header h, /*@out@*/ rpmTagType * type,
static int filerequireTag(Header h, /*@out@*/ rpmTagType * type,
/*@out@*/ const void ** data, /*@out@*/ int_32 * count,
/*@out@*/ int * freeData)
/*@modifies *type, *data, *count, *freeData @*/
/*@modifies h, *type, *data, *count, *freeData @*/
/*@requires maxSet(type) >= 0 /\ maxSet(data) >= 0
/\ maxSet(count) >= 0 /\ maxSet(freeData) >= 0 @*/
{

11
lib/rpmfi.c
View File

@ -1227,7 +1227,8 @@ void rpmfiBuildFDeps(Header h, rpmTag tagN,
size_t nb;
rpmTagType ddt, fxt, fnt;
char * t;
int dx, ndx, i, ix, xx;
unsigned ix;
int dx, ndx, i, xx;
if (!hge(h, RPMTAG_FILESIZES, NULL, (void **) NULL, &ac) || ac == 0) {
if (fdepsp) *fdepsp = NULL;
@ -1261,11 +1262,11 @@ void rpmfiBuildFDeps(Header h, rpmTag tagN,
ix = ddict[dx++];
mydt = ((ix >> 24) & 0xff);
if (mydt != deptype)
continue;
/*@innercontinue@*/ continue;
ix &= 0x00ffffff;
(void) rpmdsSetIx(ds, ix-1);
if (rpmdsNext(ds) < 0)
continue;
/*@innercontinue@*/ continue;
DNEVR = rpmdsDNEVR(ds);
if (DNEVR != NULL)
nb += strlen(DNEVR+2) + 1;
@ -1287,11 +1288,11 @@ void rpmfiBuildFDeps(Header h, rpmTag tagN,
ix = ddict[dx++];
mydt = ((ix >> 24) & 0xff);
if (mydt != deptype)
continue;
/*@innercontinue@*/ continue;
ix &= 0x00ffffff;
(void) rpmdsSetIx(ds, ix-1);
if (rpmdsNext(ds) < 0)
continue;
/*@innercontinue@*/ continue;
DNEVR = rpmdsDNEVR(ds);
if (DNEVR != NULL) {
t = stpcpy(t, DNEVR+2);

2
lib/rpmfi.h
View File

@ -454,7 +454,7 @@ void rpmfiBuildFClasses(Header h,
*/
void rpmfiBuildFDeps(Header h, rpmTag tagN,
/*@out@*/ const char *** fdepsp, /*@out@*/ int * fcp)
/*@modifies *fdepsp, *fcp @*/;
/*@modifies h, *fdepsp, *fcp @*/;
/**
* Return file type from mode_t.