osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Don't define dvbci_event[] in a header, just declare it. 

Define it in a source file, and export it to other users. One instance
suffices (and suppresses "defined but not used" errors from
-Werror=unused-const-variable).

Change-Id: I8b8d624344ec08c777d1869ee2692d535f898f19
Reviewed-on: https://code.wireshark.org/review/13198
Reviewed-by: Guy Harris <guy@alum.mit.edu>
This commit is contained in:
Guy Harris 2016-01-11 19:58:59 -08:00
parent f6791c1ab9
commit 410f9f8c09
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
epan/dissectors/packet-dvbci.c
View File

@ -798,6 +798,15 @@ static const value_string dvbci_apdu_tag[] = {
{ 0, NULL }
};
WS_DLL_PUBLIC_DEF const value_string dvbci_event[] = {
{ DVBCI_EVT_DATA_HOST_TO_CAM, "data transfer Host -> CAM" },
{ DVBCI_EVT_DATA_CAM_TO_HOST, "data transfer CAM -> Host" },
{ DVBCI_EVT_CIS_READ, "read the Card Information Structure (CIS)" },
{ DVBCI_EVT_COR_WRITE, "write into the Configuration Option Register (COR)" },
{ DVBCI_EVT_HW_EVT, "hardware event" },
{ 0, NULL }
};
static int proto_dvbci = -1;
static const gchar *dvbci_sek = NULL;

10
epan/dissectors/packet-dvbci.h
View File

@ -39,15 +39,7 @@
event can't be determined by looking at source and destination addresses */
#define DVBCI_EVT_INVALID_EVT 0x00
static const value_string dvbci_event[] = {
{ DVBCI_EVT_DATA_HOST_TO_CAM, "data transfer Host -> CAM" },
{ DVBCI_EVT_DATA_CAM_TO_HOST, "data transfer CAM -> Host" },
{ DVBCI_EVT_CIS_READ, "read the Card Information Structure (CIS)" },
{ DVBCI_EVT_COR_WRITE,
"write into the Configuration Option Register (COR)" },
{ DVBCI_EVT_HW_EVT, "hardware event" },
{ 0, NULL }
};
WS_DLL_PUBLIC const value_string dvbci_event[];
gint dvbci_set_addrs(guint8 event, packet_info *pinfo);
guint8 dvbci_get_evt_from_addrs(packet_info *pinfo);