kconfig: nconf: change set_config_filename() to void function
PATCH 1/3 kconfig: nconf: change set_config_filename() to void function
No one uses the return value of this function.
---
scripts/kconfig/nconf.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
scripts/kconfig/nconf.c +1 -2
@@ -631,13 +631,12 @@ static int item_is_tag(char tag)static char filename[PATH_MAX +1 ];static char menu_backtitle[PATH_MAX +128 ]; -static const char *set_config_filename (const char *config_filename) +static void set_config_filename (const char *config_filename) {snprintf (menu_backtitle,sizeof (menu_backtitle),"%s - %s" , config_filename, rootmenu.prompt->text);snprintf (filename,sizeof (filename),"%s" , config_filename); -return menu_backtitle; }/* return = 0 means we are successful.
Signature · 1 line
2.27.0
PATCH 2/3 kconfig: nconf: remove meaningless wattrset() call from show_menu()
This attribute is not used because it will be overridden some lines below:
wattrset(main_window, attr_main_menu_box);
---
scripts/kconfig/nconf.c | 1 - 1 file changed, 1 deletion(-)
scripts/kconfig/nconf.c +0 -1
@@ -953,7 +953,6 @@ static void show_menu(const char *prompt, const char *instructions, current_instructions = instructions;clear (); -wattrset (main_window, attr_normal);print_in_middle (stdscr,1 ,0 ,getmaxx (stdscr), menu_backtitle, attr_main_heading);
Signature · 1 line
2.27.0
PATCH 3/3 kconfig: nconf: refactor in print_in_middle()
In reply to Masahiro YamadaThis helper is the same as the sample code in the NCURSES HOWTO [1], but it is over-engineering to be used for nconf.
I do not see any good reason to use the 'float' type just for the division by 2.
All the call-sites pass a non-NULL pointer to the first argument, so 'if (win == NULL) win = stdscr;' is dead code.
'if (startx != 0) x = startx;' is dead code because 'x' will be overridden some lines below, by 'x = startx + (int)temp;'.
All the call-sites pass a non-zero value to the second argument, so 'if (starty != 0)' is always true.
getyx(win, y, x) is also dead-code because both 'y' and 'x' are overridden.
All the call-sites pass 0 to the third parameter, so 'startx' can be removed.
All the call-sites pass a non-zero value to the fourth parameter, so 'if (width == 0) width = 80;' is dead code.
Change the type of the last parameter from 'chtype' to 'int' to be aligned with the prototype, 'int wattrset(WINDOW *win, int attrs);'
I also slightly cleaned up the indentation style.
[1]: https://tldp.org/HOWTO/NCURSES-Programming-HOWTO/color.html
---
scripts/kconfig/nconf.c | 2 +- scripts/kconfig/nconf.gui.c | 31 ++++--------------------------- scripts/kconfig/nconf.h | 7 +------ 3 files changed, 6 insertions(+), 34 deletions(-)
scripts/kconfig/nconf.c +1 -1
@@ -953,7 +953,7 @@ static void show_menu(const char *prompt, const char *instructions, current_instructions = instructions;clear (); -print_in_middle (stdscr,1 ,0 ,getmaxx (stdscr), +print_in_middle (stdscr,1 ,getmaxx (stdscr), menu_backtitle, attr_main_heading);
scripts/kconfig/nconf.gui.c +4 -27
@@ -117,32 +117,10 @@ void set_colors(void) }/* this changes the windows attributes !!! */ -void print_in_middle (WINDOW *win, -int starty, -int startx, -int width, -const char *string, -chtype color) -{int length, x, y; -float temp; - - -if (win ==NULL ) - win = stdscr; -getyx (win, y, x); -if (startx !=0 ) - x = startx; -if (starty !=0 ) - y = starty; -if (width ==0 ) - width =80 ; - - length =strlen (string); - temp = (width - length) /2 ; - x = startx + (int )temp; -wattrset (win, color); -mvwprintw (win, y, x,"%s" , string); -refresh (); +void print_in_middle (WINDOW *win,int y,int width,const char *str,int attrs) +{ +wattrset (win, attrs); +mvwprintw (win, y, (width -strlen (str)) /2 ,"%s" , str); }int get_line_no (const char *text)
@@ -577,7 +555,6 @@ void show_scroll_win(WINDOW *main_window, text_cols, 0);print_in_middle (win, text_lines+2 , -0 , text_cols,"<OK>" , attr_dialog_menu_fore);
scripts/kconfig/nconf.h +1 -6
@@ -68,12 +68,7 @@ typedef enum {void set_colors (void );/* this changes the windows attributes !!! */ -void print_in_middle (WINDOW *win, -int starty, -int startx, -int width, -const char *string, -chtype color); +void print_in_middle (WINDOW *win,int y,int width,const char *str,int attrs);int get_line_length (const char *line);int get_line_no (const char *text);const char *get_line (const char *text,int line_no);
Signature · 1 line
2.27.0