diff options
author | Evan Huus <eapache@gmail.com> | 2013-09-19 13:04:37 +0000 |
---|---|---|
committer | Evan Huus <eapache@gmail.com> | 2013-09-19 13:04:37 +0000 |
commit | 27c4a47c29cf64eb1049d758b5ecbe86f2ddd9d6 (patch) | |
tree | c9503b129c32e2dd2095e412fbf299a1ec5f443f /epan/dissectors | |
parent | 6c41404ecf17b0eafe45411ff3966523c790798f (diff) |
Enum was used after all. Restore it and namespace it with GLUSTER_ to avoid the
collision.
svn path=/trunk/; revision=52144
Diffstat (limited to 'epan/dissectors')
-rw-r--r-- | epan/dissectors/packet-gluster.h | 14 | ||||
-rw-r--r-- | epan/dissectors/packet-glusterfs.c | 18 |
2 files changed, 23 insertions, 9 deletions
diff --git a/epan/dissectors/packet-gluster.h b/epan/dissectors/packet-gluster.h index b89f6dcd21..c147f41cd4 100644 --- a/epan/dissectors/packet-gluster.h +++ b/epan/dissectors/packet-gluster.h @@ -357,6 +357,20 @@ enum gf_fop_procnum { GFS3_OP_MAXVALUE }; +/* dir-entry types from libglusterfs/src/compat.h */ +enum gluster_entry_types { + GLUSTER_DT_UNKNOWN = 0, + GLUSTER_DT_FIFO = 1, + GLUSTER_DT_CHR = 2, + GLUSTER_DT_DIR = 4, + GLUSTER_DT_BLK = 6, + GLUSTER_DT_REG = 8, + GLUSTER_DT_LNK = 10, + GLUSTER_DT_SOCK = 12, + GLUSTER_DT_WHT = 14 +}; + + /* LOCKING operators come from libglusterfs/src/glusterfs.h */ /* based on original enum glusterfs_lk_cmds_t */ diff --git a/epan/dissectors/packet-glusterfs.c b/epan/dissectors/packet-glusterfs.c index 8fe6df2921..c4f7bec30a 100644 --- a/epan/dissectors/packet-glusterfs.c +++ b/epan/dissectors/packet-glusterfs.c @@ -2030,15 +2030,15 @@ static value_string_ext glusterfs3_1_fop_proc_vals_ext = VALUE_STRING_EXT_INIT(g /* dir-entry types */ static const value_string glusterfs_entry_type_names[] = { - { DT_UNKNOWN, "DT_UNKNOWN" }, - { DT_FIFO, "DT_FIFO" }, - { DT_CHR, "DT_CHR" }, - { DT_DIR, "DT_DIR" }, - { DT_BLK, "DT_BLK" }, - { DT_REG, "DT_REG" }, - { DT_LNK, "DT_LNK" }, - { DT_SOCK, "DT_SOCK" }, - { DT_WHT, "DT_WHT" }, + { GLUSTER_DT_UNKNOWN, "DT_UNKNOWN" }, + { GLUSTER_DT_FIFO, "DT_FIFO" }, + { GLUSTER_DT_CHR, "DT_CHR" }, + { GLUSTER_DT_DIR, "DT_DIR" }, + { GLUSTER_DT_BLK, "DT_BLK" }, + { GLUSTER_DT_REG, "DT_REG" }, + { GLUSTER_DT_LNK, "DT_LNK" }, + { GLUSTER_DT_SOCK, "DT_SOCK" }, + { GLUSTER_DT_WHT, "DT_WHT" }, { 0, NULL } }; static value_string_ext glusterfs_entry_type_names_ext = VALUE_STRING_EXT_INIT(glusterfs_entry_type_names); |