Skip to content

Commit

Permalink
Squelch some warnings.
Browse files Browse the repository at this point in the history 
svn path=/trunk/; revision=50286
  • Loading branch information
@guyharris
guyharris committed Jul 1, 2013
1 parent 9a394dd commit 95daae2
Show file tree
Hide file tree
Showing 6 changed files with 20 additions and 20 deletions.
16 changes: 8 additions & 8 deletions asn1/p1/packet-p1-template.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)));
Expand All @@ -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) {
Expand Down Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion asn1/p1/packet-p1-template.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
2 changes: 1 addition & 1 deletion asn1/p7/p7.cnf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
16 changes: 8 additions & 8 deletions epan/dissectors/packet-p1.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)));
Expand All @@ -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) {
Expand Down Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion epan/dissectors/packet-p1.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 ---*/
Expand Down
2 changes: 1 addition & 1 deletion epan/dissectors/packet-p7.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down

0 comments on commit 95daae2

Please sign in to comment.