From 29acae89d9363513efedec5d5417ab2470105100 Mon Sep 17 00:00:00 2001 From: Guy Harris Date: Wed, 26 Dec 2012 11:46:48 +0000 Subject: OK, see if not using an enum gets rid of "implicit conversion shortens 64-bit value to 32 bits" warnings on 32-bit compilers. According to 6.1.3.3 "Enumeration constants" of C90, "An identifier declared as an enumeration constant has type int", so there may be signed vs. unsigned issues. svn path=/trunk/; revision=46772 --- epan/dissectors/packet-vnc.c | 114 +++++++++++++++++++++---------------------- 1 file changed, 56 insertions(+), 58 deletions(-) diff --git a/epan/dissectors/packet-vnc.c b/epan/dissectors/packet-vnc.c index 9a4260cf38..8aa90122af 100644 --- a/epan/dissectors/packet-vnc.c +++ b/epan/dissectors/packet-vnc.c @@ -135,64 +135,62 @@ static const true_false_string button_mask_tfs = { "Not pressed" }; -typedef enum { - VNC_ENCODING_TYPE_DESKTOP_SIZE = 0xFFFFFF21, - VNC_ENCODING_TYPE_LAST_RECT = 0xFFFFFF20, - VNC_ENCODING_TYPE_POINTER_POS = 0xFFFFFF18, - VNC_ENCODING_TYPE_RICH_CURSOR = 0xFFFFFF11, - VNC_ENCODING_TYPE_X_CURSOR = 0xFFFFFF10, - VNC_ENCODING_TYPE_RAW = 0, - VNC_ENCODING_TYPE_COPY_RECT = 1, - VNC_ENCODING_TYPE_RRE = 2, - VNC_ENCODING_TYPE_CORRE = 4, - VNC_ENCODING_TYPE_HEXTILE = 5, - VNC_ENCODING_TYPE_ZLIB = 6, - VNC_ENCODING_TYPE_TIGHT = 7, - VNC_ENCODING_TYPE_ZLIBHEX = 8, - VNC_ENCODING_TYPE_ULTRA = 9, - VNC_ENCODING_TYPE_TRLE = 15, - VNC_ENCODING_TYPE_RLE = 16, - VNC_ENCODING_TYPE_HITACHI_ZYWRLE = 17, - VNC_ENCODING_TYPE_JPEG_0 = -32, - VNC_ENCODING_TYPE_JPEG_1 = -31, - VNC_ENCODING_TYPE_JPEG_2 = -30, - VNC_ENCODING_TYPE_JPEG_3 = -29, - VNC_ENCODING_TYPE_JPEG_4 = -28, - VNC_ENCODING_TYPE_JPEG_5 = -27, - VNC_ENCODING_TYPE_JPEG_6 = -26, - VNC_ENCODING_TYPE_JPEG_7 = -25, - VNC_ENCODING_TYPE_JPEG_8 = -24, - VNC_ENCODING_TYPE_JPEG_9 = -23, - VNC_ENCODING_TYPE_COMPRESSION_0 = 0xFFFFFF00, - VNC_ENCODING_TYPE_COMPRESSION_1 = 0xFFFFFF01, - VNC_ENCODING_TYPE_COMPRESSION_2 = 0xFFFFFF02, - VNC_ENCODING_TYPE_COMPRESSION_3 = 0xFFFFFF03, - VNC_ENCODING_TYPE_COMPRESSION_4 = 0xFFFFFF04, - VNC_ENCODING_TYPE_COMPRESSION_5 = 0xFFFFFF05, - VNC_ENCODING_TYPE_COMPRESSION_6 = 0xFFFFFF06, - VNC_ENCODING_TYPE_COMPRESSION_7 = 0xFFFFFF07, - VNC_ENCODING_TYPE_COMPRESSION_8 = 0xFFFFFF08, - VNC_ENCODING_TYPE_COMPRESSION_9 = 0xFFFFFF09, - VNC_ENCODING_TYPE_WMVi = 0x574D5669, - VNC_ENCODING_TYPE_CACHE = 0xFFFF0000, - VNC_ENCODING_TYPE_CACHE_ENABLE = 0xFFFF0001, - VNC_ENCODING_TYPE_XOR_ZLIB = 0xFFFF0002, - VNC_ENCODING_TYPE_XOR_MONO_ZLIB = 0xFFFF0003, - VNC_ENCODING_TYPE_XOR_MULTI_ZLIB = 0xFFFF0004, - VNC_ENCODING_TYPE_SOLID_COLOR = 0xFFFF0005, - VNC_ENCODING_TYPE_XOR_ENABLE = 0xFFFF0006, - VNC_ENCODING_TYPE_CACHE_ZIP = 0xFFFF0007, - VNC_ENCODING_TYPE_SOL_MONO_ZIP = 0xFFFF0008, - VNC_ENCODING_TYPE_ULTRA_ZIP = 0xFFFF0009, - VNC_ENCODING_TYPE_SERVER_STATE = 0xFFFF8000, - VNC_ENCODING_TYPE_ENABLE_KEEP_ALIVE = 0xFFFF8001, - VNC_ENCODING_TYPE_FTP_PROTO_VER = 0xFFFF8002, - VNC_ENCODING_TYPE_POINTER_CHANGE = -257, - VNC_ENCODING_TYPE_EXT_KEY_EVENT = -258, - VNC_ENCODING_TYPE_AUDIO = 259, - VNC_ENCODING_TYPE_DESKTOP_NAME = -307, - VNC_ENCODING_TYPE_EXTENDED_DESK_SIZE= -308 -} vnc_encoding_type_e; +#define VNC_ENCODING_TYPE_DESKTOP_SIZE 0xFFFFFF21 +#define VNC_ENCODING_TYPE_LAST_RECT 0xFFFFFF20 +#define VNC_ENCODING_TYPE_POINTER_POS 0xFFFFFF18 +#define VNC_ENCODING_TYPE_RICH_CURSOR 0xFFFFFF11 +#define VNC_ENCODING_TYPE_X_CURSOR 0xFFFFFF10 +#define VNC_ENCODING_TYPE_RAW 0 +#define VNC_ENCODING_TYPE_COPY_RECT 1 +#define VNC_ENCODING_TYPE_RRE 2 +#define VNC_ENCODING_TYPE_CORRE 4 +#define VNC_ENCODING_TYPE_HEXTILE 5 +#define VNC_ENCODING_TYPE_ZLIB 6 +#define VNC_ENCODING_TYPE_TIGHT 7 +#define VNC_ENCODING_TYPE_ZLIBHEX 8 +#define VNC_ENCODING_TYPE_ULTRA 9 +#define VNC_ENCODING_TYPE_TRLE 15 +#define VNC_ENCODING_TYPE_RLE 16 +#define VNC_ENCODING_TYPE_HITACHI_ZYWRLE 17 +#define VNC_ENCODING_TYPE_JPEG_0 -32 +#define VNC_ENCODING_TYPE_JPEG_1 -31 +#define VNC_ENCODING_TYPE_JPEG_2 -30 +#define VNC_ENCODING_TYPE_JPEG_3 -29 +#define VNC_ENCODING_TYPE_JPEG_4 -28 +#define VNC_ENCODING_TYPE_JPEG_5 -27 +#define VNC_ENCODING_TYPE_JPEG_6 -26 +#define VNC_ENCODING_TYPE_JPEG_7 -25 +#define VNC_ENCODING_TYPE_JPEG_8 -24 +#define VNC_ENCODING_TYPE_JPEG_9 -23 +#define VNC_ENCODING_TYPE_COMPRESSION_0 0xFFFFFF00 +#define VNC_ENCODING_TYPE_COMPRESSION_1 0xFFFFFF01 +#define VNC_ENCODING_TYPE_COMPRESSION_2 0xFFFFFF02 +#define VNC_ENCODING_TYPE_COMPRESSION_3 0xFFFFFF03 +#define VNC_ENCODING_TYPE_COMPRESSION_4 0xFFFFFF04 +#define VNC_ENCODING_TYPE_COMPRESSION_5 0xFFFFFF05 +#define VNC_ENCODING_TYPE_COMPRESSION_6 0xFFFFFF06 +#define VNC_ENCODING_TYPE_COMPRESSION_7 0xFFFFFF07 +#define VNC_ENCODING_TYPE_COMPRESSION_8 0xFFFFFF08 +#define VNC_ENCODING_TYPE_COMPRESSION_9 0xFFFFFF09 +#define VNC_ENCODING_TYPE_WMVi 0x574D5669 +#define VNC_ENCODING_TYPE_CACHE 0xFFFF0000 +#define VNC_ENCODING_TYPE_CACHE_ENABLE 0xFFFF0001 +#define VNC_ENCODING_TYPE_XOR_ZLIB 0xFFFF0002 +#define VNC_ENCODING_TYPE_XOR_MONO_ZLIB 0xFFFF0003 +#define VNC_ENCODING_TYPE_XOR_MULTI_ZLIB 0xFFFF0004 +#define VNC_ENCODING_TYPE_SOLID_COLOR 0xFFFF0005 +#define VNC_ENCODING_TYPE_XOR_ENABLE 0xFFFF0006 +#define VNC_ENCODING_TYPE_CACHE_ZIP 0xFFFF0007 +#define VNC_ENCODING_TYPE_SOL_MONO_ZIP 0xFFFF0008 +#define VNC_ENCODING_TYPE_ULTRA_ZIP 0xFFFF0009 +#define VNC_ENCODING_TYPE_SERVER_STATE 0xFFFF8000 +#define VNC_ENCODING_TYPE_ENABLE_KEEP_ALIVE 0xFFFF8001 +#define VNC_ENCODING_TYPE_FTP_PROTO_VER 0xFFFF8002 +#define VNC_ENCODING_TYPE_POINTER_CHANGE -257 +#define VNC_ENCODING_TYPE_EXT_KEY_EVENT -258 +#define VNC_ENCODING_TYPE_AUDIO 259 +#define VNC_ENCODING_TYPE_DESKTOP_NAME -307 +#define VNC_ENCODING_TYPE_EXTENDED_DESK_SIZE -308 static const value_string encoding_types_vs[] = { { VNC_ENCODING_TYPE_DESKTOP_SIZE, "DesktopSize (pseudo)" }, -- cgit v1.2.3