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

Squelch some compiler warnings. 

Change-Id: I768bf577b3871171ab33f080c5a0099ac06718ce
Reviewed-on: https://code.wireshark.org/review/2906
Reviewed-by: Guy Harris <guy@alum.mit.edu>
This commit is contained in:
Guy Harris 2014-07-06 17:11:25 -07:00
parent 4d58904a09
commit 0a2f6fc01a
3 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4020,8 +4020,8 @@ de_sm_pco(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset, g
pco_item = proto_tree_add_uint_format_value(tree, hf_gsm_a_gm_pco_pid, tvb, curr_offset, 2, (guint32)prot,
"%s (0x%04x)",
link_dir ?
rval_to_str((guint32)prot, gsm_a_sm_pco_net2ms_prot_vals, val_to_str_ext_const(prot, &ppp_vals_ext, "Unknown")) :
rval_to_str((guint32)prot, gsm_a_sm_pco_ms2net_prot_vals, val_to_str_ext_const(prot, &ppp_vals_ext, "Unknown")),
rval_to_str_const((guint32)prot, gsm_a_sm_pco_net2ms_prot_vals, val_to_str_ext_const(prot, &ppp_vals_ext, "Unknown")) :
rval_to_str_const((guint32)prot, gsm_a_sm_pco_ms2net_prot_vals, val_to_str_ext_const(prot, &ppp_vals_ext, "Unknown")),
(guint32)prot);
pco_tree = proto_item_add_subtree(pco_item, ett_sm_pco);

19
epan/dissectors/packet-ipp.c
View File

@ -186,7 +186,7 @@ dissect_ipp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
gboolean is_request = (pinfo->destport == pinfo->match_uint);
/* XXX - should this be based on the HTTP header? */
guint16 status_code;
const gchar *status_fmt;
const gchar *status_type;
col_set_str(pinfo->cinfo, COL_PROTOCOL, "IPP");
if (is_request)
@ -212,31 +212,32 @@ dissect_ipp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
switch (status_code & STATUS_TYPE_MASK) {
case STATUS_SUCCESSFUL:
status_fmt = "Successful (0x%04x)";
status_type = "Successful";
break;
case STATUS_INFORMATIONAL:
status_fmt = "Informational (0x%04x)";
status_type = "Informational";
break;
case STATUS_REDIRECTION:
status_fmt = "Redirection (0x%04x)";
status_type = "Redirection";
break;
case STATUS_CLIENT_ERROR:
status_fmt = "Client error (0x%04x)";
status_type = "Client error";
break;
case STATUS_SERVER_ERROR:
status_fmt = "Server error (0x%04x)";
status_type = "Server error";
break;
default:
status_fmt = "Unknown (0x%04x)";
status_type = "Unknown";
break;
}
proto_tree_add_text(ipp_tree, tvb, offset, 2, "Status-code: %s",
val_to_str(status_code, status_vals, status_fmt));
proto_tree_add_text(ipp_tree, tvb, offset, 2, "Status-code: %s (%s)",
status_type,
val_to_str(status_code, status_vals, "0x804x"));
}
offset += 2;

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

@ -3988,9 +3988,9 @@ dissect_rsvp_label_request(proto_item *ti, proto_tree *rsvp_object_tree,
rval_to_str(lsp_enc, gmpls_lsp_enc_rvals, "Unknown (%d)"),
rval_to_str(tvb_get_guint8(tvb,offset2+1),
gmpls_switching_type_rvals, "Unknown (%d)"),
rval_to_str(l3pid, gmpls_gpid_rvals,
val_to_str(l3pid, etype_vals,
"Unknown (0x%04x)")));
rval_to_str_const(l3pid, gmpls_gpid_rvals,
val_to_str(l3pid, etype_vals,
"Unknown (0x%04x)")));
break;
}