Commit b93e0ddb authored by Poul-Henning Kamp's avatar Poul-Henning Kamp

Fix an interesting shortcoming in GCC's error checks which Flexelint

correctly spotted: deconsting through strchr().

A couple of other flexelint nits while here




git-svn-id: http://www.varnish-cache.org/svn/trunk/varnish-cache@2796 d4fa192b-c00b-0410-8231-f00ffab90ce4
parent 96d587d4
...@@ -132,7 +132,7 @@ static struct cli_proto cli_proto[] = { ...@@ -132,7 +132,7 @@ static struct cli_proto cli_proto[] = {
{ CLI_PING, cli_func_ping }, { CLI_PING, cli_func_ping },
{ CLI_SERVER_STATUS, mcf_server_status, NULL }, { CLI_SERVER_STATUS, mcf_server_status, NULL },
{ CLI_SERVER_START, mcf_server_startstop, NULL }, { CLI_SERVER_START, mcf_server_startstop, NULL },
{ CLI_SERVER_STOP, mcf_server_startstop, &cli_proto }, { CLI_SERVER_STOP, mcf_server_startstop, cli_proto },
{ CLI_STATS, mcf_stats, NULL }, { CLI_STATS, mcf_stats, NULL },
{ CLI_VCL_LOAD, mcf_config_load, NULL }, { CLI_VCL_LOAD, mcf_config_load, NULL },
{ CLI_VCL_INLINE, mcf_config_inline, NULL }, { CLI_VCL_INLINE, mcf_config_inline, NULL },
...@@ -241,14 +241,12 @@ mgt_cli_vlu(void *priv, const char *p) ...@@ -241,14 +241,12 @@ mgt_cli_vlu(void *priv, const char *p)
CAST_OBJ_NOTNULL(cp, priv, CLI_PORT_MAGIC); CAST_OBJ_NOTNULL(cp, priv, CLI_PORT_MAGIC);
vsb_clear(cp->cli->sb); vsb_clear(cp->cli->sb);
/* Remove trailing whitespace */ /* Skip whitespace */
q = strchr(p, '\0'); for (; isspace(*p); p++)
while (q > p && isspace(q[-1])) continue;
q--;
*q = '\0';
/* Ignore empty lines */ /* Ignore empty lines */
if (*p == 0) if (*p == '\0')
return (0); return (0);
cli_dispatch(cp->cli, cli_proto, p); cli_dispatch(cp->cli, cli_proto, p);
...@@ -449,7 +447,7 @@ telnet_accept(const struct ev *ev, int what) ...@@ -449,7 +447,7 @@ telnet_accept(const struct ev *ev, int what)
asprintf(&p, "telnet %s:%s %s:%s", abuf2, pbuf2, abuf1, pbuf1); asprintf(&p, "telnet %s:%s %s:%s", abuf2, pbuf2, abuf1, pbuf1);
XXXAN(p); XXXAN(p);
telnet_new(i); (void)telnet_new(i);
mgt_cli_setup(i, i, 0, p); mgt_cli_setup(i, i, 0, p);
free(p); free(p);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment