- rpm database has rpm.rpm g+w permissions to share db3 mutexes.

- expose more db3 macro configuration tokens.
- move fprint.[ch] and hash.[ch] to rpmdb directory.
- detect and fiddle incompatible mixtures of db3 env/open flags.
- add DBI_WRITECURSOR to map to db3 flags with CDB database model.
- add rpmdbSetIteratorRewrite to warn of pending lazy (re-)writes.

CVS patchset: 4765
CVS date: 2001/05/11 04:01:04

2 files changed, 4 insertions, 3 deletions

diff --git a/rpmio/rpmerr.h b/rpmio/rpmerr.h
index acbb311c4..a19934edb 100644
--- a/rpmio/rpmerr.h
+++ b/rpmio/rpmerr.h
@@ -102,7 +102,8 @@ typedef enum rpmerrCode_e {
     RPMERR_SIGVFY	= _nm(202), /*!< */
 
     RPMWARN_UNLINK	= _wm(512u+16),  /*!< unlink(2) failed */
-    RPMWARN_RMDIR	= _wm(512u+17)   /*!< rmdir(2) failed */
+    RPMWARN_RMDIR	= _wm(512u+17),  /*!< rmdir(2) failed */
+    RPMWARN_FLOCK	= _wm(512u+27)   /*!< locking the database failed */
 } rpmerrCode;
 
 /**
diff --git a/rpmio/rpmmacro.h b/rpmio/rpmmacro.h
index 252aea08c..c14dfa75d 100644
--- a/rpmio/rpmmacro.h
+++ b/rpmio/rpmmacro.h
@@ -157,7 +157,7 @@ char *	rpmExpand	(/*@null@*/ const char * arg, ...)
  * @param path		macro(s) to expand (NULL terminates list)
  * @return		canonicalized path (malloc'ed)
  */
-const char *rpmGetPath	(/*@null@*/ const char * path, ...)
+const char * rpmGetPath	(/*@null@*/ const char * path, ...)
 	/*@*/;
 
 /**
@@ -170,7 +170,7 @@ const char *rpmGetPath	(/*@null@*/ const char * path, ...)
  * @param file		file URL (often a file, or NULL)
  * @return		expanded, merged, canonicalized path (malloc'ed)
  */
-const char *rpmGenPath	(/*@null@*/ const char * root,
+const char * rpmGenPath	(/*@null@*/ const char * root,
 			/*@null@*/ const char * mdir,
 			/*@null@*/ const char * file)
 	/*@*/;