Merge changes from rpm-4.2.1 development.

CVS patchset: 6959
CVS date: 2003/11/23 19:50:52

4 files changed, 25 insertions, 13 deletions

diff --git a/rpmio/.splintrc b/rpmio/.splintrc
index 256d7c06b..e5af61899 100644
--- a/rpmio/.splintrc
+++ b/rpmio/.splintrc
@@ -3,7 +3,6 @@
 +partial
 +forcehints
 
-#-warnunixlib
 -warnposix
 
 +unixlib
diff --git a/rpmio/Makefile.am b/rpmio/Makefile.am
index 4ac62cdef..b1ddd5bec 100644
--- a/rpmio/Makefile.am
+++ b/rpmio/Makefile.am
@@ -31,7 +31,7 @@ librpmio_la_SOURCES = \
 	argv.c digest.c fts.c macro.c \
 	rpmio.c rpmlog.c rpmmalloc.c \
 	rpmpgp.c rpmrpc.c rpmsq.c rpmsw.c strcasecmp.c stubs.c url.c ugid.c
-librpmio_la_LDFLAGS = -release @VERSION@ $(LDFLAGS) \
+librpmio_la_LDFLAGS = -release 4.3 $(LDFLAGS) \
 	@WITH_BEECRYPT_LIB@ \
 	$(top_builddir)/file/src/libfmagic.la \
 	@WITH_ZLIB_LIB@ \
diff --git a/rpmio/rpmio_internal.h b/rpmio/rpmio_internal.h
index f6530619b..faf858d22 100644
--- a/rpmio/rpmio_internal.h
+++ b/rpmio/rpmio_internal.h
@@ -98,7 +98,8 @@ struct pgpDig_s {
 typedef struct _FDSTACK_s {
 /*@exposed@*/
     FDIO_t		io;
-/*@dependent@*/ void *	fp;
+/*@dependent@*/
+    void *		fp;
     int			fdno;
 } FDSTACK_t;
 
diff --git a/rpmio/rpmsq.c b/rpmio/rpmsq.c
index ecff7ee6e..8d05caa4d 100644
--- a/rpmio/rpmsq.c
+++ b/rpmio/rpmsq.c
@@ -7,6 +7,7 @@
 #if defined(__LCLINT__)
 #define	_BITS_SIGTHREAD_H	/* XXX avoid __sigset_t heartburn. */
 
+/*@-incondefs -protoparammatch@*/
 /*@-exportheader@*/
 /*@constant int SA_SIGINFO@*/
 extern int sighold(int sig)
@@ -61,34 +62,42 @@ extern void _pthread_cleanup_push(/*@out@*/ struct _pthread_cleanup_buffer *__bu
 	/*@modifies internalState @*/;
 
 extern int pthread_mutexattr_destroy(pthread_mutexattr_t *attr)
-	/*@modifies *attr @*/;
+	/*@globals errno, internalState @*/
+	/*@modifies *attr, errno, internalState @*/;
 extern int pthread_mutexattr_init(/*@out@*/ pthread_mutexattr_t *attr)
-	/*@modifies *attr @*/;
+	/*@globals errno, internalState @*/
+	/*@modifies *attr, errno, internalState @*/;
 
 int pthread_mutexattr_gettype(const pthread_mutexattr_t *restrict attr,
 		/*@out@*/ int *restrict type)
 	/*@modifies *type @*/;
 int pthread_mutexattr_settype(pthread_mutexattr_t *attr, int type)
-	/*@modifies *attr @*/;
+	/*@globals errno, internalState @*/
+	/*@modifies *attr, errno, internalState @*/;
 
 extern int pthread_mutex_destroy(pthread_mutex_t *mutex)
 	/*@modifies *mutex @*/;
 extern int pthread_mutex_init(/*@out@*/ pthread_mutex_t *restrict mutex,
 		/*@null@*/ const pthread_mutexattr_t *restrict attr)
-	/*@modifies *mutex @*/;
+	/*@globals errno, internalState @*/
+	/*@modifies *mutex, errno, internalState @*/;
 
 extern int pthread_mutex_lock(pthread_mutex_t *mutex)
-	/*@modifies *mutex @*/;
+	/*@globals errno @*/
+	/*@modifies *mutex, errno @*/;
 extern int pthread_mutex_trylock(pthread_mutex_t *mutex)
-	/*@modifies *mutex @*/;
+	/*@globals errno @*/
+	/*@modifies *mutex, errno @*/;
 extern int pthread_mutex_unlock(pthread_mutex_t *mutex)
-	/*@modifies *mutex @*/;
+	/*@globals errno @*/
+	/*@modifies *mutex, errno @*/;
 
 extern int pthread_cond_destroy(pthread_cond_t *cond)
 	/*@modifies *cond @*/;
 extern int pthread_cond_init(/*@out@*/ pthread_cond_t *restrict cond,
 		const pthread_condattr_t *restrict attr)
-	/*@modifies *cond @*/;
+	/*@globals errno, internalState @*/
+	/*@modifies *cond, errno, internalState @*/;
 
 extern int pthread_cond_timedwait(pthread_cond_t *restrict cond,
 		pthread_mutex_t *restrict mutex,
@@ -98,11 +107,14 @@ extern int pthread_cond_wait(pthread_cond_t *restrict cond,
 		pthread_mutex_t *restrict mutex)
 	/*@modifies *cond, *mutex @*/;
 extern int pthread_cond_broadcast(pthread_cond_t *cond)
-	/*@modifies *cond @*/;
+	/*@globals errno, internalState @*/
+	/*@modifies *cond, errno, internalState @*/;
 extern int pthread_cond_signal(pthread_cond_t *cond)
-	/*@modifies *cond @*/;
+	/*@globals errno, internalState @*/
+	/*@modifies *cond, errno, internalState @*/;
 
 /*@=exportheader@*/
+/*@=incondefs =protoparammatch@*/
 #endif
 
 #include <signal.h>