diff options
| author | vda <vda@69ca8d6d-28ef-0310-b511-8ec308f3f277> | 2006-11-27 16:59:15 +0000 |
|---|---|---|
| committer | vda <vda@69ca8d6d-28ef-0310-b511-8ec308f3f277> | 2006-11-27 16:59:15 +0000 |
| commit | 8aeacdeb7985d23b2d692fca7f2b77c16fa0a6ec (patch) | |
| tree | 4817bcd854907cb2cd905780e54ea24faf1c80c5 | |
| parent | db172fe425634b7d784ae1d5af6d88b96b4e747e (diff) | |
| download | busybox-w32-8aeacdeb7985d23b2d692fca7f2b77c16fa0a6ec.tar.gz busybox-w32-8aeacdeb7985d23b2d692fca7f2b77c16fa0a6ec.tar.bz2 busybox-w32-8aeacdeb7985d23b2d692fca7f2b77c16fa0a6ec.zip | |
fix remaining survivors of the return(a) cleanup
git-svn-id: svn://busybox.net/trunk/busybox@16692 69ca8d6d-28ef-0310-b511-8ec308f3f277
| -rw-r--r-- | e2fsprogs/e2fsck.c | 2 | ||||
| -rw-r--r-- | networking/ifupdown.c | 10 | ||||
| -rw-r--r-- | shell/ash.c | 4 | ||||
| -rw-r--r-- | shell/lash.c | 6 |
4 files changed, 11 insertions, 11 deletions
diff --git a/e2fsprogs/e2fsck.c b/e2fsprogs/e2fsck.c index efaec7d8f..408b2758d 100644 --- a/e2fsprogs/e2fsck.c +++ b/e2fsprogs/e2fsck.c | |||
| @@ -12520,7 +12520,7 @@ cleanup: | |||
| 12520 | if (io) | 12520 | if (io) |
| 12521 | io_channel_close(io); | 12521 | io_channel_close(io); |
| 12522 | ext2fs_free_mem(&buf); | 12522 | ext2fs_free_mem(&buf); |
| 12523 | return (ret_sb); | 12523 | return ret_sb; |
| 12524 | } | 12524 | } |
| 12525 | 12525 | ||
| 12526 | 12526 | ||
diff --git a/networking/ifupdown.c b/networking/ifupdown.c index 5d140f1da..76ff2a830 100644 --- a/networking/ifupdown.c +++ b/networking/ifupdown.c | |||
| @@ -34,7 +34,7 @@ | |||
| 34 | /* Forward declaration */ | 34 | /* Forward declaration */ |
| 35 | struct interface_defn_t; | 35 | struct interface_defn_t; |
| 36 | 36 | ||
| 37 | typedef int (execfn)(char *command); | 37 | typedef int execfn(char *command); |
| 38 | 38 | ||
| 39 | struct method_t | 39 | struct method_t |
| 40 | { | 40 | { |
| @@ -111,17 +111,17 @@ static char *startup_PATH; | |||
| 111 | 111 | ||
| 112 | #ifdef CONFIG_FEATURE_IFUPDOWN_IP | 112 | #ifdef CONFIG_FEATURE_IFUPDOWN_IP |
| 113 | 113 | ||
| 114 | static unsigned int count_bits(unsigned int a) | 114 | static unsigned count_bits(unsigned a) |
| 115 | { | 115 | { |
| 116 | unsigned int result; | 116 | unsigned result; |
| 117 | result = (a & 0x55) + ((a >> 1) & 0x55); | 117 | result = (a & 0x55) + ((a >> 1) & 0x55); |
| 118 | result = (result & 0x33) + ((result >> 2) & 0x33); | 118 | result = (result & 0x33) + ((result >> 2) & 0x33); |
| 119 | return ((result & 0x0F) + ((result >> 4) & 0x0F)); | 119 | return (result & 0x0F) + ((result >> 4) & 0x0F); |
| 120 | } | 120 | } |
| 121 | 121 | ||
| 122 | static int count_netmask_bits(char *dotted_quad) | 122 | static int count_netmask_bits(char *dotted_quad) |
| 123 | { | 123 | { |
| 124 | unsigned int result, a, b, c, d; | 124 | unsigned result, a, b, c, d; |
| 125 | /* Found a netmask... Check if it is dotted quad */ | 125 | /* Found a netmask... Check if it is dotted quad */ |
| 126 | if (sscanf(dotted_quad, "%u.%u.%u.%u", &a, &b, &c, &d) != 4) | 126 | if (sscanf(dotted_quad, "%u.%u.%u.%u", &a, &b, &c, &d) != 4) |
| 127 | return -1; | 127 | return -1; |
diff --git a/shell/ash.c b/shell/ash.c index 0704353f5..3a9998fc0 100644 --- a/shell/ash.c +++ b/shell/ash.c | |||
| @@ -4804,9 +4804,9 @@ exptilde(char *startp, char *p, int flag) | |||
| 4804 | while ((c = *++p) != '\0') { | 4804 | while ((c = *++p) != '\0') { |
| 4805 | switch(c) { | 4805 | switch(c) { |
| 4806 | case CTLESC: | 4806 | case CTLESC: |
| 4807 | return (startp); | 4807 | return startp; |
| 4808 | case CTLQUOTEMARK: | 4808 | case CTLQUOTEMARK: |
| 4809 | return (startp); | 4809 | return startp; |
| 4810 | case ':': | 4810 | case ':': |
| 4811 | if (flag & EXP_VARTILDE) | 4811 | if (flag & EXP_VARTILDE) |
| 4812 | goto done; | 4812 | goto done; |
diff --git a/shell/lash.c b/shell/lash.c index 472cbddb9..3b51e98a9 100644 --- a/shell/lash.c +++ b/shell/lash.c | |||
| @@ -380,7 +380,7 @@ static int builtin_export(struct child_prog *child) | |||
| 380 | setlocale(LC_CTYPE, getenv("LC_CTYPE")); | 380 | setlocale(LC_CTYPE, getenv("LC_CTYPE")); |
| 381 | #endif | 381 | #endif |
| 382 | 382 | ||
| 383 | return (res); | 383 | return res; |
| 384 | } | 384 | } |
| 385 | 385 | ||
| 386 | /* built-in 'read VAR' handler */ | 386 | /* built-in 'read VAR' handler */ |
| @@ -414,7 +414,7 @@ static int builtin_read(struct child_prog *child) | |||
| 414 | else | 414 | else |
| 415 | fgets(string, sizeof(string), stdin); | 415 | fgets(string, sizeof(string), stdin); |
| 416 | 416 | ||
| 417 | return (res); | 417 | return res; |
| 418 | } | 418 | } |
| 419 | 419 | ||
| 420 | /* Built-in '.' handler (read-in and execute commands from file) */ | 420 | /* Built-in '.' handler (read-in and execute commands from file) */ |
| @@ -433,7 +433,7 @@ static int builtin_source(struct child_prog *child) | |||
| 433 | status = busy_loop(input); | 433 | status = busy_loop(input); |
| 434 | fclose(input); | 434 | fclose(input); |
| 435 | llist_pop(&close_me_list); | 435 | llist_pop(&close_me_list); |
| 436 | return (status); | 436 | return status; |
| 437 | } | 437 | } |
| 438 | 438 | ||
| 439 | /* built-in 'unset VAR' handler */ | 439 | /* built-in 'unset VAR' handler */ |
