diff options
Diffstat (limited to 'epan/dissectors/packet-nbd.c')
| -rw-r--r-- | epan/dissectors/packet-nbd.c | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/epan/dissectors/packet-nbd.c b/epan/dissectors/packet-nbd.c index 0f78149ba4..8a6dc22c9c 100644 --- a/epan/dissectors/packet-nbd.c +++ b/epan/dissectors/packet-nbd.c @@ -19,19 +19,19 @@ void proto_register_nbd(void); void proto_reg_handoff_nbd(void); -static gint proto_nbd = -1; -static int hf_nbd_magic = -1; -static int hf_nbd_type = -1; -static int hf_nbd_error = -1; -static int hf_nbd_handle = -1; -static int hf_nbd_from = -1; -static int hf_nbd_len = -1; -static int hf_nbd_response_in = -1; -static int hf_nbd_response_to = -1; -static int hf_nbd_time = -1; -static int hf_nbd_data = -1; +static gint proto_nbd; +static int hf_nbd_magic; +static int hf_nbd_type; +static int hf_nbd_error; +static int hf_nbd_handle; +static int hf_nbd_from; +static int hf_nbd_len; +static int hf_nbd_response_in; +static int hf_nbd_response_to; +static int hf_nbd_time; +static int hf_nbd_data; -static gint ett_nbd = -1; +static gint ett_nbd; static gboolean nbd_desegment = TRUE; @@ -254,7 +254,7 @@ dissect_nbd_tcp_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, nbd_trans=(nbd_transaction_t *)wmem_tree_lookup32_array(nbd_info->acked_pdus, hkey); } - /* The bloody handles are reused !!! eventhough they are 64 bits. + /* The bloody handles are reused !!! even though they are 64 bits. * So we must verify we got the "correct" one */ if( (magic==NBD_RESPONSE_MAGIC) @@ -316,10 +316,10 @@ dissect_nbd_tcp_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, switch(nbd_trans->type){ case NBD_CMD_WRITE: - col_add_fstr(pinfo->cinfo, COL_INFO, "Write Request Offset:0x%" G_GINT64_MODIFIER "x Length:%d", from, nbd_trans->datalen); + col_add_fstr(pinfo->cinfo, COL_INFO, "Write Request Offset:0x%" PRIx64 " Length:%d", from, nbd_trans->datalen); break; case NBD_CMD_READ: - col_add_fstr(pinfo->cinfo, COL_INFO, "Read Request Offset:0x%" G_GINT64_MODIFIER "x Length:%d", from, nbd_trans->datalen); + col_add_fstr(pinfo->cinfo, COL_INFO, "Read Request Offset:0x%" PRIx64 " Length:%d", from, nbd_trans->datalen); break; case NBD_CMD_DISC: col_set_str(pinfo->cinfo, COL_INFO, "Disconnect Request"); |