Remove __LCLINT__-ifdef'ed blocks.

diff --git a/rpmio/macro.c b/rpmio/macro.c
index cf79c9c..462ee74 100644 (file)
--- a/rpmio/macro.c
+++ b/rpmio/macro.c
@@ -54,12 +54,6 @@ typedef      FILE * FD_t;
 
 #include "debug.h"
 
-#if defined(__LCLINT__)
-/*@-exportheader@*/
-extern const unsigned short int **__ctype_b_loc (void) /*@*/;
-/*@=exportheader@*/
-#endif
-
 /*@access FD_t@*/              /* XXX compared with NULL */
 /*@access MacroContext@*/
 /*@access MacroEntry@*/

diff --git a/rpmio/rpmdav.c b/rpmio/rpmdav.c
index beafa26..93f083a 100644 (file)
--- a/rpmio/rpmdav.c
+++ b/rpmio/rpmdav.c
@@ -5,7 +5,7 @@
 
 #include "system.h"
 
-#if defined(HAVE_PTHREAD_H) && !defined(__LCLINT__)
+#if defined(HAVE_PTHREAD_H)
 #include <pthread.h>
 #endif
 

diff --git a/rpmio/rpmio.c b/rpmio/rpmio.c
index e2bfec7..92306b9 100644 (file)
--- a/rpmio/rpmio.c
+++ b/rpmio/rpmio.c
@@ -26,7 +26,7 @@
 #endif
 
 /* XXX HP-UX w/o -D_XOPEN_SOURCE needs */
-#if !defined(HAVE_HERRNO) && (defined(__hpux) || defined(__LCLINT__))
+#if !defined(HAVE_HERRNO) && (defined(__hpux))
 /*@unchecked@*/
 extern int h_errno;
 #endif

diff --git a/rpmio/rpmio.h b/rpmio/rpmio.h
index 1913ffc..5036678 100644 (file)
--- a/rpmio/rpmio.h
+++ b/rpmio/rpmio.h
@@ -31,7 +31,7 @@ typedef /*@abstract@*/ struct pgpDigParams_s * pgpDigParams;
  * typedefs to isolate the lossage.
  */
 /*@{*/
-#if !defined(__LCLINT__) && defined(__GLIBC__) && \
+#if defined(__GLIBC__) && \
        (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 2))
 #define USE_COOKIE_SEEK_POINTER 1
 typedef _IO_off64_t    _libio_off_t;

diff --git a/rpmio/rpmio_internal.h b/rpmio/rpmio_internal.h
index 2ac020c..cc67329 100644 (file)
--- a/rpmio/rpmio_internal.h
+++ b/rpmio/rpmio_internal.h
@@ -207,13 +207,8 @@ extern int _dav_debug;
     if ((_rpmio_debug | ((_f) ? ((FD_t)(_f))->flags : 0)) & (_m)) fprintf _x \
     /*@=modfilesys@*/
 
-#if defined(__LCLINT__XXX)
-#define DBGIO(_f, _x)
-#define DBGREFS(_f, _x)
-#else
 #define DBGIO(_f, _x)   DBG((_f), RPMIO_DEBUG_IO, _x)
 #define DBGREFS(_f, _x) DBG((_f), RPMIO_DEBUG_REFS, _x)
-#endif
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/rpmio/rpmmalloc.c b/rpmio/rpmmalloc.c
index f401c45..362463c 100644 (file)
--- a/rpmio/rpmmalloc.c
+++ b/rpmio/rpmmalloc.c
@@ -19,7 +19,7 @@
 }
 /*@=modfilesys@*/
 
-#if !(HAVE_MCHECK_H && defined(__GNUC__)) && !defined(__LCLINT__)
+#if !(HAVE_MCHECK_H && defined(__GNUC__))
 
 /*@out@*/ /*@only@*/ void * xmalloc (size_t size)
 {

diff --git a/rpmio/rpmrpc.c b/rpmio/rpmrpc.c
index 0d2bcf3..a13ab3b 100644 (file)
--- a/rpmio/rpmrpc.c
+++ b/rpmio/rpmrpc.c
@@ -4,7 +4,7 @@
 
 #include "system.h"
 
-#if defined(HAVE_PTHREAD_H) && !defined(__LCLINT__)
+#if defined(HAVE_PTHREAD_H)
 #include <pthread.h>
 #endif
 

diff --git a/rpmio/rpmsq.c b/rpmio/rpmsq.c
index 76245aa..736e2c9 100644 (file)
--- a/rpmio/rpmsq.c
+++ b/rpmio/rpmsq.c
@@ -4,119 +4,6 @@
 
 #include "system.h"
 
-#if defined(__LCLINT__)
-#define        _BITS_SIGTHREAD_H       /* XXX avoid __sigset_t heartburn. */
-
-/*@-incondefs -protoparammatch@*/
-/*@-exportheader@*/
-/*@constant int SA_SIGINFO@*/
-extern int sighold(int sig)
-       /*@globals errno, systemState @*/;
-extern int sigignore(int sig)
-       /*@globals errno, systemState @*/;
-extern int sigpause(int sig)
-       /*@globals errno, systemState @*/;
-extern int sigrelse(int sig)
-       /*@globals errno, systemState @*/;
-extern void (*sigset(int sig, void (*disp)(int)))(int)
-       /*@globals errno, systemState @*/;
-
-struct qelem;
-extern void insque(struct qelem * __elem, struct qelem * __prev)
-       /*@modifies  __elem, __prev @*/;
-extern void remque(struct qelem * __elem)
-       /*@modifies  __elem @*/;
-
-extern pthread_t pthread_self(void)
-       /*@*/;
-extern int pthread_equal(pthread_t t1, pthread_t t2)
-       /*@*/;
-
-extern int pthread_create(/*@out@*/ pthread_t *restrict thread,
-               const pthread_attr_t *restrict attr,
-               void *(*start_routine)(void*), void *restrict arg)
-       /*@modifies *thread @*/;
-extern int pthread_join(pthread_t thread, /*@out@*/ void **value_ptr)
-       /*@modifies *value_ptr @*/;
-
-extern int pthread_setcancelstate(int state, /*@out@*/ int *oldstate)
-       /*@globals internalState @*/
-       /*@modifies *oldstate, internalState @*/;
-extern int pthread_setcanceltype(int type, /*@out@*/ int *oldtype)
-       /*@globals internalState @*/
-       /*@modifies *oldtype, internalState @*/;
-extern void pthread_testcancel(void)
-       /*@globals internalState @*/
-       /*@modifies internalState @*/;
-extern void pthread_cleanup_pop(int execute)
-       /*@globals internalState @*/
-       /*@modifies internalState @*/;
-extern void pthread_cleanup_push(void (*routine)(void*), void *arg)
-       /*@globals internalState @*/
-       /*@modifies internalState @*/;
-extern void _pthread_cleanup_pop(/*@out@*/ struct _pthread_cleanup_buffer *__buffer, int execute)
-       /*@globals internalState @*/
-       /*@modifies internalState @*/;
-extern void _pthread_cleanup_push(/*@out@*/ struct _pthread_cleanup_buffer *__buffer, void (*routine)(void*), /*@out@*/ void *arg)
-       /*@globals internalState @*/
-       /*@modifies internalState @*/;
-
-extern int pthread_mutexattr_destroy(pthread_mutexattr_t *attr)
-       /*@globals errno, internalState @*/
-       /*@modifies *attr, errno, internalState @*/;
-extern int pthread_mutexattr_init(/*@out@*/ pthread_mutexattr_t *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)
-       /*@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)
-       /*@globals errno, internalState @*/
-       /*@modifies *mutex, errno, internalState @*/;
-
-extern int pthread_mutex_lock(pthread_mutex_t *mutex)
-       /*@globals errno @*/
-       /*@modifies *mutex, errno @*/;
-extern int pthread_mutex_trylock(pthread_mutex_t *mutex)
-       /*@globals errno @*/
-       /*@modifies *mutex, errno @*/;
-extern int pthread_mutex_unlock(pthread_mutex_t *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)
-       /*@globals errno, internalState @*/
-       /*@modifies *cond, errno, internalState @*/;
-
-extern int pthread_cond_timedwait(pthread_cond_t *restrict cond,
-               pthread_mutex_t *restrict mutex,
-               const struct timespec *restrict abstime)
-       /*@modifies *cond, *mutex @*/;
-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)
-       /*@globals errno, internalState @*/
-       /*@modifies *cond, errno, internalState @*/;
-extern int pthread_cond_signal(pthread_cond_t *cond)
-       /*@globals errno, internalState @*/
-       /*@modifies *cond, errno, internalState @*/;
-
-/*@=exportheader@*/
-/*@=incondefs =protoparammatch@*/
-#endif
-
 #include <signal.h>
 #include <sys/signal.h>
 #include <sys/wait.h>
@@ -370,11 +257,7 @@ int rpmsqEnable(int signum, /*@null@*/ rpmsqAction_t handler)
 
                (void) sigemptyset (&sa.sa_mask);
                sa.sa_flags = SA_SIGINFO;
-#if defined(__LCLINT__)        /* XXX glibc has union to track handler prototype. */
-               sa.sa_handler = (void*)(handler != NULL ? handler : tbl->handler);
-#else
                sa.sa_sigaction = (void*)(handler != NULL ? handler : tbl->handler);
-#endif
                if (sigaction(tbl->signum, &sa, &tbl->oact) < 0) {
                    SUB_REF(tbl);
                    break;

diff --git a/rpmio/rpmsw.c b/rpmio/rpmsw.c
index e98d360..52e3f63 100644 (file)
--- a/rpmio/rpmsw.c
+++ b/rpmio/rpmsw.c
@@ -6,15 +6,6 @@
 #include <rpmsw.h>
 #include "debug.h"
 
-#if defined(__LCLINT__)
-/*@-exportheader@*/
-extern int nanosleep(const struct timespec *__requested_time,
-               /*@out@*/ /*@null@*/ struct timespec *__remaining)
-       /*@globals errno @*/
-       /*@modifies *__remaining, errno @*/;
-/*@=exportheader@*/
-#endif
-
 /*@unchecked@*/
 static rpmtime_t rpmsw_overhead = 0;