Backed out changeset 4355f55afeb2 (Bug 1158489)

5 files changed, 23 insertions, 28 deletions

diff --git a/cmd/modutil/error.h b/cmd/modutil/error.h
index ba42264b5..36ed5a4eb 100644
--- a/cmd/modutil/error.h
+++ b/cmd/modutil/error.h
@@ -133,7 +133,25 @@ typedef enum {
 	LAST_MSG  /* must be last */
 } Message;
 
-/* defined in modutil.c */
-extern char *msgStrings[];
+static char *msgStrings[] = {
+	"FIPS mode enabled.\n",
+	"FIPS mode disabled.\n",
+	"Using database directory %s...\n",
+	"Creating \"%s\"...",
+	"Module \"%s\" added to database.\n",
+	"Module \"%s\" deleted from database.\n",
+	"Token \"%s\" password changed successfully.\n",
+	"Incorrect password, try again...\n",
+	"Passwords do not match, try again...\n",
+	"done.\n",
+	"Slot \"%s\" %s.\n",
+	"Successfully changed defaults.\n",
+	"Successfully changed defaults.\n",
+"\nWARNING: Performing this operation while the browser is running could cause"
+"\ncorruption of your security databases. If the browser is currently running,"
+"\nyou should exit browser before continuing this operation. Type "
+"\n'q <enter>' to abort, or <enter> to continue: ",
+	"\nAborting...\n"
+};
 
 #endif /* MODUTIL_ERROR_H */
diff --git a/cmd/modutil/installparse.c b/cmd/modutil/installparse.c
index 3691c6388..e23bbcc98 100644
--- a/cmd/modutil/installparse.c
+++ b/cmd/modutil/installparse.c
@@ -203,7 +203,7 @@ yyparse()
     register char *yys;
     extern char *getenv();
 
-    if ((yys = getenv("YYDEBUG")) != NULL)
+    if (yys = getenv("YYDEBUG"))
     {
         yyn = *yys;
         if (yyn >= '0' && yyn <= '9')
@@ -220,7 +220,7 @@ yyparse()
     *yyssp = yystate = 0;
 
 yyloop:
-    if ((yyn = yydefred[yystate]) != 0) goto yyreduce;
+    if (yyn = yydefred[yystate]) goto yyreduce;
     if (yychar < 0)
     {
         if ((yychar = yylex()) < 0) yychar = 0;
diff --git a/cmd/modutil/lex.Pk11Install_yy.c b/cmd/modutil/lex.Pk11Install_yy.c
index 4533e0c76..59d9bb597 100644
--- a/cmd/modutil/lex.Pk11Install_yy.c
+++ b/cmd/modutil/lex.Pk11Install_yy.c
@@ -1100,7 +1100,6 @@ register char *yy_bp;
 #endif	/* ifndef YY_NO_UNPUT */
 
 
-#ifndef YY_NO_INPUT
 #ifdef __cplusplus
 static int yyinput()
 #else
@@ -1172,7 +1171,6 @@ static int input()
 
 	return c;
 	}
-#endif	/* ifndef YY_NO_INPUT */
 
 
 #ifdef YY_USE_PROTOS
diff --git a/cmd/modutil/manifest.mn b/cmd/modutil/manifest.mn
index a92ca68c1..9929a8059 100644
--- a/cmd/modutil/manifest.mn
+++ b/cmd/modutil/manifest.mn
@@ -24,7 +24,7 @@ PROGRAM =  modutil
 
 REQUIRES = seccmd nss dbm
 
-DEFINES = -DNSPR20 -DYY_NO_UNPUT -DYY_NO_INPUT
+DEFINES = -DNSPR20
 
 # sigh
 #INCLUDES += -I$(CORE_DEPTH)/nss/lib/pk11wrap
diff --git a/cmd/modutil/modutil.c b/cmd/modutil/modutil.c
index 64212024f..ba07bba4f 100644
--- a/cmd/modutil/modutil.c
+++ b/cmd/modutil/modutil.c
@@ -122,27 +122,6 @@ static char *optionStrings[] = {
 	"-chkfips",
 };
 
-char *msgStrings[] = {
-	"FIPS mode enabled.\n",
-	"FIPS mode disabled.\n",
-	"Using database directory %s...\n",
-	"Creating \"%s\"...",
-	"Module \"%s\" added to database.\n",
-	"Module \"%s\" deleted from database.\n",
-	"Token \"%s\" password changed successfully.\n",
-	"Incorrect password, try again...\n",
-	"Passwords do not match, try again...\n",
-	"done.\n",
-	"Slot \"%s\" %s.\n",
-	"Successfully changed defaults.\n",
-	"Successfully changed defaults.\n",
-"\nWARNING: Performing this operation while the browser is running could cause"
-"\ncorruption of your security databases. If the browser is currently running,"
-"\nyou should exit browser before continuing this operation. Type "
-"\n'q <enter>' to abort, or <enter> to continue: ",
-	"\nAborting...\n"
-};
-
 /* Increment i if doing so would have i still be less than j.  If you
    are able to do this, return 0.  Otherwise return 1. */
 #define TRY_INC(i,j)  ( ((i+1)<j) ? (++i, 0) : 1 )