RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: j...@rpm5.org
Module: popt Date: 18-Dec-2008 18:09:49
Branch: HEAD Handle: 2008121817094900
Modified files:
popt .splintrc poptconfig.c poptint.c poptint.h
system.h test1.c
Log:
- jbj: splint (3.1.2) fiddles.
Summary:
Revision Changes Path
1.11 +1 -1 popt/.splintrc
1.39 +1 -1 popt/poptconfig.c
1.23 +1 -0 popt/poptint.c
1.40 +5 -3 popt/poptint.h
1.15 +1 -1 popt/system.h
1.38 +2 -0 popt/test1.c
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: popt/.splintrc
============================================================================
$ cvs diff -u -r1.10 -r1.11 .splintrc
--- popt/.splintrc 9 Mar 2008 20:24:45 -0000 1.10
+++ popt/.splintrc 18 Dec 2008 17:09:49 -0000 1.11
@@ -12,7 +12,7 @@
+strict # lclint level
# --- in progress
-#+bounds
+-bounds
-bufferoverflowhigh
-branchstate
@@ .
patch -p0 <<'@@ .'
Index: popt/poptconfig.c
============================================================================
$ cvs diff -u -r1.38 -r1.39 poptconfig.c
--- popt/poptconfig.c 10 Mar 2008 08:13:09 -0000 1.38
+++ popt/poptconfig.c 18 Dec 2008 17:09:49 -0000 1.39
@@ -207,7 +207,7 @@
size_t i;
for (i = 0; i < pglob->gl_pathc; i++) {
char * f = pglob->gl_pathv[i];
- if (strstr(f, ".rpmnew") || strstr(f, ".rpmsave"))
+ if (f == NULL || strstr(f, ".rpmnew") || strstr(f, ".rpmsave"))
continue;
if (!stat(f, &s)) {
if (!S_ISREG(s.st_mode) && !S_ISLNK(s.st_mode))
@@ .
patch -p0 <<'@@ .'
Index: popt/poptint.c
============================================================================
$ cvs diff -u -r1.22 -r1.23 poptint.c
--- popt/poptint.c 4 Dec 2008 21:05:27 -0000 1.22
+++ popt/poptint.c 18 Dec 2008 17:09:49 -0000 1.23
@@ -92,6 +92,7 @@
{
char * shift_pin = NULL;
size_t db = strlen(istr);
+/*...@owned@*/
char * dstr = malloc((db + 1) * sizeof(*dstr));
char * pin = istr;
char * pout = dstr;
@@ .
patch -p0 <<'@@ .'
Index: popt/poptint.h
============================================================================
$ cvs diff -u -r1.39 -r1.40 poptint.h
--- popt/poptint.h 18 Dec 2008 16:55:43 -0000 1.39
+++ popt/poptint.h 18 Dec 2008 17:09:49 -0000 1.40
@@ -69,10 +69,12 @@
} poptArg;
/*...@=exporttype =field...@*/
+/*...@-exportvar@*/
/*...@unchecked@*/
extern unsigned int _poptArgMask;
/*...@unchecked@*/
extern unsigned int _poptGroupMask;
+/*...@=exportvar@*/
#define poptArgType(_opt) ((_opt)->argInfo & _poptArgMask)
#define poptGroup(_opt) ((_opt)->argInfo & _poptGroupMask)
@@ -151,9 +153,9 @@
/*...@*/;
extern size_t iconv(iconv_t __cd, /*...@null@*/ char ** __inbuf,
- /*...@out@*/ size_t * __inbytesleft,
- /*...@out@*/ char ** __outbuf,
- /*...@out@*/ size_t * __outbytesleft)
+ /*...@null@*/ /*...@out@*/ size_t * __inbytesleft,
+ /*...@null@*/ /*...@out@*/ char ** __outbuf,
+ /*...@null@*/ /*...@out@*/ size_t * __outbytesleft)
/*...@modifies __cd,
*__inbuf, *__inbytesleft, *__outbuf, *__outbytesleft @*/;
@@ .
patch -p0 <<'@@ .'
Index: popt/system.h
============================================================================
$ cvs diff -u -r1.14 -r1.15 system.h
--- popt/system.h 9 Mar 2008 20:24:45 -0000 1.14
+++ popt/system.h 18 Dec 2008 17:09:49 -0000 1.15
@@ -32,7 +32,7 @@
#include <stdlib.h>
#include <string.h>
-#ifdef HAVE_UNISTD_H
+#if defined(HAVE_UNISTD_H) && !defined(__LCLINT__)
#include <unistd.h>
#endif
@@ .
patch -p0 <<'@@ .'
Index: popt/test1.c
============================================================================
$ cvs diff -u -r1.37 -r1.38 test1.c
--- popt/test1.c 5 May 2008 20:54:31 -0000 1.37
+++ popt/test1.c 18 Dec 2008 17:09:49 -0000 1.38
@@ -294,8 +294,10 @@
while ((arg = *av++) != NULL)
fprintf(stdout, " %s", arg);
}
+/*...@-nullpass@*/
if (oStr != (char *)-1)
fprintf(stdout, " oStr: %s", (oStr ? oStr : "(none)"));
+/*...@=nullpass@*/
if (singleDash)
fprintf(stdout, " -");
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
