osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Fix some more warnings 

svn path=/trunk/; revision=21273
This commit is contained in:
Stephen Fisher 2007-03-29 18:09:13 +00:00
parent 305fd435de
commit 82b2c83149
4 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
epan/dissectors/packet-bacapp.c
View File

@ -5744,13 +5744,13 @@ fConvertXXXtoUTF8 (const guint8 *in, size_t *inbytesleft, guint8 *out, size_t *o
#if HAVE_ICONV
guint32 i;
iconv_t icd;
const guint8 *inp = in;
const char *inp = in;
guint8 *outp = out;
const guint8 **inpp = &inp;
const char **inpp = &inp;
guint8 **outpp = &outp;
if ((icd = iconv_open ("UTF-8", fromcoding)) != (iconv_t) -1) {
i = iconv (icd, (char**) inpp, inbytesleft, (char**) outpp, outbytesleft);
i = iconv (icd, inpp, inbytesleft, (char**) outpp, outbytesleft);
*outpp[0] = '\0';
iconv_close (icd);
return i;

4
epan/dissectors/packet-dcm.c
View File

@ -747,7 +747,7 @@ lookupCtx(dcmState_t *dd, guint8 ctx)
static void
dissect_dcm_data(dcmState_t *dcm_data, proto_item *ti, tvbuff_t *tvb)
{
int len, offset, toffset, state, vr, tr;
int len, offset, toffset, state, vr = 0, tr = 0;
proto_tree *dcm_tree;
dcmItem_t *di;
guint8 ctx, syntax = DCM_UNK;
@ -761,7 +761,7 @@ dissect_dcm_data(dcmState_t *dcm_data, proto_item *ti, tvbuff_t *tvb)
/*
* XXX - telling the user to "click on ASSOC request" is bogus if we
* have already identified the ASSOC request and can connect it to
* this mnessage; if clicking on a request prior to this one causes
* this message; if clicking on a request prior to this one causes
* additional state information to be set up that would affect the
* dissection of this request, we should set up that state *at the
* time we dissect that request*, if possible, and if clicking on it

7
epan/dissectors/packet-ncp2222.inc
View File

@ -2480,14 +2480,14 @@ build_expert_data(proto_tree *ncp_tree, char *hf_name, char *buffer, int repeat_
{
proto_tree *tree_pointer;
proto_tree *tree_loc;
proto_tree *struct_tree_pointer;
proto_tree *struct_tree_pointer = NULL;
char temp_buffer[256]="\0";
gboolean in_struct=FALSE;
tree_loc = ncp_tree->first_child;
for (tree_pointer=tree_loc; tree_pointer!=NULL; tree_pointer=tree_pointer->next)
{
/* We currently only go one structure deap in our search for values */
/* We currently only go one structure deep in our search for values */
if (tree_pointer->first_child && !in_struct && search_structs) {
struct_tree_pointer = tree_pointer;
tree_pointer = tree_pointer->first_child;
@ -5814,7 +5814,8 @@ dissect_ncp_request(tvbuff_t *tvb, packet_info *pinfo,
guint32 nw_connection, guint8 sequence,
guint16 type, proto_tree *volatile ncp_tree)
{
guint8 func, subfunc = 0;
guint8 func;
volatile guint8 subfunc = 0;
gboolean requires_subfunc = FALSE;
gboolean has_length = FALSE;
ncp_req_hash_value *volatile request_value = NULL;

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

@ -1814,7 +1814,7 @@ dissect_sccp_optional_parameters(tvbuff_t *tvb, packet_info *pinfo,
}
static sccp_msg_info_t* new_ud_msg(packet_info* pinfo, guint32 msg_type) {
static sccp_msg_info_t* new_ud_msg(packet_info* pinfo, guint32 msg_type _U_) {
sccp_msg_info_t* m = ep_alloc(sizeof(sccp_msg_info_t));
m->framenum = pinfo->fd->num;
m->offset = 0; /* irrelevant */