philippelh/bitchx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Reformat and remove some unnecessary tests in parse_line()

Browse Source 
Remove some unnecessary tests for !line: next_expr(&line, ...) can't set line to NULL.

Fixes some whitespace breakage.
This commit is contained in:
Kevin Easton
2016-10-15 11:59:39 +11:00
parent 9a2792345f
commit c6ec1f4098
1 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
source/commands.c
View File

@@ -3298,9 +3298,9 @@ BUILT_IN_COMMAND(flush)
/* e_wall: used for WALLOPS */ /* e_wall: used for WALLOPS */
BUILT_IN_COMMAND(e_wall) BUILT_IN_COMMAND(e_wall)
{ {
if (!args || !*args)
if ((!args || !*args))
return; return;
set_display_target(NULL, LOG_WALLOP); set_display_target(NULL, LOG_WALLOP);
send_to_server("%s :%s", command, args); send_to_server("%s :%s", command, args);
if (get_server_flag(from_server, USER_MODE_W)) if (get_server_flag(from_server, USER_MODE_W))
@@ -4337,8 +4337,6 @@ void BX_parse_line (const char *name, char *org_line, const char *args, int hist
int args_flag = 0, int args_flag = 0,
die = 0; die = 0;
if (handle_local) if (handle_local)
make_local_stack((char *)name); make_local_stack((char *)name);
@@ -4349,16 +4347,16 @@ void BX_parse_line (const char *name, char *org_line, const char *args, int hist
else if (args) do else if (args) do
{ {
while (*line == '{') while (*line == '{')
{ {
if (!(stuff = next_expr(&line, '{'))) if (!(stuff = next_expr(&line, '{')))
{ {
error("Unmatched {"); error("Unmatched {");
destroy_local_stack(); destroy_local_stack();
return; return;
} }
if (((internal_debug & DEBUG_CMDALIAS) || (internal_debug & DEBUG_HOOK)) && alias_debug && !in_debug_yell) if (((internal_debug & DEBUG_CMDALIAS) || (internal_debug & DEBUG_HOOK)) && alias_debug && !in_debug_yell)
debugyell("%3d %s", debug_count++, stuff); debugyell("%3d %s", debug_count++, stuff);
parse_line(name, stuff, args, hist_flag, append_flag, handle_local); parse_line(name, stuff, args, hist_flag, append_flag, handle_local);
if ((will_catch_break_exceptions && break_exception) || if ((will_catch_break_exceptions && break_exception) ||
(will_catch_return_exceptions && return_exception) || (will_catch_return_exceptions && return_exception) ||
@@ -4368,11 +4366,11 @@ void BX_parse_line (const char *name, char *org_line, const char *args, int hist
break; break;
} }
while (line && *line && ((*line == ';') || (my_isspace(*line)))) while (*line == ';' || my_isspace(*line))
*line++ = '\0'; *line++ = '\0';
} }
if (!line || !*line || die) if (!*line || die)
break; break;
stuff = expand_alias(line, args, &args_flag, &line); stuff = expand_alias(line, args, &args_flag, &line);
@@ -4383,14 +4381,14 @@ void BX_parse_line (const char *name, char *org_line, const char *args, int hist
debugyell("%3d %s", debug_count++, stuff); debugyell("%3d %s", debug_count++, stuff);
parse_command(stuff, hist_flag, (char *)args); parse_command(stuff, hist_flag, (char *)args);
new_free(&stuff); new_free(&stuff);
if ((will_catch_break_exceptions && break_exception) || if ((will_catch_break_exceptions && break_exception) ||
(will_catch_return_exceptions && return_exception) || (will_catch_return_exceptions && return_exception) ||
(will_catch_continue_exceptions && continue_exception)) (will_catch_continue_exceptions && continue_exception))
break; break;
} while (line && *line); } while (line && *line);
else else
{ {
if (load_depth != -1) /* CDE should this be != 1 or > 0 */ if (load_depth != -1) /* CDE should this be != 1 or > 0 */
parse_command(line, hist_flag, (char *)args); parse_command(line, hist_flag, (char *)args);