From 47b8b814681c26307b0599558634cadf96bcb5da Mon Sep 17 00:00:00 2001
From: jbj <devnull@localhost>
Date: Tue, 5 Nov 2002 23:08:19 +0000
Subject: [PATCH] splint fiddles.

CVS patchset: 5828
CVS date: 2002/11/05 23:08:19
---
 lib/poptALL.c  | 6 +-----
 lib/psm.c      | 2 +-
 rpmdb/legacy.c | 2 ++
 zlib/zconf.h   | 4 ++--
 4 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/lib/poptALL.c b/lib/poptALL.c
index 1c598b9cc..4e50da084 100644
--- a/lib/poptALL.c
+++ b/lib/poptALL.c
@@ -332,12 +332,8 @@ rpmcliInit(int argc, char *const argv[], struct poptOption * optionsTable)
     }
 /*@=globs =mods@*/
 
-#if defined(ENABLE_NLS)
+#if defined(ENABLE_NLS) && !defined(__LCLINT__)
     (void) setlocale(LC_ALL, "" );
-
-#ifdef	__LCLINT__
-#define LOCALEDIR	"/usr/share/locale"
-#endif
     (void) bindtextdomain(PACKAGE, LOCALEDIR);
     (void) textdomain(PACKAGE);
 #endif
diff --git a/lib/psm.c b/lib/psm.c
index 0134b95ec..f6c645d6e 100644
--- a/lib/psm.c
+++ b/lib/psm.c
@@ -858,7 +858,7 @@ static int psmWaitUnregister(rpmpsm psm, pid_t child)
     /*@-infloops@*/
     while (psm->reaped != psm->child) {
 	(void) sigprocmask(SIG_SETMASK, &oldMask, NULL);
-	sleep(1);	/* XXX sleep guarantees loop traversal. */
+	(void) sleep(1);	/* XXX sleep guarantees loop traversal. */
 	(void) sigprocmask(SIG_BLOCK, &newMask, &oldMask);
     }
     /*@=infloops@*/
diff --git a/rpmdb/legacy.c b/rpmdb/legacy.c
index 11f5340ee..ebf0c4472 100644
--- a/rpmdb/legacy.c
+++ b/rpmdb/legacy.c
@@ -79,11 +79,13 @@ static int open_dso(const char * path, /*@null@*/ pid_t * pidp, /*@null@*/ size_
 
     (void) elf_version(EV_CURRENT);
 
+/*@-evalorder@*/
     if ((elf = elf_begin (fdno, ELF_C_READ, NULL)) == NULL
      || elf_kind(elf) != ELF_K_ELF
      || gelf_getehdr(elf, &ehdr) == NULL
      || !(ehdr.e_type == ET_DYN || ehdr.e_type == ET_EXEC))
 	goto exit;
+/*@=evalorder@*/
 
     bingo = 0;
     /*@-branchstate -uniondef @*/
diff --git a/zlib/zconf.h b/zlib/zconf.h
index dc1910269..40b82068a 100644
--- a/zlib/zconf.h
+++ b/zlib/zconf.h
@@ -4,7 +4,7 @@
  * For conditions of distribution and use, see copyright notice in zlib.h 
  */
 
-/* @(#) $Id: zconf.h,v 1.6 2002/03/17 15:46:23 jbj Exp $ */
+/* @(#) $Id: zconf.h,v 1.7 2002/04/07 19:52:43 jbj Exp $ */
 
 #ifndef _ZCONF_H
 #define _ZCONF_H
@@ -132,7 +132,7 @@
                         /* Type declarations */
 
 #ifndef OF /* function prototypes */
-#  ifdef STDC
+#  if defined(STDC) || defined(__LCLINT__)
 #    define OF(args)  args
 #  else
 #    define OF(args)  ()
-- 
2.34.1