osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Squelch some warnings. 

svn path=/trunk/; revision=50286
This commit is contained in:
Guy Harris 2013-07-01 06:13:21 +00:00
parent 9a394ddfa0
commit 95daae2290
6 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
asn1/p1/packet-p1-template.c
View File

@ -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;

2
asn1/p1/packet-p1-template.h
View File

@ -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"

2
asn1/p7/p7.cnf
View File

@ -366,7 +366,7 @@ RTSE-apdus B "2.6.0.2.10""id-as-ms-rtse"
#.FN_BODY MSBindArgument/initiator-name
char *ora = NULL;
const char *ora = NULL;
%(DEFAULT_BODY)s

16
epan/dissectors/packet-p1.c
View File

@ -915,13 +915,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)));
@ -930,23 +930,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) {
@ -8299,7 +8299,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;

2
epan/dissectors/packet-p1.h
View File

@ -175,7 +175,7 @@
#line 30 "../../asn1/p1/packet-p1-template.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);
/*--- Included file: packet-p1-exp.h ---*/

2
epan/dissectors/packet-p7.c
View File

@ -941,7 +941,7 @@ dissect_p7_MessageGroupName(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int of
static int
dissect_p7_T_initiator_name(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
char *ora = NULL;
const char *ora = NULL;
offset = dissect_p1_ORAddressAndOrDirectoryName(implicit_tag, tvb, offset, actx, tree, hf_index);