From: Sam Ravnborg <sam@ravnborg.org>
To: Roman Zippel <zippel@linux-m68k.org>, linux-kernel@vger.kernel.org
Subject: [2/7] kconfig: lxdialog is now sparse clean
Date: Mon, 21 Nov 2005 23:38:53 +0100 [thread overview]
Message-ID: <20051121223853.GC19157@mars.ravnborg.org> (raw)
In-Reply-To: <20051121223702.GA19157@mars.ravnborg.org>
kconfig: lxdialog is now sparse clean
Replacing a gcc idiom with malloc and deleting an unused global
variable made lxdialog sparse clean.
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
diff --git a/scripts/lxdialog/menubox.c b/scripts/lxdialog/menubox.c
index 260cc4d..ff3a617 100644
--- a/scripts/lxdialog/menubox.c
+++ b/scripts/lxdialog/menubox.c
@@ -65,11 +65,11 @@ static int menu_width, item_x;
*/
static void print_item(WINDOW * win, const char *item, int choice,
int selected, int hotkey)
{
int j;
- char menu_item[menu_width + 1];
+ char *menu_item = malloc(menu_width + 1);
strncpy(menu_item, item, menu_width);
menu_item[menu_width] = 0;
j = first_alpha(menu_item, "YyNnMmHh");
@@ -93,10 +93,11 @@ static void print_item(WINDOW * win, con
}
if (selected) {
wmove(win, choice, item_x + 1);
wrefresh(win);
}
+ free(menu_item);
}
/*
* Print the scroll indicators.
*/
@@ -219,11 +220,11 @@ int dialog_menu(const char *title, const
draw_box(dialog, box_y, box_x, menu_height + 2, menu_width + 2,
menubox_border_attr, menubox_attr);
/*
* Find length of longest item in order to center menu.
- * Set 'choice' to default item.
+ * Set 'choice' to default item.
*/
item_x = 0;
for (i = 0; i < item_no; i++) {
item_x =
MAX(item_x, MIN(menu_width, strlen(items[i * 2 + 1]) + 2));
diff --git a/scripts/lxdialog/util.c b/scripts/lxdialog/util.c
index 1f84809..ce41147 100644
--- a/scripts/lxdialog/util.c
+++ b/scripts/lxdialog/util.c
@@ -24,12 +24,10 @@
/* use colors by default? */
bool use_colors = 1;
const char *backtitle = NULL;
-const char *dialog_result;
-
/*
* Attribute values, default is for mono display
*/
chtype attributes[] = {
A_NORMAL, /* screen_attr */
next prev parent reply other threads:[~2005-11-21 22:38 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-11-21 22:37 [PATCH 0/7] kconfig/menuconfig Sam Ravnborg
2005-11-21 22:38 ` [1/7] kconfig: fixup after Lindent Sam Ravnborg
2005-11-21 22:38 ` Sam Ravnborg [this message]
2005-11-21 23:44 ` [2/7] kconfig: lxdialog is now sparse clean Al Viro
2005-11-21 22:39 ` [3/7] kconfig: Add print_title helper in lxdialog Sam Ravnborg
2005-11-21 22:39 ` [4/7] kconfig: Left aling menu items in menuconfig Sam Ravnborg
2005-11-21 22:40 ` [5/7] kconfig: Fix indention when using menuconfig in text-onle consoles Sam Ravnborg
2005-11-21 22:40 ` [6/7] kconfig: make lxdialog/menubox.c more readable Sam Ravnborg
2005-11-21 22:41 ` [7/7] kconfig: truncate too long menu lines in menuconfig Sam Ravnborg
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20051121223853.GC19157@mars.ravnborg.org \
--to=sam@ravnborg.org \
--cc=linux-kernel@vger.kernel.org \
--cc=zippel@linux-m68k.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®