Ticket #4206: wireshark-1.10.2-packet_gluster_duplicate_enums-fix-1.patch

File wireshark-1.10.2-packet_gluster_duplicate_enums-fix-1.patch, 2.3 KB (added by Fernando de Oliveira, 11 years ago)

Fix build with glib-2.38.X

  • epan/dissectors/packet-gluster.h 

    Submitted By: Fernando de Oliveira <famobr at yahoo dot com dot br>
Date: 2013-10-18
Initial Package Version: 1.10.2
Upstream Status: Committed
Origin: opensuse
URL: https://build.opensuse.org/package/view_file/openSUSE:Factory/wireshark/wireshark-1.10.x-fix-packet-gluster-duplicate_enums.patch?rev=858bd711aee98c4562c8c91e7dc90a64
Description: Fixes build with glib-2.38.X
    old new enum gf_fop_procnum {  
    356356
    357357/* dir-entry types from libglusterfs/src/compat.h */
    358358enum gluster_entry_types {
    359         DT_UNKNOWN = 0,
    360         DT_FIFO = 1,
    361         DT_CHR = 2,
    362         DT_DIR = 4,
    363         DT_BLK = 6,
    364         DT_REG = 8,
    365         DT_LNK = 10,
    366         DT_SOCK = 12,
    367         DT_WHT = 14
     359        GLUSTER_DT_UNKNOWN = 0,
     360        GLUSTER_DT_FIFO = 1,
     361        GLUSTER_DT_CHR = 2,
     362        GLUSTER_DT_DIR = 4,
     363        GLUSTER_DT_BLK = 6,
     364        GLUSTER_DT_REG = 8,
     365        GLUSTER_DT_LNK = 10,
     366        GLUSTER_DT_SOCK = 12,
     367        GLUSTER_DT_WHT = 14
    368368};
    369369
    370370

  • epan/dissectors/packet-glusterfs.c

    old new static value_string_ext glusterfs3_1_fop  
    20022002
    20032003/* dir-entry types */
    20042004static const value_string glusterfs_entry_type_names[] = {
    2005         { DT_UNKNOWN, "DT_UNKNOWN" },
    2006         { DT_FIFO,    "DT_FIFO" },
    2007         { DT_CHR,     "DT_CHR" },
    2008         { DT_DIR,     "DT_DIR" },
    2009         { DT_BLK,     "DT_BLK" },
    2010         { DT_REG,     "DT_REG" },
    2011         { DT_LNK,     "DT_LNK" },
    2012         { DT_SOCK,    "DT_SOCK" },
    2013         { DT_WHT,     "DT_WHT" },
     2005        { GLUSTER_DT_UNKNOWN, "DT_UNKNOWN" },
     2006        { GLUSTER_DT_FIFO,    "DT_FIFO" },
     2007        { GLUSTER_DT_CHR,     "DT_CHR" },
     2008        { GLUSTER_DT_DIR,     "DT_DIR" },
     2009        { GLUSTER_DT_BLK,     "DT_BLK" },
     2010        { GLUSTER_DT_REG,     "DT_REG" },
     2011        { GLUSTER_DT_LNK,     "DT_LNK" },
     2012        { GLUSTER_DT_SOCK,    "DT_SOCK" },
     2013        { GLUSTER_DT_WHT,     "DT_WHT" },
    20142014        { 0, NULL }
    20152015};
    20162016static value_string_ext glusterfs_entry_type_names_ext = VALUE_STRING_EXT_INIT(glusterfs_entry_type_names);