Converging on lclint-3.0.17 strict level.

CVS patchset: 5118
CVS date: 2001/10/17 16:43:36

3 files changed, 31 insertions, 25 deletions

diff --git a/popt/po/popt.pot b/popt/po/popt.pot
index 86265e374..b8743a6d5 100644
--- a/popt/po/popt.pot
+++ b/popt/po/popt.pot
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2001-10-16 10:48-0400\n"
+"POT-Creation-Date: 2001-10-17 12:38-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,99 +18,99 @@ msgstr ""
 msgid "unknown errno"
 msgstr ""
 
-#: popt.c:909
+#: popt.c:911
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:1120
+#: popt.c:1122
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:1122
+#: popt.c:1124
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:1124
+#: popt.c:1126
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1126
+#: popt.c:1128
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1128
+#: popt.c:1130
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:1130
+#: popt.c:1132
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:1132
+#: popt.c:1134
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:1134
+#: popt.c:1136
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:1136
+#: popt.c:1138
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1140
+#: popt.c:1142
 msgid "unknown error"
 msgstr ""
 
-#: popthelp.c:52
+#: popthelp.c:53
 msgid "Show this help message"
 msgstr ""
 
-#: popthelp.c:53
+#: popthelp.c:54
 msgid "Display brief usage message"
 msgstr ""
 
-#: popthelp.c:56
+#: popthelp.c:57
 msgid "Display option defaults in message"
 msgstr ""
 
-#: popthelp.c:98
+#: popthelp.c:99
 msgid "NONE"
 msgstr ""
 
-#: popthelp.c:99
+#: popthelp.c:100
 msgid "VAL"
 msgstr ""
 
-#: popthelp.c:100
+#: popthelp.c:101
 msgid "INT"
 msgstr ""
 
-#: popthelp.c:101
+#: popthelp.c:102
 msgid "LONG"
 msgstr ""
 
-#: popthelp.c:102
+#: popthelp.c:103
 msgid "STRING"
 msgstr ""
 
-#: popthelp.c:103
+#: popthelp.c:104
 msgid "FLOAT"
 msgstr ""
 
-#: popthelp.c:104
+#: popthelp.c:105
 msgid "DOUBLE"
 msgstr ""
 
-#: popthelp.c:105
+#: popthelp.c:106
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:456
+#: popthelp.c:457
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:478
+#: popthelp.c:479
 msgid "[OPTION...]"
 msgstr ""
diff --git a/popt/popt.c b/popt/popt.c
index 728bf8c50..cd01a77d5 100644
--- a/popt/popt.c
+++ b/popt/popt.c
@@ -883,12 +883,14 @@ int poptGetNextOpt(poptContext con)
 		    char *end;
 
 		    if (con->os->nextArg) {
+			/*@-mods@*/
 			int saveerrno = errno;
 			errno = 0;
 			aDouble = strtod(con->os->nextArg, &end);
 			if (errno == ERANGE)
 			    return POPT_ERROR_OVERFLOW;
 			errno = saveerrno;
+			/*@=mods@*/
 			if (*end != '\0')
 			    return POPT_ERROR_BADNUMBER;
 		    }
diff --git a/popt/poptconfig.c b/popt/poptconfig.c
index e553f86de..0c704716a 100644
--- a/popt/poptconfig.c
+++ b/popt/poptconfig.c
@@ -103,7 +103,9 @@ int poptReadConfigFile(poptContext con, const char * fn)
     if (fileLength == -1 || lseek(fd, 0, 0) == -1) {
 	rc = errno;
 	(void) close(fd);
+	/*@-mods@*/
 	errno = rc;
+	/*@=mods@*/
 	return POPT_ERROR_ERRNO;
     }
 
@@ -111,7 +113,9 @@ int poptReadConfigFile(poptContext con, const char * fn)
     if (read(fd, (char *)file, fileLength) != fileLength) {
 	rc = errno;
 	(void) close(fd);
+	/*@-mods@*/
 	errno = rc;
+	/*@=mods@*/
 	return POPT_ERROR_ERRNO;
     }
     if (close(fd) == -1)