From 15b0626f57f2b5dbe56e668a9435d683034a0277 Mon Sep 17 00:00:00 2001 From: Seudin Kasumovic Date: Mon, 25 May 2015 10:52:44 +0200 Subject: [PATCH] erlang: fix compile warnings Avoid compile warnings on 64bit. --- modules/erlang/pv_atom.c | 13 +++++++++---- modules/erlang/pv_pid.c | 13 +++++++++---- modules/erlang/pv_ref.c | 13 +++++++++---- modules/erlang/pv_xbuff.c | 13 +++++++++---- 4 files changed, 36 insertions(+), 16 deletions(-) diff --git a/modules/erlang/pv_atom.c b/modules/erlang/pv_atom.c index 15c31a132ef..9adad477a47 100644 --- a/modules/erlang/pv_atom.c +++ b/modules/erlang/pv_atom.c @@ -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; @@ -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++; @@ -92,7 +94,8 @@ 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; } @@ -100,7 +103,8 @@ int pv_atom_parse_name(pv_spec_t *sp, str *in) 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++; @@ -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; } diff --git a/modules/erlang/pv_pid.c b/modules/erlang/pv_pid.c index 94a13718215..4266b02c45f 100644 --- a/modules/erlang/pv_pid.c +++ b/modules/erlang/pv_pid.c @@ -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; @@ -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++; @@ -95,7 +97,8 @@ 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; } @@ -103,7 +106,8 @@ int pv_pid_parse_name(pv_spec_t *sp, str *in) 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++; @@ -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; } diff --git a/modules/erlang/pv_ref.c b/modules/erlang/pv_ref.c index cfcf93488e7..0d17d4dfdf8 100644 --- a/modules/erlang/pv_ref.c +++ b/modules/erlang/pv_ref.c @@ -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; @@ -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++; @@ -95,7 +97,8 @@ 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; } @@ -103,7 +106,8 @@ int pv_ref_parse_name(pv_spec_t *sp, str *in) 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++; @@ -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; } diff --git a/modules/erlang/pv_xbuff.c b/modules/erlang/pv_xbuff.c index 614e62f4b28..7e80e921be3 100644 --- a/modules/erlang/pv_xbuff.c +++ b/modules/erlang/pv_xbuff.c @@ -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; @@ -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++; @@ -239,7 +241,8 @@ 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; } @@ -247,7 +250,8 @@ int pv_xbuff_parse_name(pv_spec_t *sp, str *in) 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++; @@ -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; }