diff options
| author | Martin Kaiser <wireshark@kaiser.cx> | 2013-12-20 15:02:23 +0000 |
|---|---|---|
| committer | Martin Kaiser <wireshark@kaiser.cx> | 2013-12-20 15:02:23 +0000 |
| commit | 73f1356275a2001a569a9d88016ce3efacd431fe (patch) | |
| tree | e41adb10001c3e49933fc340889728d4531d22a0 | |
| parent | 0f599602199354dcda816ca64adb4feb1f372991 (diff) | |
| download | wireshark-73f1356275a2001a569a9d88016ce3efacd431fe.tar.gz | |
use small negative values for the error defines
(such constants are signed ints by default)
svn path=/trunk/; revision=54300
| -rw-r--r-- | epan/dvb_chartbl.c | 2 | ||||
| -rw-r--r-- | epan/dvb_chartbl.h | 51 |
2 files changed, 26 insertions, 27 deletions
diff --git a/epan/dvb_chartbl.c b/epan/dvb_chartbl.c index f0a611bfaf..8f979c61c3 100644 --- a/epan/dvb_chartbl.c +++ b/epan/dvb_chartbl.c @@ -36,7 +36,7 @@ static const value_string dvb_string_encoding_vals[] = { { DVB_ENCODING_INVALID, "Incorrect length for encoding" }, { DVB_ENCODING_RESERVED, "Reserved for future use" }, - { DVB_ENCODING_UNKNOWN, "Value not specified by spec" }, + { DVB_ENCODING_UNKNOWN, "Unknown/undefined encoding" }, { DVB_ENCODING_LATIN, "Latin (default table)" }, diff --git a/epan/dvb_chartbl.h b/epan/dvb_chartbl.h index 5b2457323a..6c2941026b 100644 --- a/epan/dvb_chartbl.h +++ b/epan/dvb_chartbl.h @@ -36,34 +36,33 @@ extern "C" { #endif /* __cplusplus */ typedef enum { + DVB_ENCODING_INVALID = -3, /* length invalid */ + DVB_ENCODING_RESERVED = -2, /* reserved by spec */ + DVB_ENCODING_UNKNOWN = -1, /* not defined by spec */ - DVB_ENCODING_LATIN = 0, - /* these defines don't have to match with the values - from the DVB-SI specification */ - DVB_ENCODING_ISO_8859_1, - DVB_ENCODING_ISO_8859_2, - DVB_ENCODING_ISO_8859_3, - DVB_ENCODING_ISO_8859_4, - DVB_ENCODING_ISO_8859_5, - DVB_ENCODING_ISO_8859_6, - DVB_ENCODING_ISO_8859_7, - DVB_ENCODING_ISO_8859_8, - DVB_ENCODING_ISO_8859_9, - DVB_ENCODING_ISO_8859_10, - DVB_ENCODING_ISO_8859_11, - DVB_ENCODING_ISO_8859_13, - DVB_ENCODING_ISO_8859_14, - DVB_ENCODING_ISO_8859_15, + DVB_ENCODING_LATIN = 0, + /* these defines don't have to match with the values + from the DVB-SI specification */ + DVB_ENCODING_ISO_8859_1, + DVB_ENCODING_ISO_8859_2, + DVB_ENCODING_ISO_8859_3, + DVB_ENCODING_ISO_8859_4, + DVB_ENCODING_ISO_8859_5, + DVB_ENCODING_ISO_8859_6, + DVB_ENCODING_ISO_8859_7, + DVB_ENCODING_ISO_8859_8, + DVB_ENCODING_ISO_8859_9, + DVB_ENCODING_ISO_8859_10, + DVB_ENCODING_ISO_8859_11, + DVB_ENCODING_ISO_8859_13, + DVB_ENCODING_ISO_8859_14, + DVB_ENCODING_ISO_8859_15, - DVB_ENCODING_ISO_10646_BMP, - DVB_ENCODING_KSX_1001, - DVB_ENCODING_GB_2312, - DVB_ENCODING_ISO_10646_BIG5, - DVB_ENCODING_ISO_10646_UTF8_BMP, - - DVB_ENCODING_INVALID = G_MAXUINT32-3, /* length invalid */ - DVB_ENCODING_RESERVED = G_MAXUINT32-2, /* reserved by spec */ - DVB_ENCODING_UNKNOWN = G_MAXUINT32-1, /* not defined by spec */ + DVB_ENCODING_ISO_10646_BMP, + DVB_ENCODING_KSX_1001, + DVB_ENCODING_GB_2312, + DVB_ENCODING_ISO_10646_BIG5, + DVB_ENCODING_ISO_10646_UTF8_BMP, } dvb_encoding_e; WS_DLL_PUBLIC |