* Compiler warning fix for building setup without newt

diff --git a/citadel/ChangeLog b/citadel/ChangeLog
index a412411dc631c89080d389a5164e9696c830bac6..24e0d7bdd82dd05fa8820477263a45e4c6fc89af 100644 (file)
--- a/citadel/ChangeLog
+++ b/citadel/ChangeLog
@@ -1,4 +1,7 @@
  $Log$
+ Revision 607.8  2003/06/26 01:50:14  ajc
+ * Compiler warning fix for building setup without newt
+
  Revision 607.7  2003/06/25 15:40:57  ajc
  * setup now uses "newt" instead of "curses" to draw its pretty screens.
    Changes were made to setup.c as well as all the autoconf stuff.
@@ -4789,4 +4792,3 @@ Sat Jul 11 00:20:48 EDT 1998 Nathan Bryant <bryant@cs.usm.maine.edu>
 
 Fri Jul 10 1998 Art Cancro <ajc@uncensored.citadel.org>
        * Initial CVS import
-

diff --git a/citadel/setup.c b/citadel/setup.c
index c2c789fb7349d4da349753ea89c3fd8a14374439..93068896b32d7bce9fe6dc527fccf69b1f770fb4 100644 (file)
--- a/citadel/setup.c
+++ b/citadel/setup.c
@@ -223,10 +223,9 @@ int yesno(char *question)
        newtComponent form = NULL;
        newtComponent yesbutton = NULL;
        newtComponent nobutton = NULL;
+       int i = 0;
 #endif
-
        int answer = 0;
-       int i = 0;
        char buf[SIZ];
 
        switch (setup_type) {
@@ -276,9 +275,9 @@ void important_message(char *title, char *msgtext)
 {
 #ifdef HAVE_NEWT
        newtComponent form = NULL;
+       int i = 0;
 #endif
        char buf[SIZ];
-       int i = 0;
 
        switch (setup_type) {
 
@@ -476,11 +475,11 @@ void set_str_val(int msgpos, char str[])
 #ifdef HAVE_NEWT
        newtComponent form;
        char *result;
+       int i;
 #endif
        char buf[SIZ];
        char tempfile[PATH_MAX];
        char setupmsg[SIZ];
-       int i;
 
        strcpy(tempfile, tmpnam(NULL));
        strcpy(setupmsg, "");