- update for sv.po.

CVS patchset: 5545
CVS date: 2002/07/11 21:47:51

7 files changed, 35 insertions, 38 deletions

diff --git a/lib/fsm.c b/lib/fsm.c
index a1f890783..032f61bcb 100644
--- a/lib/fsm.c
+++ b/lib/fsm.c
@@ -12,7 +12,6 @@
 
 #include "cpio.h"
 #include "fsm.h"
-#include "psm.h"	/* XXX fiTypeString */
 #include "rpmerr.h"
 
 #define	_RPMFI_INTERNAL
@@ -216,7 +215,8 @@ static int mapFind(/*@null@*/ FSMI_t iter, const char * fsmPath)
  */
 typedef struct dnli_s {
     rpmfi fi;
-/*@only@*/ /*@null@*/ char * active;
+/*@only@*/ /*@null@*/
+    char * active;
     int reverse;
     int isave;
     int i;
@@ -1822,13 +1822,13 @@ if (!(fsm->mapFlags & CPIO_ALL_HARDLINKS)) break;
 			rpmError(
 			    (strict_erasures ? RPMERR_RMDIR : RPMDEBUG_RMDIR),
 			    _("%s rmdir of %s failed: Directory not empty\n"), 
-				fiTypeString(fi), fsm->path);
+				rpmfiTypeString(fi), fsm->path);
 			/*@innerbreak@*/ break;
 		    default:
 			rpmError(
 			    (strict_erasures ? RPMERR_RMDIR : RPMDEBUG_RMDIR),
 				_("%s rmdir of %s failed: %s\n"),
-				fiTypeString(fi), fsm->path, strerror(errno));
+				rpmfiTypeString(fi), fsm->path, strerror(errno));
 			/*@innerbreak@*/ break;
 		    }
 		} else {
@@ -1838,7 +1838,7 @@ if (!(fsm->mapFlags & CPIO_ALL_HARDLINKS)) break;
 			rpmError(
 			    (strict_erasures ? RPMERR_UNLINK : RPMDEBUG_UNLINK),
 				_("%s unlink of %s failed: %s\n"),
-				fiTypeString(fi), fsm->path, strerror(errno));
+				rpmfiTypeString(fi), fsm->path, strerror(errno));
 		}
 	    }
 	    /* XXX Failure to remove is not (yet) cause for failure. */
diff --git a/lib/psm.c b/lib/psm.c
index 79bd853a0..ee8504f76 100644
--- a/lib/psm.c
+++ b/lib/psm.c
@@ -16,9 +16,6 @@
 #include <rpmmacro.h>
 #include <rpmurl.h>
 
-#include "rpmal.h"
-
-#define	_RPMDS_INTERNAL		/* XXX trigger->i */
 #include "rpmds.h"
 
 #define _RPMFI_INTERNAL
@@ -47,8 +44,6 @@
 /*@access rpmfi @*/
 /*@access rpmte @*/	/* XXX rpmInstallSourcePackage */
 
-/*@access alKey @*/
-
 int rpmVersionCompare(Header first, Header second)
 {
     const char * one, * two;
@@ -87,16 +82,6 @@ int rpmVersionCompare(Header first, Header second)
     return rpmvercmp(one, two);
 }
 
-/*@observer@*/ const char *const fiTypeString(rpmfi fi)
-{
-    switch(rpmteType(fi->te)) {
-    case TR_ADDED:	return " install";
-    case TR_REMOVED:	return "   erase";
-    default:		return "???";
-    }
-    /*@noteached@*/
-}
-
 /**
  * Macros to be defined from per-header tag values.
  * @todo Should other macros be added from header when installing a package?
diff --git a/lib/psm.h b/lib/psm.h
index 02addd8ef..1b5befe0a 100644
--- a/lib/psm.h
+++ b/lib/psm.h
@@ -97,14 +97,6 @@ extern "C" {
 #endif
 
 /**
- * Return formatted string representation of package disposition.
- * @param fi
- * @return		formatted string
- */
-/*@observer@*/ const char *const fiTypeString(/*@partial@*/rpmfi fi)
-	/*@*/;
-
-/**
  * Package state machine driver.
  * @param psm		package state machine data
  * @param stage		next stage
diff --git a/lib/query.c b/lib/query.c
index 7309ca8a7..ae4d5842f 100644
--- a/lib/query.c
+++ b/lib/query.c
@@ -11,7 +11,6 @@
 /*@=incondefs@*/
 #endif
 
-#include "rpmio_internal.h"
 #include <rpmcli.h>
 #include <rpmbuild.h>
 
@@ -344,6 +343,8 @@ exit:
 }
 
 /**
+ * Print copy of spec file, filling in Group/Description/Summary from specspo.
+ * @param spec		spec file control structure
  */
 static void
 printNewSpecfile(Spec spec)
@@ -527,7 +528,7 @@ int	(*parseSpecVec) (Spec *specp, const char *specFile, const char *rootdir,
 /*@null@*/ Spec	(*freeSpecVec) (Spec spec) = NULL;
 /*@=redecl@*/
 
-/*@-bounds@*/ /* LCL: segfault */
+/*@-bounds@*/ /* LCL: segfault (realpath annotation?) */
 int rpmQueryVerify(QVA_t qva, rpmts ts, const char * arg)
 {
     const char ** av = NULL;
diff --git a/lib/rpmfi.c b/lib/rpmfi.c
index 14847db57..a890f9aa4 100644
--- a/lib/rpmfi.c
+++ b/lib/rpmfi.c
@@ -439,6 +439,17 @@ fileTypes whatis(uint_16 mode)
     return REG;
 }
 
+/*@observer@*/
+const char *const rpmfiTypeString(rpmfi fi)
+{
+    switch(rpmteType(fi->te)) {
+    case TR_ADDED:	return " install";
+    case TR_REMOVED:	return "   erase";
+    default:		return "???";
+    }
+    /*@noteached@*/
+}
+
 #define alloca_strdup(_s)	strcpy(alloca(strlen(_s)+1), (_s))
 
 /**
diff --git a/lib/rpmfi.h b/lib/rpmfi.h
index a9103fd1a..4237d4794 100644
--- a/lib/rpmfi.h
+++ b/lib/rpmfi.h
@@ -37,7 +37,7 @@ struct rpmfi_s {
 
     rpmTag tagN;		/*!< Header tag. */
 /*@refcounted@*/ /*@null@*/
-    Header h;			/*!< Header for file set (or NULL) */
+    Header h;			/*!< Header for file info set (or NULL) */
 
 /*@only@*/ /*?null?*/
     const char ** bnl;		/*!< Base name(s) (from header) */
@@ -407,7 +407,7 @@ rpmfi rpmfiInitD(/*@null@*/ rpmfi fi, int dx)
 
 /**
  * Destroy a file info set.
- * @param fi		file set
+ * @param fi		file info set
  * @param freefimem	free fi memory too?
  * @return		NULL always
  */
@@ -418,11 +418,11 @@ rpmfi rpmfiFree(/*@killref@*/ /*@only@*/ /*@null@*/ rpmfi fi, int freefimem)
 /**
  * Create and load a file info set.
  * @param ts		transaction set
- * @param fi		file set (NULL if creating)
+ * @param fi		file info set (NULL if creating)
  * @param h		header
  * @param tagN		RPMTAG_BASENAMES
  * @param scareMem	Use pointers to refcounted header memory?
- * @return		new file set
+ * @return		new file info set
  */
 /*@null@*/
 rpmfi rpmfiNew(/*@null@*/ rpmts ts, /*@null@*/ rpmfi fi,
@@ -437,6 +437,17 @@ rpmfi rpmfiNew(/*@null@*/ rpmts ts, /*@null@*/ rpmfi fi,
 fileTypes whatis(uint_16 mode)
 	/*@*/;
 
+/**
+ * Return formatted string representation of package disposition.
+ * @param fi		file info set
+ * @return		formatted string
+ */
+/*@-redef@*/
+/*@observer@*/
+const char *const rpmfiTypeString(rpmfi fi)
+	/*@*/;
+/*@=redef@*/
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/lib/verify.c b/lib/verify.c
index d532434da..9beb10d28 100644
--- a/lib/verify.c
+++ b/lib/verify.c
@@ -5,16 +5,13 @@
 
 #include "system.h"
 
-#include <rpmio_internal.h>	/* XXX PGPHASHALGO and RPMDIGEST_NONE */
-#include <rpmlib.h>
+#include <rpmcli.h>
 #include "rpmps.h"
 
 #include "psm.h"
 #include "rpmfi.h"
 #include "rpmts.h"
 
-#include <rpmcli.h>
-
 #include "legacy.h"	/* XXX domd5(), uidToUname(), gnameToGid */
 #include "ugid.h"
 #include "misc.h"	/* XXX for uidToUname() and gnameToGid() */