diff options
| author | Guy Harris <guy@alum.mit.edu> | 2013-07-01 06:13:21 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2013-07-01 06:13:21 +0000 |
| commit | 95daae2290eed5a11a112b24f3b86fc6b43e3f01 (patch) | |
| tree | 05dac150a1a3456316352e03c07a2cae2b3e33bf /asn1/p1 | |
| parent | 9a394ddfa024c523f6a9290d662d9d6c07894b33 (diff) | |
Squelch some warnings.
svn path=/trunk/; revision=50286
Diffstat (limited to 'asn1/p1')
| -rw-r--r-- | asn1/p1/packet-p1-template.c | 16 | ||||
| -rw-r--r-- | asn1/p1/packet-p1-template.h | 2 |
2 files changed, 9 insertions, 9 deletions
diff --git a/asn1/p1/packet-p1-template.c b/asn1/p1/packet-p1-template.c index 47119fb506..87c4f336e0 100644 --- a/asn1/p1/packet-p1-template.c +++ b/asn1/p1/packet-p1-template.c @@ -107,13 +107,13 @@ static void set_do_address(asn1_ctx_t* actx, gboolean do_address) ctx->do_address = do_address; } -static void do_address(const char* address, tvbuff_t* tvb_string, asn1_ctx_t* actx) +static void do_address(const char* addr, tvbuff_t* tvb_string, asn1_ctx_t* actx) { p1_address_ctx_t* ctx = (p1_address_ctx_t*)actx->subtree.tree_ctx; if (ctx && ctx->do_address) { - if (address) { - ep_strbuf_append(ctx->oraddress, address); + if (addr) { + ep_strbuf_append(ctx->oraddress, addr); } if (tvb_string) { ep_strbuf_append(ctx->oraddress, tvb_format_text(tvb_string, 0, tvb_length(tvb_string))); @@ -122,23 +122,23 @@ static void do_address(const char* address, tvbuff_t* tvb_string, asn1_ctx_t* ac } -static void do_address_str(const char* address, tvbuff_t* tvb_string, asn1_ctx_t* actx) +static void do_address_str(const char* addr, tvbuff_t* tvb_string, asn1_ctx_t* actx) { emem_strbuf_t *ddatype = (emem_strbuf_t *)actx->value_ptr; p1_address_ctx_t* ctx = (p1_address_ctx_t*)actx->subtree.tree_ctx; - do_address(address, tvb_string, actx); + do_address(addr, tvb_string, actx); if (ctx && ctx->do_address && ddatype && tvb_string) ep_strbuf_append(ddatype, tvb_format_text(tvb_string, 0, tvb_length(tvb_string))); } -static void do_address_str_tree(const char* address, tvbuff_t* tvb_string, asn1_ctx_t* actx, proto_tree* tree) +static void do_address_str_tree(const char* addr, tvbuff_t* tvb_string, asn1_ctx_t* actx, proto_tree* tree) { emem_strbuf_t *ddatype = (emem_strbuf_t *)actx->value_ptr; p1_address_ctx_t* ctx = (p1_address_ctx_t*)actx->subtree.tree_ctx; - do_address(address, tvb_string, actx); + do_address(addr, tvb_string, actx); if (ctx && ctx->do_address && tvb_string && ddatype) { if (ddatype->len > 0) { @@ -178,7 +178,7 @@ void p1_initialize_content_globals (asn1_ctx_t* actx, proto_tree *tree, gboolean ctx->report_unknown_content_type = report_unknown_cont_type; } -char* p1_get_last_oraddress (asn1_ctx_t* actx) +const char* p1_get_last_oraddress (asn1_ctx_t* actx) { p1_address_ctx_t* ctx; diff --git a/asn1/p1/packet-p1-template.h b/asn1/p1/packet-p1-template.h index 6bd9d14858..9b1262dec6 100644 --- a/asn1/p1/packet-p1-template.h +++ b/asn1/p1/packet-p1-template.h @@ -29,7 +29,7 @@ #include "packet-p1-val.h" void p1_initialize_content_globals (asn1_ctx_t* actx, proto_tree *tree, gboolean report_unknown_cont_type); -char* p1_get_last_oraddress(asn1_ctx_t* actx); +const char* p1_get_last_oraddress(asn1_ctx_t* actx); void dissect_p1_mts_apdu (tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree); #include "packet-p1-exp.h" |