diff options
| author | jbj <devnull@localhost> | 2003-04-09 21:46:31 +0000 |
|---|---|---|
| committer | jbj <devnull@localhost> | 2003-04-09 21:46:31 +0000 |
| commit | 552d691608cf3bef7d95acea4e2310a437da2c54 (patch) | |
| tree | 06815cff89dcb22a5bb73e3e96f18d3c727c303a /lib/formats.c | |
| parent | 783219a8325bca538d21c367f9c523a79dbcb011 (diff) | |
| download | librpm-tizen-552d691608cf3bef7d95acea4e2310a437da2c54.tar.gz librpm-tizen-552d691608cf3bef7d95acea4e2310a437da2c54.tar.bz2 librpm-tizen-552d691608cf3bef7d95acea4e2310a437da2c54.zip | |
Splint fiddles.
CVS patchset: 6736
CVS date: 2003/04/09 21:46:31
Diffstat (limited to 'lib/formats.c')
| -rw-r--r-- | lib/formats.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/lib/formats.c b/lib/formats.c index a07a9fcfc..54994a830 100644 --- a/lib/formats.c +++ b/lib/formats.c @@ -389,8 +389,8 @@ static /*@only@*/ char * xmlFormat(int_32 type, const void * data, static /*@only@*/ char * pgpsigFormat(int_32 type, const void * data, /*@unused@*/ char * formatPrefix, /*@unused@*/ int padding, /*@unused@*/ int element) - /*@globals fileSystem @*/ - /*@modifies fileSystem @*/ + /*@globals fileSystem, internalState @*/ + /*@modifies fileSystem, internalState @*/ { char * val, * t; @@ -661,7 +661,6 @@ static int fssizesTag(Header h, /*@out@*/ rpmTagType * type, * @retval *freeData data-was-malloc'ed indicator * @return 0 on success */ -/*@-bounds@*/ /* LCL: segfault */ static int triggercondsTag(Header h, /*@out@*/ rpmTagType * type, /*@out@*/ const void ** data, /*@out@*/ int_32 * count, /*@out@*/ int * freeData) @@ -696,6 +695,7 @@ static int triggercondsTag(Header h, /*@out@*/ rpmTagType * type, *data = conds = xmalloc(sizeof(*conds) * numScripts); *count = numScripts; *type = RPM_STRING_ARRAY_TYPE; +/*@-bounds@*/ for (i = 0; i < numScripts; i++) { chptr = xstrdup(""); @@ -721,13 +721,13 @@ static int triggercondsTag(Header h, /*@out@*/ rpmTagType * type, conds[i] = chptr; } +/*@=bounds@*/ names = hfd(names, tnt); versions = hfd(versions, tvt); return 0; } -/*@=bounds@*/ /** * Retrieve trigger type info. @@ -767,6 +767,7 @@ static int triggertypeTag(Header h, /*@out@*/ rpmTagType * type, *data = conds = xmalloc(sizeof(*conds) * numScripts); *count = numScripts; *type = RPM_STRING_ARRAY_TYPE; +/*@-bounds@*/ for (i = 0; i < numScripts; i++) { for (j = 0; j < numNames; j++) { if (indices[j] != i) @@ -785,6 +786,7 @@ static int triggertypeTag(Header h, /*@out@*/ rpmTagType * type, /*@innerbreak@*/ break; } } +/*@=bounds@*/ return 0; } |