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: 10-Dec-2009 19:47:59 Branch: HEAD Handle: 2009121018475800 Modified files: rpm/rpmio rpmdir.h rpmficl.h rpmio_internal.h rpmjs.h rpmperl.h rpmpython.h rpmruby.h rpmsx.h rpmsyck.h rpmtcl.h Log: - rpmio: splint fiddles. Summary: Revision Changes Path 2.4 +2 -2 rpm/rpmio/rpmdir.h 2.3 +5 -1 rpm/rpmio/rpmficl.h 2.125 +6 -4 rpm/rpmio/rpmio_internal.h 1.3 +5 -1 rpm/rpmio/rpmjs.h 2.6 +5 -1 rpm/rpmio/rpmperl.h 2.7 +5 -1 rpm/rpmio/rpmpython.h 2.5 +5 -1 rpm/rpmio/rpmruby.h 2.6 +2 -1 rpm/rpmio/rpmsx.h 2.4 +7 -3 rpm/rpmio/rpmsyck.h 2.10 +1 -1 rpm/rpmio/rpmtcl.h ____________________________________________________________________________ patch -p0 <<'@@ .' Index: rpm/rpmio/rpmdir.h ============================================================================ $ cvs diff -u -r2.3 -r2.4 rpmdir.h --- rpm/rpmio/rpmdir.h 4 Jul 2009 14:35:39 -0000 2.3 +++ rpm/rpmio/rpmdir.h 10 Dec 2009 18:47:58 -0000 2.4 @@ -56,7 +56,7 @@ /** */ -typedef struct rpmavx_s * rpmavx; +typedef /*...@abstrct@*/ /*...@refcounted@*/ struct rpmavx_s * rpmavx; /** */ @@ -203,7 +203,7 @@ int Scandir(const char * path, struct dirent *** nl, int (*filter) (const struct dirent *), int (*compar) (const void *, const void *)) - /*...@modifies dir @*/; + /*...@modifies *nl @*/; int Alphasort(const void * a, const void * b) /*...@*/; int Versionsort(const void * a, const void * b) @@ . patch -p0 <<'@@ .' Index: rpm/rpmio/rpmficl.h ============================================================================ $ cvs diff -u -r2.2 -r2.3 rpmficl.h --- rpm/rpmio/rpmficl.h 17 Apr 2009 18:42:33 -0000 2.2 +++ rpm/rpmio/rpmficl.h 10 Dec 2009 18:47:58 -0000 2.3 @@ -8,7 +8,7 @@ #include <rpmiotypes.h> #include <rpmio.h> -typedef /*...@abstract@*/ struct rpmficl_s * rpmficl; +typedef /*...@abstract@*/ /*...@refcounted@*/ struct rpmficl_s * rpmficl; /*...@unchecked@*/ extern int _rpmficl_debug; @@ -22,6 +22,10 @@ void * sys; /* ficlSystem */ void * vm; /* ficlVm */ rpmiob iob; +#if defined(__LCLINT__) +/*...@refs@*/ + int nrefs; /*!< (unused) keep splint happy */ +#endif }; #endif /* _RPMFICL_INTERNAL */ @@ . patch -p0 <<'@@ .' Index: rpm/rpmio/rpmio_internal.h ============================================================================ $ cvs diff -u -r2.124 -r2.125 rpmio_internal.h --- rpm/rpmio/rpmio_internal.h 10 Dec 2009 16:46:50 -0000 2.124 +++ rpm/rpmio/rpmio_internal.h 10 Dec 2009 18:47:58 -0000 2.125 @@ -529,8 +529,10 @@ /*...@globals internalState @*/ /*...@modifies fd, internalState @*/ { +/*...@+voidabstract@*/ fd->digests = xrealloc(fd->digests, (fd->ndigests + 1) * sizeof(*fd->digests)); +/*...@=voidabstract@*/ fdstat_enter(fd, FDSTAT_DIGEST); fd->digests[fd->ndigests++] = rpmDigestInit(hashalgo, flags); fdstat_exit(fd, FDSTAT_DIGEST, 0); @@ -621,9 +623,9 @@ switch (rpmDigestAlgo(ctx)) { case PGPHASHALGO_MD5: assert(dig->md5ctx == NULL); -/*...@-onlytrans@*/ +/*...@-assignexpose -onlytr...@*/ dig->md5ctx = ctx; -/*...@=onlytrans@*/ +/*...@=assignexpose =onlytr...@*/ fd->digests[i] = NULL; /*...@switchbreak@*/ break; case PGPHASHALGO_SHA1: @@ -634,9 +636,9 @@ case PGPHASHALGO_SHA512: #endif assert(dig->sha1ctx == NULL); -/*...@-onlytrans@*/ +/*...@-assignexpose -onlytr...@*/ dig->sha1ctx = ctx; -/*...@=onlytrans@*/ +/*...@=assignexpose =onlytr...@*/ fd->digests[i] = NULL; /*...@switchbreak@*/ break; default: @@ . patch -p0 <<'@@ .' Index: rpm/rpmio/rpmjs.h ============================================================================ $ cvs diff -u -r1.2 -r1.3 rpmjs.h --- rpm/rpmio/rpmjs.h 17 Apr 2009 12:41:56 -0000 1.2 +++ rpm/rpmio/rpmjs.h 10 Dec 2009 18:47:58 -0000 1.3 @@ -8,7 +8,7 @@ #include <rpmiotypes.h> #include <rpmio.h> -typedef /*...@abstract@*/ struct rpmjs_s * rpmjs; +typedef /*...@abstract@*/ /*...@refcounted@*/ struct rpmjs_s * rpmjs; /*...@unchecked@*/ extern int _rpmjs_debug; @@ -22,6 +22,10 @@ void * rt; void * cx; void * glob; +#if defined(__LCLINT__) +/*...@refs@*/ + int nrefs; /*!< (unused) keep splint happy */ +#endif }; #endif /* _RPMJS_INTERNAL */ @@ . patch -p0 <<'@@ .' Index: rpm/rpmio/rpmperl.h ============================================================================ $ cvs diff -u -r2.5 -r2.6 rpmperl.h --- rpm/rpmio/rpmperl.h 16 Apr 2009 17:27:17 -0000 2.5 +++ rpm/rpmio/rpmperl.h 10 Dec 2009 18:47:58 -0000 2.6 @@ -8,7 +8,7 @@ #include <rpmiotypes.h> #include <rpmio.h> -typedef /*...@abstract@*/ struct rpmperl_s * rpmperl; +typedef /*...@abstract@*/ /*...@refcounted@*/ struct rpmperl_s * rpmperl; /*...@unchecked@*/ extern int _rpmperl_debug; @@ -20,6 +20,10 @@ struct rpmperl_s { struct rpmioItem_s _item; /*!< usage mutex and pool identifier. */ void * I; +#if defined(__LCLINT__) +/*...@refs@*/ + int nrefs; /*!< (unused) keep splint happy */ +#endif }; #endif /* _RPMPERL_INTERNAL */ @@ . patch -p0 <<'@@ .' Index: rpm/rpmio/rpmpython.h ============================================================================ $ cvs diff -u -r2.6 -r2.7 rpmpython.h --- rpm/rpmio/rpmpython.h 16 Apr 2009 04:04:46 -0000 2.6 +++ rpm/rpmio/rpmpython.h 10 Dec 2009 18:47:58 -0000 2.7 @@ -8,7 +8,7 @@ #include <rpmiotypes.h> #include <rpmio.h> -typedef /*...@abstract@*/ struct rpmpython_s * rpmpython; +typedef /*...@abstract@*/ /*...@refcounted@*/ struct rpmpython_s * rpmpython; /*...@unchecked@*/ extern int _rpmpython_debug; @@ -20,6 +20,10 @@ struct rpmpython_s { struct rpmioItem_s _item; /*!< usage mutex and pool identifier. */ void * I; /* (unused) */ +#if defined(__LCLINT__) +/*...@refs@*/ + int nrefs; /*!< (unused) keep splint happy */ +#endif }; #endif /* _RPMPYTHON_INTERNAL */ @@ . patch -p0 <<'@@ .' Index: rpm/rpmio/rpmruby.h ============================================================================ $ cvs diff -u -r2.4 -r2.5 rpmruby.h --- rpm/rpmio/rpmruby.h 16 Apr 2009 13:24:03 -0000 2.4 +++ rpm/rpmio/rpmruby.h 10 Dec 2009 18:47:58 -0000 2.5 @@ -8,7 +8,7 @@ #include <rpmiotypes.h> #include <rpmio.h> -typedef /*...@abstract@*/ struct rpmruby_s * rpmruby; +typedef /*...@abstract@*/ /*...@refcounted@*/ struct rpmruby_s * rpmruby; /*...@unchecked@*/ extern int _rpmruby_debug; @@ -21,6 +21,10 @@ struct rpmioItem_s _item; /*!< usage mutex and pool identifier. */ void * I; unsigned long state; +#if defined(__LCLINT__) +/*...@refs@*/ + int nrefs; /*!< (unused) keep splint happy */ +#endif }; #endif /* _RPMRUBY_INTERNAL */ @@ . patch -p0 <<'@@ .' Index: rpm/rpmio/rpmsx.h ============================================================================ $ cvs diff -u -r2.5 -r2.6 rpmsx.h --- rpm/rpmio/rpmsx.h 10 Dec 2009 16:46:50 -0000 2.5 +++ rpm/rpmio/rpmsx.h 10 Dec 2009 18:47:58 -0000 2.6 @@ -8,11 +8,12 @@ #include <rpmiotypes.h> #include <rpmio.h> -typedef /*...@refcounted@*/ struct rpmsx_s * rpmsx; +typedef /*...@abstract@*/ /*...@refcounted@*/ struct rpmsx_s * rpmsx; /*...@unchecked@*/ extern int _rpmsx_debug; +/*...@unchecked@*/ extern rpmsx _rpmsxI; #if defined(_RPMSX_INTERNAL) @@ . patch -p0 <<'@@ .' Index: rpm/rpmio/rpmsyck.h ============================================================================ $ cvs diff -u -r2.3 -r2.4 rpmsyck.h --- rpm/rpmio/rpmsyck.h 12 May 2009 13:35:21 -0000 2.3 +++ rpm/rpmio/rpmsyck.h 10 Dec 2009 18:47:58 -0000 2.4 @@ -13,7 +13,7 @@ T_MAP } syck_type_t; -typedef struct rpmsyck_node_s * rpmsyck_node; +typedef /*...@abstract@*/ struct rpmsyck_node_s * rpmsyck_node; struct rpmsyck_node_s { syck_type_t type; @@ -25,12 +25,16 @@ } value; }; -typedef struct rpmSyck_s * rpmSyck; +typedef /*...@abstract@*/ /*...@refcounted@*/ struct rpmSyck_s * rpmSyck; struct rpmSyck_s { struct rpmioItem_s _item; /*!< usage mutex and pool identifier. */ rpmsyck_node firstNode; st_table *syms; +#if defined(__LCLINT__) +/*...@refs@*/ + int nrefs; /*!< (unused) keep splint happy */ +#endif }; /** @@ -66,7 +70,7 @@ */ /*...@unused@*/ /*...@newref@*/ /*...@null@*/ rpmSyck rpmSyckLink (/*...@null@*/ rpmSyck rs) - /*...@modifies ht @*/; + /*...@modifies rs @*/; #define rpmSyckLink(_rs) \ ((rpmSyck)rpmioLinkPoolItem((rpmioItem)(_rs), __FUNCTION__, __FILE__, __LINE__)) @@ . patch -p0 <<'@@ .' Index: rpm/rpmio/rpmtcl.h ============================================================================ $ cvs diff -u -r2.9 -r2.10 rpmtcl.h --- rpm/rpmio/rpmtcl.h 11 Jul 2009 21:32:36 -0000 2.9 +++ rpm/rpmio/rpmtcl.h 10 Dec 2009 18:47:58 -0000 2.10 @@ -8,7 +8,7 @@ #include <rpmiotypes.h> #include <rpmio.h> -typedef /*...@abstract@*/ struct rpmtcl_s * rpmtcl; +typedef /*...@abstract@*/ /*...@refcounted@*/ struct rpmtcl_s * rpmtcl; /*...@unchecked@*/ extern int _rpmtcl_debug; @@ . ______________________________________________________________________ RPM Package Manager http://rpm5.org CVS Sources Repository [email protected]
