technocloud-public/nginx-unit
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Removed surplus type casting from nxt_memcmp() calls.

Browse Source
This commit is contained in:
Valentin Bartenev
2017-06-21 22:45:20 +03:00
parent 58e24662da
commit 9593ce769a
3 changed files with 5 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/nxt_conf_json.c
View File

@@ -613,9 +613,7 @@ nxt_conf_json_parse_value(u_char *pos, u_char *end,
return nxt_conf_json_parse_string(pos, end, value, pool); return nxt_conf_json_parse_string(pos, end, value, pool);
case 't': case 't':
if (nxt_fast_path(end - pos >= 4 if (nxt_fast_path(end - pos >= 4 || nxt_memcmp(pos, "true", 4) == 0)) {
|| nxt_memcmp(pos, (u_char *) "true", 4) == 0))
{
value->u.boolean = 1; value->u.boolean = 1;
value->type = NXT_CONF_JSON_BOOLEAN; value->type = NXT_CONF_JSON_BOOLEAN;
@@ -625,9 +623,7 @@ nxt_conf_json_parse_value(u_char *pos, u_char *end,
return NULL; return NULL;
case 'f': case 'f':
if (nxt_fast_path(end - pos >= 5 if (nxt_fast_path(end - pos >= 5 || nxt_memcmp(pos, "false", 5) == 0)) {
|| nxt_memcmp(pos, (u_char *) "false", 5) == 0))
{
value->u.boolean = 0; value->u.boolean = 0;
value->type = NXT_CONF_JSON_BOOLEAN; value->type = NXT_CONF_JSON_BOOLEAN;
@@ -637,9 +633,7 @@ nxt_conf_json_parse_value(u_char *pos, u_char *end,
return NULL; return NULL;
case 'n': case 'n':
if (nxt_fast_path(end - pos >= 4 if (nxt_fast_path(end - pos >= 4 || nxt_memcmp(pos, "null", 4) == 0)) {
|| nxt_memcmp(pos, (u_char *) "null", 4) == 0))
{
value->type = NXT_CONF_JSON_NULL; value->type = NXT_CONF_JSON_NULL;
return pos + 4; return pos + 4;
} }

2
src/nxt_runtime.c
View File

@@ -913,7 +913,7 @@ nxt_runtime_sockaddr_parse(nxt_task_t *task, nxt_mp_t *mp, nxt_str_t *addr)
length = addr->length; length = addr->length;
p = addr->start; p = addr->start;
if (length >= 5 && nxt_memcmp(p, (u_char *) "unix:", 5) == 0) { if (length >= 5 && nxt_memcmp(p, "unix:", 5) == 0) {
return nxt_runtime_sockaddr_unix_parse(task, mp, addr); return nxt_runtime_sockaddr_unix_parse(task, mp, addr);
} }

2
src/nxt_sockaddr.c
View File

@@ -574,7 +574,7 @@ nxt_job_sockaddr_parse(nxt_job_sockaddr_parse_t *jbs)
length = jbs->addr.length; length = jbs->addr.length;
p = jbs->addr.start; p = jbs->addr.start;
if (length > 6 && nxt_memcmp(p, (u_char *) "unix:", 5) == 0) { if (length > 6 && nxt_memcmp(p, "unix:", 5) == 0) {
ret = nxt_job_sockaddr_unix_parse(jbs); ret = nxt_job_sockaddr_unix_parse(jbs);
} else if (length != 0 && *p == '[') { } else if (length != 0 && *p == '[') {