aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-glusterfs_hndsk.c
diff options
context:
space:
mode:
authorBill Meier <wmeier@newsguy.com>2012-07-13 21:59:25 +0000
committerBill Meier <wmeier@newsguy.com>2012-07-13 21:59:25 +0000
commitb1eb22bd51b0592d3cf4ac99d68f46529d4f4463 (patch)
tree7c4f1404f9bd32b4afa14ff2a45e005d74995d24 /epan/dissectors/packet-glusterfs_hndsk.c
parent5e12ba51e6cccbc5842a914c742c217ab35984ab (diff)
Minor cleanup;
- Remove unneeded #includes; - Create/use value_string_ext for some value_string arrays; - Do some whitespace changes and reformat some lines. svn path=/trunk/; revision=43706
Diffstat (limited to 'epan/dissectors/packet-glusterfs_hndsk.c')
-rw-r--r--epan/dissectors/packet-glusterfs_hndsk.c21
1 files changed, 10 insertions, 11 deletions
diff --git a/epan/dissectors/packet-glusterfs_hndsk.c b/epan/dissectors/packet-glusterfs_hndsk.c
index 4ff3e841e9..8e635a2cad 100644
--- a/epan/dissectors/packet-glusterfs_hndsk.c
+++ b/epan/dissectors/packet-glusterfs_hndsk.c
@@ -38,9 +38,8 @@
#endif
#include <glib.h>
-#include <string.h>
+
#include <epan/packet.h>
-#include <epan/tfs.h>
#include "packet-rpc.h"
#include "packet-gluster.h"
@@ -177,13 +176,13 @@ gluster_hndsk_2_event_notify_reply(tvbuff_t *tvb, int offset,
}
static const vsff gluster_hndsk_proc[] = {
- { GF_HNDSK_NULL, "NULL", NULL, NULL },
+ { GF_HNDSK_NULL, "NULL", NULL, NULL },
{
GF_HNDSK_SETVOLUME, "SETVOLUME",
gluster_hndsk_setvolume_call, gluster_hndsk_setvolume_reply
},
{ GF_HNDSK_GETSPEC, "GETSPEC", NULL, NULL },
- { GF_HNDSK_PING, "PING", NULL, gluster_dissect_common_reply },
+ { GF_HNDSK_PING, "PING", NULL, gluster_dissect_common_reply },
{ 0, NULL, NULL, NULL }
};
@@ -212,11 +211,11 @@ static const vsff gluster_hndsk_2_proc[] = {
static const value_string gluster_hndsk_proc_vals[] = {
- { GF_HNDSK_NULL, "NULL" },
- { GF_HNDSK_SETVOLUME, "DUMP" },
- { GF_HNDSK_GETSPEC, "GETSPEC" },
- { GF_HNDSK_PING, "PING" },
- { GF_HNDSK_SET_LK_VER,"LOCK VERSION" },
+ { GF_HNDSK_NULL, "NULL" },
+ { GF_HNDSK_SETVOLUME, "DUMP" },
+ { GF_HNDSK_GETSPEC, "GETSPEC" },
+ { GF_HNDSK_PING, "PING" },
+ { GF_HNDSK_SET_LK_VER, "LOCK VERSION" },
{ GF_HNDSK_EVENT_NOTIFY, "EVENTNOTIFY" },
{ 0, NULL }
};
@@ -291,13 +290,13 @@ proto_reg_handoff_gluster_hndsk(void)
/* Legacy GlusterFS Callback procedures, they don't contain any data. */
static const vsff gluster_cbk_proc[] = {
- { GF_CBK_NULL, "NULL", NULL, NULL },
+ { GF_CBK_NULL, "NULL", NULL, NULL },
{ GF_CBK_FETCHSPEC, "FETCHSPEC", NULL, NULL },
{ GF_CBK_INO_FLUSH, "INO_FLUSH", NULL, NULL },
{ 0, NULL, NULL, NULL }
};
static const value_string gluster_cbk_proc_vals[] = {
- { GF_CBK_NULL, "NULL" },
+ { GF_CBK_NULL, "NULL" },
{ GF_CBK_FETCHSPEC, "FETCHSPEC" },
{ GF_CBK_INO_FLUSH, "INO_FLUSH" },
{ 0, NULL }