File wireshark-1.10.x-fix-packet-gluster-duplicate_e... of Package wireshark

Overview Repositories Revisions Requests Users Attributes Meta

File wireshark-1.10.x-fix-packet-gluster-duplicate_enums.patch of Package wireshark (Revision 858bd711aee98c4562c8c91e7dc90a64)

Currently displaying revision 858bd711aee98c4562c8c91e7dc90a64 , Show latest

From: Andreas Stieger <andreas.stieger@gmx.de>
Date: Mon, 30 Sep 2013 19:32:21 +0100
Subject: Fixes build errors in openSUSE 13.1 and up
References: http://anonsvn.wireshark.org/viewvc?view=revision&revision=52142 http://anonsvn.wireshark.org/viewvc?view=revision&revision=52144 https://bugzilla.novell.com/show_bug.cgi?id=843304
Upstream: Committed

Fixes build errors in openSUSE 13.1 and up

[  257s] In file included from /usr/include/glib-2.0/glib/gdir.h:34:0,
[  257s]                  from /usr/include/glib-2.0/glib.h:47,
[  257s]                  from packet-gluster_cli.c:38:
[  257s] packet-gluster.h:359:2: error: redeclaration of enumerator 'DT_UNKNOWN'
[  257s]   DT_UNKNOWN = 0,
[  257s]   ^
[  257s] /usr/include/dirent.h:99:5: note: previous definition of 'DT_UNKNOWN' was here
[  257s]      DT_UNKNOWN = 0,
[  257s]      ^

------------------------------------------------------------------------
r52142 | eapache | 2013-09-19 13:50:25 +0100 (Thu, 19 Sep 2013) | 3 lines
Changed paths:
   M /trunk/epan/dissectors/packet-gluster.h

Remove unused enum that started conflicting with /usr/include/dirent.h on my
system.

------------------------------------------------------------------------
r52144 | eapache | 2013-09-19 14:04:37 +0100 (Thu, 19 Sep 2013) | 3 lines
Changed paths:
   M /trunk/epan/dissectors/packet-gluster.h
   M /trunk/epan/dissectors/packet-glusterfs.c

Enum was used after all. Restore it and namespace it with GLUSTER_ to avoid the
collision.

------------------------------------------------------------------------

---
 epan/dissectors/packet-gluster.h   |   18 +++++++++---------
 epan/dissectors/packet-glusterfs.c |   18 +++++++++---------
 2 files changed, 18 insertions(+), 18 deletions(-)

Index: wireshark-1.10.2/epan/dissectors/packet-gluster.h
===================================================================
--- wireshark-1.10.2.orig/epan/dissectors/packet-gluster.h	2013-04-22 19:05:17.000000000 +0100
+++ wireshark-1.10.2/epan/dissectors/packet-gluster.h	2013-09-30 19:38:08.000000000 +0100
@@ -356,15 +356,15 @@ enum gf_fop_procnum {
 
 /* dir-entry types from libglusterfs/src/compat.h */
 enum gluster_entry_types {
-	DT_UNKNOWN = 0,
-	DT_FIFO = 1,
-	DT_CHR = 2,
-	DT_DIR = 4,
-	DT_BLK = 6,
-	DT_REG = 8,
-	DT_LNK = 10,
-	DT_SOCK = 12,
-	DT_WHT = 14
+	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
 };
 
 
Index: wireshark-1.10.2/epan/dissectors/packet-glusterfs.c
===================================================================
--- wireshark-1.10.2.orig/epan/dissectors/packet-glusterfs.c	2013-04-22 19:05:16.000000000 +0100
+++ wireshark-1.10.2/epan/dissectors/packet-glusterfs.c	2013-09-30 19:38:08.000000000 +0100
@@ -2002,15 +2002,15 @@ static value_string_ext glusterfs3_1_fop
 
 /* 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);

Places

File wireshark-1.10.x-fix-packet-gluster-duplicate_enums.patch of Package wireshark (Revision 858bd711aee98c4562c8c91e7dc90a64)

Places