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: 19-Jun-2007 05:30:13
Branch: HEAD Handle: 2007061904301201
Modified files:
rpm/lib .splintrc psm.c rpmds.c rpmds.h rpmns.c rpmns.h
rpm/rpmio envvar.h
Log:
splint fiddles.
Summary:
Revision Changes Path
2.12 +3 -10 rpm/lib/.splintrc
2.201 +2 -1 rpm/lib/psm.c
2.57 +3 -7 rpm/lib/rpmds.c
2.57 +1 -0 rpm/lib/rpmds.h
1.3 +5 -3 rpm/lib/rpmns.c
1.4 +4 -3 rpm/lib/rpmns.h
1.4 +3 -1 rpm/rpmio/envvar.h
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/lib/.splintrc
============================================================================
$ cvs diff -u -r2.11 -r2.12 .splintrc
--- rpm/lib/.splintrc 19 Jun 2007 02:42:15 -0000 2.11
+++ rpm/lib/.splintrc 19 Jun 2007 03:30:12 -0000 2.12
@@ -19,27 +19,20 @@
-bufferoverflowhigh
-branchstate
--compdef
+-compdef # 9
-evalorder
-exportheader
-globs
-globstate
--modobserver
-moduncon
-mustmod
-noeffectuncon
--nullderef
+-nullderef # 2
-nullpass # 62 rpmExpand annoyance
-nullptrarith
--nullret
--nullstate
--retexpose
+-nullstate # 2
-unrecog
--dependenttrans
--observertrans
--ownedtrans
-
# --- +partial artifacts
-declundef
-exportheadervar
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/psm.c
============================================================================
$ cvs diff -u -r2.200 -r2.201 psm.c
--- rpm/lib/psm.c 19 Jun 2007 02:32:42 -0000 2.200
+++ rpm/lib/psm.c 19 Jun 2007 03:30:12 -0000 2.201
@@ -2338,7 +2338,8 @@
if (rc != RPMRC_OK) break;
/* Forget the offset of a successfully removed header. */
- psm->te->u.removed.dboffset = 0;
+ if (psm->te != NULL) /* XXX can't happen */
+ psm->te->u.removed.dboffset = 0;
} break;
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/rpmds.c
============================================================================
$ cvs diff -u -r2.56 -r2.57 rpmds.c
--- rpm/lib/rpmds.c 9 Jun 2007 19:07:57 -0000 2.56
+++ rpm/lib/rpmds.c 19 Jun 2007 03:30:12 -0000 2.57
@@ -359,10 +359,8 @@
av[i] = xstrdup("");
else if (*N[i] == '/')
av[i] = xstrdup(N[i]);
- else if (ds->EVR && ds->Flags)
-/[EMAIL PROTECTED]@*/ /* XXX ds->Flags != NULL */
+ else if (ds->EVR != NULL && ds->Flags != NULL)
av[i] = rpmGenPath(NULL, ds->EVR[ds->Flags[i]], N[i]);
-/[EMAIL PROTECTED]@*/
else
av[i] = NULL;
}
@@ -395,7 +393,6 @@
/[EMAIL PROTECTED] [EMAIL PROTECTED]/
}
-/[EMAIL PROTECTED]@*/ /* FIX: correct annotations for ds->ns shadow */
const char * rpmdsNewN(rpmds ds)
{
rpmns ns = &ds->ns;
@@ -405,11 +402,10 @@
memset(ns, 0, sizeof(*ns));
xx = rpmnsParse(Name, ns);
-/[EMAIL PROTECTED] [EMAIL PROTECTED]/ /* FIX: correct annotations for ds->ns
shadow */
+/[EMAIL PROTECTED] [EMAIL PROTECTED]/ /* FIX: correct annotations for ds->ns
shadow */
return ns->N;
-/[EMAIL PROTECTED] [EMAIL PROTECTED]/
+/[EMAIL PROTECTED] [EMAIL PROTECTED]/
}
-/[EMAIL PROTECTED]@*/
char * rpmdsNewDNEVR(const char * dspfx, rpmds ds)
{
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/rpmds.h
============================================================================
$ cvs diff -u -r2.56 -r2.57 rpmds.h
--- rpm/lib/rpmds.h 25 May 2007 17:36:02 -0000 2.56
+++ rpm/lib/rpmds.h 19 Jun 2007 03:30:12 -0000 2.57
@@ -173,6 +173,7 @@
* @param ds dependency set
* @return new N string (malloc'ed)
*/
+/[EMAIL PROTECTED]@*/ /[EMAIL PROTECTED]@*/ /[EMAIL PROTECTED]@*/
const char * rpmdsNewN(rpmds ds)
/[EMAIL PROTECTED] rpmGlobalMacroContext, h_errno @*/
/[EMAIL PROTECTED] ds, rpmGlobalMacroContext @*/;
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/rpmns.c
============================================================================
$ cvs diff -u -r1.2 -r1.3 rpmns.c
--- rpm/lib/rpmns.c 25 May 2007 18:34:13 -0000 1.2
+++ rpm/lib/rpmns.c 19 Jun 2007 03:30:12 -0000 1.3
@@ -191,10 +191,12 @@
ns->NS = ns->str;
if (ns->NS[0] == '!')
ns->NS++;
- if ((t = strchr(t, '(')) != NULL)
+ if ((t = strchr(t, '(')) != NULL) {
*t++ = '\0';
- ns->N = t;
- t[strlen(t)-1] = '\0';
+ ns->N = t;
+ t[strlen(t)-1] = '\0';
+ } else
+ ns->N = NULL;
ns->A = NULL;
break;
case RPMNS_TYPE_UNKNOWN:
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/rpmns.h
============================================================================
$ cvs diff -u -r1.3 -r1.4 rpmns.h
--- rpm/lib/rpmns.h 19 Jun 2007 02:32:42 -0000 1.3
+++ rpm/lib/rpmns.h 19 Jun 2007 03:30:12 -0000 1.4
@@ -55,13 +55,14 @@
* An NS parsing container.
*/
struct rpmns_s {
+/[EMAIL PROTECTED]@*/
const char * str; /*!< string storage */
nsType Type; /*!< Type */
-/[EMAIL PROTECTED]@*/ /[EMAIL PROTECTED]@*/
+/[EMAIL PROTECTED]@*/ /[EMAIL PROTECTED]@*/
const char * NS; /*!< Namespace */
-/[EMAIL PROTECTED]@*/ /[EMAIL PROTECTED]@*/
+/[EMAIL PROTECTED]@*/ /[EMAIL PROTECTED]@*/
const char * N; /*!< Name */
-/[EMAIL PROTECTED]@*/ /[EMAIL PROTECTED]@*/
+/[EMAIL PROTECTED]@*/ /[EMAIL PROTECTED]@*/
const char * A; /*!< Arch */
evrFlags Flags; /*!< EVR comparison flags. */
};
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/envvar.h
============================================================================
$ cvs diff -u -r1.3 -r1.4 envvar.h
--- rpm/rpmio/envvar.h 30 May 2007 02:49:41 -0000 1.3
+++ rpm/rpmio/envvar.h 19 Jun 2007 03:30:13 -0000 1.4
@@ -33,7 +33,9 @@
int envPut(/[EMAIL PROTECTED]@*/ const char *name, /[EMAIL PROTECTED]@*/
const char *value)
/[EMAIL PROTECTED]/
{
- char *t, *te;
+/[EMAIL PROTECTED]@*/
+ char *t;
+ char *te;
size_t nb = 0;
int rc;
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
