097c324f5
Denis Vlasenko
2006-11-27
Subject
fix remaining survivors of the return(a) cleanup
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
e2fsprogs/e2fsck.c+1 -1
| @@ -12520,7 +12520,7 @@ cleanup: | |
| if (io) | |
| io_channel_close(io); | |
| ext2fs_free_mem(&buf); | |
| - | return (ret_sb); |
| + | return ret_sb; |
| } | |
networking/ifupdown.c+5 -5
| @@ -34,7 +34,7 @@ | |
| /* Forward declaration */ | |
| struct interface_defn_t; | |
| - | typedef int (execfn)(char *command); |
| + | typedef int execfn(char *command); |
| struct method_t | |
| { | |
| @@ -111,17 +111,17 @@ static char *startup_PATH; | |
| #ifdef CONFIG_FEATURE_IFUPDOWN_IP | |
| - | static unsigned int count_bits(unsigned int a) |
| + | static unsigned count_bits(unsigned a) |
| { | |
| - | unsigned int result; |
| + | unsigned result; |
| result = (a & 0x55) + ((a >> 1) & 0x55); | |
| result = (result & 0x33) + ((result >> 2) & 0x33); | |
| - | return ((result & 0x0F) + ((result >> 4) & 0x0F)); |
| + | return (result & 0x0F) + ((result >> 4) & 0x0F); |
| } | |
| static int count_netmask_bits(char *dotted_quad) | |
| { | |
| - | unsigned int result, a, b, c, d; |
| + | unsigned result, a, b, c, d; |
| /* Found a netmask... Check if it is dotted quad */ | |
| if (sscanf(dotted_quad, "%u.%u.%u.%u", &a, &b, &c, &d) != 4) | |
| return -1; | |
shell/ash.c+2 -2
| @@ -4804,9 +4804,9 @@ exptilde(char *startp, char *p, int flag) | |
| while ((c = *++p) != '\0') { | |
| switch(c) { | |
| case CTLESC: | |
| - | return (startp); |
| + | return startp; |
| case CTLQUOTEMARK: | |
| - | return (startp); |
| + | return startp; |
| case ':': | |
| if (flag & EXP_VARTILDE) | |
| goto done; | |
shell/lash.c+3 -3
| @@ -380,7 +380,7 @@ static int builtin_export(struct child_prog *child) | |
| setlocale(LC_CTYPE, getenv("LC_CTYPE")); | |
| #endif | |
| - | return (res); |
| + | return res; |
| } | |
| /* built-in 'read VAR' handler */ | |
| @@ -414,7 +414,7 @@ static int builtin_read(struct child_prog *child) | |
| else | |
| fgets(string, sizeof(string), stdin); | |
| - | return (res); |
| + | return res; |
| } | |
| /* Built-in '.' handler (read-in and execute commands from file) */ | |
| @@ -433,7 +433,7 @@ static int builtin_source(struct child_prog *child) | |
| status = busy_loop(input); | |
| fclose(input); | |
| llist_pop(&close_me_list); | |
| - | return (status); |
| + | return status; |
| } | |
| /* built-in 'unset VAR' handler */ | |