aboutsummaryrefslogtreecommitdiff
path: root/libbb
diff options
context:
space:
mode:
authorDenis Vlasenko <vda.linux@googlemail.com>2008-05-18 22:28:26 +0000
committerDenis Vlasenko <vda.linux@googlemail.com>2008-05-18 22:28:26 +0000
commit5599502a550a7f892d4b73dceb2105a6916f83e6 (patch)
tree572ffa27892b1b24db86930044077dbb1565840f /libbb
parente125a683a77d14401644d15f38b7f578db723924 (diff)
downloadbusybox-w32-5599502a550a7f892d4b73dceb2105a6916f83e6.tar.gz
busybox-w32-5599502a550a7f892d4b73dceb2105a6916f83e6.tar.bz2
busybox-w32-5599502a550a7f892d4b73dceb2105a6916f83e6.zip
more -Wall warning fixes. -Wall is enabled now.
Diffstat (limited to 'libbb')
-rw-r--r--libbb/appletlib.c4
-rw-r--r--libbb/lineedit.c4
-rw-r--r--libbb/xfuncs.c2
3 files changed, 5 insertions, 5 deletions
diff --git a/libbb/appletlib.c b/libbb/appletlib.c
index 3d5aef873..464280b17 100644
--- a/libbb/appletlib.c
+++ b/libbb/appletlib.c
@@ -73,7 +73,7 @@ static const char *unpack_usage_messages(void)
73 73
74 i = start_bunzip(&bd, 74 i = start_bunzip(&bd,
75 /* src_fd: */ -1, 75 /* src_fd: */ -1,
76 /* inbuf: */ packed_usage, 76 /* inbuf: */ (void *)packed_usage,
77 /* len: */ sizeof(packed_usage)); 77 /* len: */ sizeof(packed_usage));
78 /* read_bunzip can longjmp to start_bunzip, and ultimately 78 /* read_bunzip can longjmp to start_bunzip, and ultimately
79 * end up here with i != 0 on read data errors! Not trivial */ 79 * end up here with i != 0 on read data errors! Not trivial */
@@ -628,7 +628,7 @@ static int busybox_main(char **argv)
628 if (!argv[1]) { 628 if (!argv[1]) {
629 /* Called without arguments */ 629 /* Called without arguments */
630 const char *a; 630 const char *a;
631 int col, output_width; 631 unsigned col, output_width;
632 help: 632 help:
633 output_width = 80; 633 output_width = 80;
634 if (ENABLE_FEATURE_AUTOWIDTH) { 634 if (ENABLE_FEATURE_AUTOWIDTH) {
diff --git a/libbb/lineedit.c b/libbb/lineedit.c
index 9c802a35f..c91efd40c 100644
--- a/libbb/lineedit.c
+++ b/libbb/lineedit.c
@@ -1318,7 +1318,7 @@ static void cmdedit_setwidth(unsigned w, int redraw_flg)
1318 1318
1319static void win_changed(int nsig) 1319static void win_changed(int nsig)
1320{ 1320{
1321 int width; 1321 unsigned width;
1322 get_terminal_width_height(0, &width, NULL); 1322 get_terminal_width_height(0, &width, NULL);
1323 cmdedit_setwidth(width, nsig /* - just a yes/no flag */); 1323 cmdedit_setwidth(width, nsig /* - just a yes/no flag */);
1324 if (nsig == SIGWINCH) 1324 if (nsig == SIGWINCH)
@@ -1353,7 +1353,7 @@ int read_line_input(const char *prompt, char *command, int maxsize, line_input_t
1353#if ENABLE_FEATURE_TAB_COMPLETION 1353#if ENABLE_FEATURE_TAB_COMPLETION
1354 smallint lastWasTab = FALSE; 1354 smallint lastWasTab = FALSE;
1355#endif 1355#endif
1356 unsigned int ic; 1356 unsigned ic;
1357 unsigned char c; 1357 unsigned char c;
1358 smallint break_out = 0; 1358 smallint break_out = 0;
1359#if ENABLE_FEATURE_EDITING_VI 1359#if ENABLE_FEATURE_EDITING_VI
diff --git a/libbb/xfuncs.c b/libbb/xfuncs.c
index 915b74dd1..fe3c647d0 100644
--- a/libbb/xfuncs.c
+++ b/libbb/xfuncs.c
@@ -262,7 +262,7 @@ off_t fdlength(int fd)
262 262
263/* It is perfectly ok to pass in a NULL for either width or for 263/* It is perfectly ok to pass in a NULL for either width or for
264 * height, in which case that value will not be set. */ 264 * height, in which case that value will not be set. */
265int get_terminal_width_height(int fd, int *width, int *height) 265int get_terminal_width_height(int fd, unsigned *width, unsigned *height)
266{ 266{
267 struct winsize win = { 0, 0, 0, 0 }; 267 struct winsize win = { 0, 0, 0, 0 };
268 int ret = ioctl(fd, TIOCGWINSZ, &win); 268 int ret = ioctl(fd, TIOCGWINSZ, &win);