Lclint fiddles.

CVS patchset: 5468
CVS date: 2002/06/05 22:07:55

diff --git a/Makefile.am b/Makefile.am
index b096db5..1e5cda7 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -7,6 +7,7 @@ EXTRA_DIST = CHANGES CREDITS Doxyheader GROUPS README.amiga INSTALL \
        autodeps/none autodeps/*.prov autodeps/*.req autogen.sh \
        config.site db db3/configure gendiff installplatform platform* \
        xmlspec/Makefile xmlspec/*.cpp xmlspec/*.h xmlspec/*.xml \
+       xmlspec/doc/*.html \
        Perl-RPM po/*.in po/*.po po/rpm.pot \
        rpm.magic rpmpopt-$(VERSION) rpmqv.c rpm.c
 

diff --git a/lib/rpmal.h b/lib/rpmal.h
index 3831892..7a222c8 100644 (file)
--- a/lib/rpmal.h
+++ b/lib/rpmal.h
@@ -6,8 +6,10 @@
  * Structures used for managing added/available package lists.
  */
 
+/*@-exportlocal@*/
 /*@unchecked@*/
 extern int _rpmal_debug;
+/*@=exportlocal@*/
 
 /**
  */

diff --git a/lib/rpmds.h b/lib/rpmds.h
index 3fbbf82..83e8e4c 100644 (file)
--- a/lib/rpmds.h
+++ b/lib/rpmds.h
@@ -8,8 +8,10 @@
 
 /**
  */
+/*@-exportlocal@*/
 /*@unchecked@*/
 extern int _rpmds_debug;
+/*@=exportlocal@*/
 
 #if defined(_RPMDS_INTERNAL)
 /**

diff --git a/lib/rpmfi.h b/lib/rpmfi.h
index 2590e3b..084dc85 100644 (file)
--- a/lib/rpmfi.h
+++ b/lib/rpmfi.h
@@ -6,8 +6,10 @@
  * Structure(s) used for file info tag sets.
  */
 
+/*@-exportlocal@*/
 /*@unchecked@*/
 extern int _rpmfi_debug;
+/*@=exportlocal@*/
 
 #if defined(_RPMFI_INTERNAL)
 /**

diff --git a/lib/rpmlib.h b/lib/rpmlib.h
index eb88a9e..59f51d6 100644 (file)
--- a/lib/rpmlib.h
+++ b/lib/rpmlib.h
@@ -601,10 +601,8 @@ int rpmMachineScore(int type, const char * name)
  * @return             0 always
  */
 int rpmShowRC(FILE * fp)
-       /*@globals rpmGlobalMacroContext,
-               fileSystem, internalState @*/
-       /*@modifies *fp, rpmGlobalMacroContext,
-               fileSystem, internalState  @*/;
+       /*@globals rpmGlobalMacroContext, fileSystem, internalState @*/
+       /*@modifies *fp, rpmGlobalMacroContext, fileSystem, internalState  @*/;
 
 /** \ingroup rpmrc
  * @deprecated Use addMacro to set _target_* macros.
@@ -614,8 +612,8 @@ int rpmShowRC(FILE * fp)
  * @param osTable
  */
 void rpmSetTables(int archTable, int osTable)
-       /*@globals fileSystem, internalState @*/
-       /*@modifies fileSystem, internalState @*/;
+       /*@globals rpmGlobalMacroContext, fileSystem, internalState @*/
+       /*@modifies rpmGlobalMacroContext, fileSystem, internalState @*/;
 
 /** \ingroup rpmrc
  * Set current arch/os names.
@@ -628,8 +626,8 @@ void rpmSetTables(int archTable, int osTable)
  * @param os           os name (or NULL)
  */
 void rpmSetMachine(/*@null@*/ const char * arch, /*@null@*/ const char * os)
-       /*@globals fileSystem, internalState @*/
-       /*@modifies fileSystem, internalState @*/;
+       /*@globals rpmGlobalMacroContext, fileSystem, internalState @*/
+       /*@modifies rpmGlobalMacroContext, fileSystem, internalState @*/;
 
 /** \ingroup rpmrc
  * Return current arch/os names.

diff --git a/lib/rpmrc.c b/lib/rpmrc.c
index 93861db..077b6c1 100644 (file)
--- a/lib/rpmrc.c
+++ b/lib/rpmrc.c
@@ -26,9 +26,9 @@ static const char *defrcfiles = LIBRPMRC_FILENAME ":/etc/rpmrc:~/.rpmrc";
 /*@observer@*/ /*@checked@*/
 const char * macrofiles = MACROFILES;
 
-/*@unchecked@*/
+/*@observer@*/ /*@unchecked@*/
 static const char * platform = "/etc/rpm/platform";
-/*@unchecked@*/
+/*@only@*/ /*@unchecked@*/
 static const char ** platpat = NULL;
 /*@unchecked@*/
 static int nplatpat = 0;
@@ -780,6 +780,10 @@ static int doReadRC( /*@killref@*/ FD_t fd, const char * urlfn)
 /**
  */
 static int rpmPlatform(const char * platform)
+       /*@globals nplatpat, platpat,
+               rpmGlobalMacroContext, fileSystem, internalState @*/
+       /*@modifies nplatpat, platpat,
+               rpmGlobalMacroContext, fileSystem, internalState @*/
 {
     char *cpu = NULL, *vendor = NULL, *os = NULL, *gnu = NULL;
     char * b = NULL;
@@ -813,9 +817,11 @@ static int rpmPlatform(const char * platform)
                *t = '\0';
            if (t > p) {
                platpat = xrealloc(platpat, (nplatpat + 2) * sizeof(*platpat));
+/*@-onlyunqglobaltrans@*/
                platpat[nplatpat] = xstrdup(p);
                nplatpat++;
                platpat[nplatpat] = NULL;
+/*@=onlyunqglobaltrans@*/
            }
            continue;
        }
@@ -831,6 +837,7 @@ static int rpmPlatform(const char * platform)
        vendor = p;
        while (*p && !(*p == '-' || isspace(*p)))
            p++;
+/*@-branchstate@*/
        if (*p != '-') {
            if (*p != '\0') *p++ = '\0';
            os = vendor;
@@ -850,22 +857,27 @@ static int rpmPlatform(const char * platform)
            }
            if (*p != '\0') *p++ = '\0';
        }
+/*@=branchstate@*/
 
        addMacro(NULL, "_host_cpu", NULL, cpu, -1);
        addMacro(NULL, "_host_vendor", NULL, vendor, -1);
        addMacro(NULL, "_host_os", NULL, os, -1);
 
        platpat = xrealloc(platpat, (nplatpat + 2) * sizeof(*platpat));
+/*@-onlyunqglobaltrans@*/
        platpat[nplatpat] = rpmExpand("%{_host_cpu}-%{_host_vendor}-%{_host_os}", (gnu && *gnu ? "-" : NULL), gnu, NULL);
        nplatpat++;
        platpat[nplatpat] = NULL;
+/*@=onlyunqglobaltrans@*/
        
        init_platform++;
     }
     rc = (init_platform ? 0 : -1);
 
 exit:
+/*@-modobserver@*/
     b = _free(b);
+/*@=modobserver@*/
     return rc;
 }
 
@@ -1037,8 +1049,8 @@ static void mfspr_ill(int notused)
  */
 static void defaultMachine(/*@out@*/ const char ** arch,
                /*@out@*/ const char ** os)
-       /*@globals fileSystem@*/
-       /*@modifies *arch, *os, fileSystem @*/
+       /*@globals rpmGlobalMacroContext, fileSystem, internalState @*/
+       /*@modifies *arch, *os, rpmGlobalMacroContext, fileSystem, internalState @*/
 {
     static struct utsname un;
     static int gotDefaults = 0;
@@ -1087,7 +1099,7 @@ static void defaultMachine(/*@out@*/ const char ** arch,
                    fd++) {
                      if (!xisdigit(un.release[fd]) && (un.release[fd] != '.')) {
                        un.release[fd] = 0;
-                       break;
+                       /*@innerbreak@*/ break;
                      }
                    }
                    sprintf(un.sysname,"sunos%s",un.release);

diff --git a/lib/rpmte.h b/lib/rpmte.h
index b2e0d94..43f6c7d 100644 (file)
--- a/lib/rpmte.h
+++ b/lib/rpmte.h
@@ -8,8 +8,10 @@
 
 /**
  */
+/*@-exportlocal@*/
 /*@unchecked@*/
 extern int _rpmte_debug;
+/*@=exportlocal@*/
 
 /**
  * Transaction element ordering chain linkage.
@@ -29,11 +31,6 @@ typedef enum rpmElementType_e {
     TR_REMOVED         = (1 << 1)      /*!< Package will be removed. */
 } rpmElementType;
 
-/*@-exportlocal@*/
-/*@unchecked@*/
-extern int _te_debug;
-/*@=exportlocal@*/
-
 #if    defined(_RPMTE_INTERNAL)
 /** \ingroup rpmte
  * Dependncy ordering information.

diff --git a/lib/rpmts.c b/lib/rpmts.c
index 1a4e6bf..b856c3f 100644 (file)
--- a/lib/rpmts.c
+++ b/lib/rpmts.c
@@ -55,6 +55,8 @@ extern int statvfs (const char * file, /*@out@*/ struct statvfs * buf)
 /*@access FD_t @*/             /* XXX compared with NULL */
 /*@access rpmps @*/
 /*@access rpmDiskSpaceInfo @*/
+/*@access rpmte @*/
+/*@access rpmtsi @*/
 /*@access rpmts @*/
 /*@access fnpyKey @*/
 

diff --git a/lib/transaction.c b/lib/transaction.c
index cef9b74..4398671 100644 (file)
--- a/lib/transaction.c
+++ b/lib/transaction.c
@@ -42,6 +42,7 @@
 
 /*@access rpmfi @*/
 
+/*@access rpmte @*/
 /*@access rpmtsi @*/
 /*@access rpmts @*/
 

diff --git a/rpm.spec.in b/rpm.spec.in
index e52bb36..caf978f 100644 (file)
--- a/rpm.spec.in
+++ b/rpm.spec.in
@@ -17,7 +17,7 @@ Name: rpm
 %define version @VERSION@
 Version: %{version}
 %{expand: %%define rpm_version %{version}}
-Release: 0.22
+Release: 0.24
 Group: System Environment/Base
 Source: ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.0.x/rpm-%{rpm_version}.tar.gz
 Copyright: GPL