mirror of
https://github.com/sheumann/hush.git
synced 2024-08-22 17:29:34 +00:00
fix remaining survivors of the return(a) cleanup
This commit is contained in:
parent
d9e15f2068
commit
097c324f59
@ -12520,7 +12520,7 @@ cleanup:
|
|||||||
if (io)
|
if (io)
|
||||||
io_channel_close(io);
|
io_channel_close(io);
|
||||||
ext2fs_free_mem(&buf);
|
ext2fs_free_mem(&buf);
|
||||||
return (ret_sb);
|
return ret_sb;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -34,7 +34,7 @@
|
|||||||
/* Forward declaration */
|
/* Forward declaration */
|
||||||
struct interface_defn_t;
|
struct interface_defn_t;
|
||||||
|
|
||||||
typedef int (execfn)(char *command);
|
typedef int execfn(char *command);
|
||||||
|
|
||||||
struct method_t
|
struct method_t
|
||||||
{
|
{
|
||||||
@ -111,17 +111,17 @@ static char *startup_PATH;
|
|||||||
|
|
||||||
#ifdef CONFIG_FEATURE_IFUPDOWN_IP
|
#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 = (a & 0x55) + ((a >> 1) & 0x55);
|
||||||
result = (result & 0x33) + ((result >> 2) & 0x33);
|
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)
|
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 */
|
/* Found a netmask... Check if it is dotted quad */
|
||||||
if (sscanf(dotted_quad, "%u.%u.%u.%u", &a, &b, &c, &d) != 4)
|
if (sscanf(dotted_quad, "%u.%u.%u.%u", &a, &b, &c, &d) != 4)
|
||||||
return -1;
|
return -1;
|
||||||
|
@ -4804,9 +4804,9 @@ exptilde(char *startp, char *p, int flag)
|
|||||||
while ((c = *++p) != '\0') {
|
while ((c = *++p) != '\0') {
|
||||||
switch(c) {
|
switch(c) {
|
||||||
case CTLESC:
|
case CTLESC:
|
||||||
return (startp);
|
return startp;
|
||||||
case CTLQUOTEMARK:
|
case CTLQUOTEMARK:
|
||||||
return (startp);
|
return startp;
|
||||||
case ':':
|
case ':':
|
||||||
if (flag & EXP_VARTILDE)
|
if (flag & EXP_VARTILDE)
|
||||||
goto done;
|
goto done;
|
||||||
|
@ -380,7 +380,7 @@ static int builtin_export(struct child_prog *child)
|
|||||||
setlocale(LC_CTYPE, getenv("LC_CTYPE"));
|
setlocale(LC_CTYPE, getenv("LC_CTYPE"));
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
return (res);
|
return res;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* built-in 'read VAR' handler */
|
/* built-in 'read VAR' handler */
|
||||||
@ -414,7 +414,7 @@ static int builtin_read(struct child_prog *child)
|
|||||||
else
|
else
|
||||||
fgets(string, sizeof(string), stdin);
|
fgets(string, sizeof(string), stdin);
|
||||||
|
|
||||||
return (res);
|
return res;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Built-in '.' handler (read-in and execute commands from file) */
|
/* 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);
|
status = busy_loop(input);
|
||||||
fclose(input);
|
fclose(input);
|
||||||
llist_pop(&close_me_list);
|
llist_pop(&close_me_list);
|
||||||
return (status);
|
return status;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* built-in 'unset VAR' handler */
|
/* built-in 'unset VAR' handler */
|
||||||
|
Loading…
Reference in New Issue
Block a user