diff options
| author | Jakub Zawadzki <darkjames-ws@darkjames.pl> | 2012-04-09 19:12:17 +0000 |
|---|---|---|
| committer | Jakub Zawadzki <darkjames-ws@darkjames.pl> | 2012-04-09 19:12:17 +0000 |
| commit | 9d33f00098e6d5ed6087dd7ca7451e5182845d63 (patch) | |
| tree | 95f05f4d0b3768f62332d39f787a23be2f1fa145 | |
| parent | 9861855f26c30d50913941c89a1c243602db2fef (diff) | |
| download | wireshark-9d33f00098e6d5ed6087dd7ca7451e5182845d63.tar.gz | |
Fix 'overflow in implicit constant conversion', make it const.
svn path=/trunk/; revision=41998
| -rw-r--r-- | epan/dissectors/packet-adwin-config.c | 10 | ||||
| -rw-r--r-- | ui/gtk/wlan_stat_dlg.c | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/epan/dissectors/packet-adwin-config.c b/epan/dissectors/packet-adwin-config.c index 2c2f41d0cc..d9b6f16fc9 100644 --- a/epan/dissectors/packet-adwin-config.c +++ b/epan/dissectors/packet-adwin-config.c @@ -372,15 +372,15 @@ dissect_TCPFlashUpdate(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *adwin } /* 00:50:c2:0a:2*:** */ -static char mac_iab_start[] = { 0x00, 0x50, 0xc2, 0x0a, 0x20, 0x00 }; -static char mac_iab_end[] = { 0x00, 0x50, 0xc2, 0x0a, 0x2f, 0xff }; +static const unsigned char mac_iab_start[] = { 0x00, 0x50, 0xc2, 0x0a, 0x20, 0x00 }; +static const unsigned char mac_iab_end[] = { 0x00, 0x50, 0xc2, 0x0a, 0x2f, 0xff }; /* 00:22:71:**:**:** */ -static char mac_oui_start[] = { 0x00, 0x22, 0x71, 0x00, 0x00, 0x00 }; -static char mac_oui_end[] = { 0x00, 0x22, 0x71, 0xff, 0xff, 0xff }; +static const unsigned char mac_oui_start[] = { 0x00, 0x22, 0x71, 0x00, 0x00, 0x00 }; +static const unsigned char mac_oui_end[] = { 0x00, 0x22, 0x71, 0xff, 0xff, 0xff }; /* ff:ff:ff:ff:ff:ff */ -static char mac_broadcast[] = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff }; +static const unsigned char mac_broadcast[] = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff }; /* return TRUE if mac is in mac address range assigned to ADwin or if * mac is broadcast */ diff --git a/ui/gtk/wlan_stat_dlg.c b/ui/gtk/wlan_stat_dlg.c index f328e6dd45..4b9c59d410 100644 --- a/ui/gtk/wlan_stat_dlg.c +++ b/ui/gtk/wlan_stat_dlg.c @@ -1962,7 +1962,7 @@ wlanstat_launch (GtkAction *action _U_, gpointer user_data _U_) void register_tap_listener_wlanstat (void) { - static const char src[6] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff}; + static const unsigned char src[6] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff}; SET_ADDRESS(&broadcast, AT_ETHER, 6, src); } |