Skip to content

Commit

Permalink
erlang: fix compile warnings
Browse files Browse the repository at this point in the history 
Avoid compile warnings on 64bit.
  • Loading branch information
@seudin
seudin committed May 25, 2015
1 parent 01f4a23 commit 15b0626
Show file tree
Hide file tree
Showing 4 changed files with 36 additions and 16 deletions.
13 changes: 9 additions & 4 deletions modules/erlang/pv_atom.c
View file
Expand Up @@ -42,6 +42,7 @@ int pv_atom_parse_name(pv_spec_t *sp, str *in)
str idx;
str name;
str attr;
int l;

if (in->s == NULL || in->len <= 0)
return -1;
Expand All @@ -54,7 +55,8 @@ int pv_atom_parse_name(pv_spec_t *sp, str *in)
if (*p == '[' || *p== '=')
break;
if (!is_pv_xbuff_valid_char(*p)) {
LM_ERR("invalid character in var name %.*s at %d\n",STR_FMT(in),p-in->s);
l = p-in->s;
LM_ERR("invalid character in var name %.*s at %d\n",STR_FMT(in),l);
goto error;
}
p++;
Expand Down Expand Up @@ -92,15 +94,17 @@ int pv_atom_parse_name(pv_spec_t *sp, str *in)
p++;

if (!is_in_str(p,in) || *p!='>') {
LM_ERR("invalid operator (expected =>) for accessing attribute in token %.*s at position %d\n",STR_FMT(in),p-in->s);
l = p-in->s;
LM_ERR("invalid operator (expected =>) for accessing attribute in token %.*s at position %d\n",STR_FMT(in),l);
goto error;
}

attr.s = ++p;

while (is_in_str(p,in)) {
if (!is_pv_xbuff_valid_char(*p)) {
LM_ERR("invalid character in attribute name in token %.*s at %d\n",STR_FMT(in),p-in->s);
l = p-in->s;
LM_ERR("invalid character in attribute name in token %.*s at %d\n",STR_FMT(in),l);
goto error;
}
p++;
Expand All @@ -125,7 +129,8 @@ int pv_atom_parse_name(pv_spec_t *sp, str *in)
}

if (p < in->s + in->len) {
LM_ERR("unexpected token in %.*s at %d\n",STR_FMT(in),p-in->s);
l = p-in->s;
LM_ERR("unexpected token in %.*s at %d\n",STR_FMT(in),l);
goto error;
}

Expand Down
13 changes: 9 additions & 4 deletions modules/erlang/pv_pid.c
View file
Expand Up @@ -45,6 +45,7 @@ int pv_pid_parse_name(pv_spec_t *sp, str *in)
str idx;
str name;
str attr;
int l;

if (in->s == NULL || in->len <= 0)
return -1;
Expand All @@ -57,7 +58,8 @@ int pv_pid_parse_name(pv_spec_t *sp, str *in)
if (*p == '[' || *p== '=')
break;
if (!is_pv_xbuff_valid_char(*p)) {
LM_ERR("invalid character in var name %.*s at %d\n",STR_FMT(in),p-in->s);
l = p-in->s;
LM_ERR("invalid character in var name %.*s at %d\n",STR_FMT(in),l);
goto error;
}
p++;
Expand Down Expand Up @@ -95,15 +97,17 @@ int pv_pid_parse_name(pv_spec_t *sp, str *in)
p++;

if (!is_in_str(p,in) || *p!='>') {
LM_ERR("invalid operator (expected =>) for accessing attribute in token %.*s at position %d\n",STR_FMT(in),p-in->s);
l = p-in->s;
LM_ERR("invalid operator (expected =>) for accessing attribute in token %.*s at position %d\n",STR_FMT(in),l);
goto error;
}

attr.s = ++p;

while (is_in_str(p,in)) {
if (!is_pv_xbuff_valid_char(*p)) {
LM_ERR("invalid character in attribute name in token %.*s at %d\n",STR_FMT(in),p-in->s);
l = p-in->s;
LM_ERR("invalid character in attribute name in token %.*s at %d\n",STR_FMT(in),l);
goto error;
}
p++;
Expand All @@ -128,7 +132,8 @@ int pv_pid_parse_name(pv_spec_t *sp, str *in)
}

if (p < in->s + in->len) {
LM_ERR("unexpected token in %.*s at %d\n",STR_FMT(in),p-in->s);
l = p-in->s;
LM_ERR("unexpected token in %.*s at %d\n",STR_FMT(in),l);
goto error;
}

Expand Down
13 changes: 9 additions & 4 deletions modules/erlang/pv_ref.c
View file
Expand Up @@ -45,6 +45,7 @@ int pv_ref_parse_name(pv_spec_t *sp, str *in)
str idx;
str name;
str attr;
int l;

if (in->s == NULL || in->len <= 0)
return -1;
Expand All @@ -57,7 +58,8 @@ int pv_ref_parse_name(pv_spec_t *sp, str *in)
if (*p == '[' || *p== '=')
break;
if (!is_pv_xbuff_valid_char(*p)) {
LM_ERR("invalid character in var name %.*s at %d\n",STR_FMT(in),p-in->s);
l = p-in->s;
LM_ERR("invalid character in var name %.*s at %d\n",STR_FMT(in),l);
goto error;
}
p++;
Expand Down Expand Up @@ -95,15 +97,17 @@ int pv_ref_parse_name(pv_spec_t *sp, str *in)
p++;

if (!is_in_str(p,in) || *p!='>') {
LM_ERR("invalid operator (expected =>) for accessing attribute in token %.*s at position %d\n",STR_FMT(in),p-in->s);
l = p-in->s;
LM_ERR("invalid operator (expected =>) for accessing attribute in token %.*s at position %d\n",STR_FMT(in),l);
goto error;
}

attr.s = ++p;

while (is_in_str(p,in)) {
if (!is_pv_xbuff_valid_char(*p)) {
LM_ERR("invalid character in attribute name in token %.*s at %d\n",STR_FMT(in),p-in->s);
l = p-in->s;
LM_ERR("invalid character in attribute name in token %.*s at %d\n",STR_FMT(in),l);
goto error;
}
p++;
Expand All @@ -128,7 +132,8 @@ int pv_ref_parse_name(pv_spec_t *sp, str *in)
}

if (p < in->s + in->len) {
LM_ERR("unexpected token in %.*s at %d\n",STR_FMT(in),p-in->s);
l = p-in->s;
LM_ERR("unexpected token in %.*s at %d\n",STR_FMT(in),l);
goto error;
}

Expand Down
13 changes: 9 additions & 4 deletions modules/erlang/pv_xbuff.c
View file
Expand Up @@ -189,6 +189,7 @@ int pv_xbuff_parse_name(pv_spec_t *sp, str *in)
str idx;
str name;
str attr;
int l;

if (in->s == NULL || in->len <= 0)
return -1;
Expand All @@ -201,7 +202,8 @@ int pv_xbuff_parse_name(pv_spec_t *sp, str *in)
if (*p == '[' || *p== '=')
break;
if (!is_pv_xbuff_valid_char(*p)) {
LM_ERR("invalid character in var name %.*s at %d\n",STR_FMT(in),p-in->s);
l = p-in->s;
LM_ERR("invalid character in var name %.*s at %d\n",STR_FMT(in),l);
goto error;
}
p++;
Expand Down Expand Up @@ -239,15 +241,17 @@ int pv_xbuff_parse_name(pv_spec_t *sp, str *in)
p++;

if (!is_in_str(p,in) || *p!='>') {
LM_ERR("invalid operator (expected =>) for accessing attribute in token %.*s at position %d\n",STR_FMT(in),p-in->s);
l = p-in->s;
LM_ERR("invalid operator (expected =>) for accessing attribute in token %.*s at position %d\n",STR_FMT(in),l);
goto error;
}

attr.s = ++p;

while (is_in_str(p,in)) {
if (!is_pv_xbuff_valid_char(*p)) {
LM_ERR("invalid character in attribute name in token %.*s at %d\n",STR_FMT(in),p-in->s);
l = p-in->s;
LM_ERR("invalid character in attribute name in token %.*s at %d\n",STR_FMT(in),l);
goto error;
}
p++;
Expand Down Expand Up @@ -276,7 +280,8 @@ int pv_xbuff_parse_name(pv_spec_t *sp, str *in)
}

if (p < in->s + in->len) {
LM_ERR("unexpected token in %.*s at %d\n",STR_FMT(in),p-in->s);
l = p-in->s;
LM_ERR("unexpected token in %.*s at %d\n",STR_FMT(in),l);
goto error;
}

Expand Down

0 comments on commit 15b0626

Please sign in to comment.