Remove splint tags.

6 files changed, 12 insertions, 25 deletions

diff --git a/tools/convertdb1.c b/tools/convertdb1.c
index ed2148299..41bbbdc52 100644
--- a/tools/convertdb1.c
+++ b/tools/convertdb1.c
@@ -67,7 +67,7 @@ static FD_t fadOpen(const char * path)
 	Fclose(fd);
 	return NULL;
     }
-    /*@-refcounttrans@*/ return fd /*@=refcounttrans@*/ ;
+    return fd ;
 }
 
 static int fadNextOffset(FD_t fd, unsigned int lastOffset)
diff --git a/tools/rpmcache.c b/tools/rpmcache.c
index c95422bd2..6409933e9 100644
--- a/tools/rpmcache.c
+++ b/tools/rpmcache.c
@@ -80,7 +80,7 @@ static void freeItems(void) {
     nitems = 0;
 }
 
-static int ftsCachePrint(/*@unused@*/ rpmts ts, FILE * fp)
+static int ftsCachePrint(rpmts ts, FILE * fp)
 {
     int rc = 0;
     int i;
@@ -163,8 +163,7 @@ static int ftsCacheUpdate(rpmts ts)
 
 /**
  */
-static int archOkay(/*@null@*/ const char * pkgArch)
-        /*@*/
+static int archOkay(const char * pkgArch)
 {
     if (pkgArch == NULL) return 0;
     return (rpmMachineScore(RPM_MACHTABLE_INSTARCH, pkgArch) ? 1 : 0);
@@ -172,8 +171,7 @@ static int archOkay(/*@null@*/ const char * pkgArch)
 
 /**
  */
-static int osOkay(/*@null@*/ const char * pkgOs)
-        /*@*/
+static int osOkay(const char * pkgOs)
 {
     if (pkgOs == NULL) return 0;
     return (rpmMachineScore(RPM_MACHTABLE_INSTOS, pkgOs) ? 1 : 0);
@@ -439,7 +437,7 @@ static int ftsPrint(FTS * ftsp, FTSENT * fts, rpmts ts)
  * @param ts		transaction set
  * @param argv		package names to match
  */
-static void initGlobs(/*@unused@*/ rpmts ts, const char ** argv)
+static void initGlobs(rpmts ts, const char ** argv)
 {
     char buf[BUFSIZ];
     int i;
diff --git a/tools/rpmdeps.c b/tools/rpmdeps.c
index 5ecf1f172..dc22391a7 100644
--- a/tools/rpmdeps.c
+++ b/tools/rpmdeps.c
@@ -8,13 +8,10 @@ const char *__progname;
 
 #include "debug.h"
 
-/*@unchecked@*/
 char *progname;
 
-/*@unchecked@*/
 static int print_provides;
 
-/*@unchecked@*/
 static int print_requires;
 
 static void rpmdsPrint(const char * msg, rpmds ds, FILE * fp)
@@ -56,12 +53,10 @@ main(int argc, char *const argv[])
     int xx;
 char buf[BUFSIZ];
 
-/*@-modobserver@*/
     if ((progname = strrchr(argv[0], '/')) != NULL)
 	progname++;
     else
 	progname = argv[0];
-/*@=modobserver@*/
 
     optCon = rpmcliInit(argc, argv, optionsTable);
     if (optCon == NULL)
diff --git a/tools/rpmgraph.c b/tools/rpmgraph.c
index b00c06956..f03f89362 100644
--- a/tools/rpmgraph.c
+++ b/tools/rpmgraph.c
@@ -19,8 +19,7 @@ static int noDeps = 1;
 
 static rpmVSFlags vsflags = 0;
 
-static inline /*@observer@*/ const char * identifyDepend(int_32 f)
-	/*@*/
+static inline const char * identifyDepend(int_32 f)
 {
     if (isLegacyPreReq(f))
 	return "PreReq:";
@@ -42,7 +41,6 @@ static inline /*@observer@*/ const char * identifyDepend(int_32 f)
 
 static int
 rpmGraph(rpmts ts, struct rpmInstallArguments_s * ia, const char ** fileArgv)
-	/*@*/
 {
     rpmps ps;
     const char ** pkgURL = NULL;
@@ -140,13 +138,13 @@ restart:
 	default:
 	    rpmMessage(RPMMESS_ERROR, _("%s cannot be installed\n"), *fnp);
 	    numFailed++; *fnp = NULL;
-	    /*@switchbreak@*/ break;
+	    break;
 	case RPMRC_OK:
 	    rc = rpmtsAddInstallElement(ts, h, (fnpyKey)fileName, 0, NULL);
-	    /*@switchbreak@*/ break;
+	    break;
 	case RPMRC_NOTFOUND:
 	    goto maybe_manifest;
-	    /*@notreached@*/ /*@switchbreak@*/ break;
+	    break;
 	}
 	h = headerFree(h); 
 	continue;
@@ -197,7 +195,6 @@ maybe_manifest:
 	    rpmpsPrint(NULL, ps);
 	    numFailed += numPkgs;
 
-            /*@-branchstate@*/
 	    if (ts->suggests != NULL && ts->nsuggests > 0) {
 		rpmMessage(RPMMESS_NORMAL, _("    Suggested resolutions:\n"));
 		for (i = 0; i < ts->nsuggests; i++) {
@@ -212,7 +209,6 @@ maybe_manifest:
 		}
 		ts->suggests = _free(ts->suggests);
 	    }
-	    /*@=branchstate@*/
 	}
 	ps = rpmpsFree(ps);
     }
diff --git a/tools/rpminject.c b/tools/rpminject.c
index 252731894..2ed1e254c 100644
--- a/tools/rpminject.c
+++ b/tools/rpminject.c
@@ -38,7 +38,6 @@ static const char * pr_injmode(injmode_t injmode)
     case INJ_UNKNOWN:	return("unknown");
     default:		return("???");
     }
-    /*@notreached@*/
 }
 
 enum cvtaction {CA_OLD, CA_NEW, CA_OMIT, CA_ERR};
@@ -524,7 +523,7 @@ main(int argc, char *argv[])
 	    break;
 	default:
 	    errx(EXIT_FAILURE, _("unknown popt return (%d)"), arg);
-	    /*@notreached@*/ break;
+	    break;
 	}
 
 	if (injmode != lastmode) {
diff --git a/tools/rpmsort.c b/tools/rpmsort.c
index 9824e18fc..10256751a 100644
--- a/tools/rpmsort.c
+++ b/tools/rpmsort.c
@@ -23,8 +23,7 @@ static const char * avdbpath =
 #endif
 static int noDeps = 0;
 
-static inline /*@observer@*/ const char * identifyDepend(int_32 f)
-	/*@*/
+static inline const char * identifyDepend(int_32 f)
 {
     if (isLegacyPreReq(f))
 	return "PreReq:";
@@ -308,7 +307,7 @@ main(int argc, const char *argv[])
 	default:
 	    fprintf(stderr, _("unknown popt return (%d)"), arg);
 	    exit(EXIT_FAILURE);
-	    /*@notreached@*/ break;
+	    break;
 	}
     }