Changeset 743414b

Timestamp:

02/10/2012 09:39:11 AM (12 years ago)

Author:

Pierre Labastie <pierre@…>

Branches:

2.4, ablfs, ablfs-more, legacy, new_features, trunk

Children:

b339c94

Parents:

d7390a5

Message:

Changes slightly the code in menu directory so that "conf"
and "mconf" build without issuing warnings

Location:

menu

Files:

• conf.c (modified) (4 diffs)
• lex.zconf.c_shipped (modified) (1 diff)
• lxdialog/dialog.h (modified) (1 diff)
• lxdialog/inputbox.c (modified) (2 diffs)
• lxdialog/textbox.c (modified) (3 diffs)

menu/conf.c

@@ -180 +180 @@
                                 if (menu->sym->help)
                                         help = menu->sym->help;
-                                printf("\n%s\n", menu->sym->help);
+                                printf("\n%s\n", help);
                                 def = NULL;
                                 break;
@@ -196 +196 @@
 {
         struct symbol *sym = menu->sym;
-        int type;
         tristate oldval, newval;
         const char *help;
@@ -204 +203 @@
                 if (sym->name)
                         printf("(%s) ", sym->name);
-                type = sym_get_type(sym);
+                (void)sym_get_type(sym);
                 putchar('[');
                 oldval = sym_get_tristate_value(sym);
@@ -271 +270 @@
         struct symbol *sym, *def_sym;
         struct menu *child;
-        int type;
         bool is_new;
 
         sym = menu->sym;
-        type = sym_get_type(sym);
+        (void)sym_get_type(sym);
         is_new = !sym_has_value(sym);
         if (sym_is_changable(sym)) {

menu/lex.zconf.c_shipped

@@ -3 +3 @@
 
 #define  YY_INT_ALIGNED short int
+
+/* Define this so that no warnings are issued during
+   compilation of jhalfs */
+#define YY_NO_INPUT 1
 
 /* A lexical scanner generated by flex */

menu/lxdialog/dialog.h

@@ -175 +175 @@
                 int width, int list_height, int item_no,
                 struct dialog_list_item ** items, int flag);
-extern unsigned char dialog_input_result[];
+extern char dialog_input_result[];
 int dialog_inputbox (const char *title, const char *prompt, int height,
                 int width, const char *init);

menu/lxdialog/inputbox.c

@@ -22 +22 @@
 #include "dialog.h"
 
-unsigned char dialog_input_result[MAX_LEN + 1];
+char dialog_input_result[MAX_LEN + 1];
 
 /*
@@ -49 +49 @@
     int i, x, y, box_y, box_x, box_width;
     int input_x = 0, scroll = 0, key = 0, button = -1;
-    unsigned char *instr = dialog_input_result;
+    char *instr = dialog_input_result;
     WINDOW *dialog;
 

menu/lxdialog/textbox.c

@@ -40 +40 @@
     int i, x, y, cur_x, cur_y, fpos, key = 0;
     int passed_end;
-    char search_term[MAX_LEN + 1];
     WINDOW *dialog, *text;
-
-    search_term[0] = '\0';      /* no search term entered yet */
 
     /* Open input file for reading */
@@ -460 +457 @@
 print_line (WINDOW * win, int row, int width)
 {
-    int y, x;
     char *line;
 
@@ -469 +465 @@
     waddnstr (win, line, MIN (strlen (line), width - 2));
 
-    getyx (win, y, x);
     /* Clear 'residue' of previous line */
 #if OLD_NCURSES
     {
+        int y, x;
         int i;
+        getyx (win, y, x);
         for (i = 0; i < width - x; i++)
             waddch (win, ' ');