diff options
| author | Guy Harris <guy@alum.mit.edu> | 2007-09-26 00:41:00 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2007-09-26 00:41:00 +0000 |
| commit | cd4d203af2a6156715d058ad25046c3c20382901 (patch) | |
| tree | ea783f85c21dbc54910c66222e50a4abfb6e749f | |
| parent | a0adcc7e2cb81a295ef8ba932e157f3e288b23d7 (diff) | |
Don't use
case N ... M:
as that's not supported by all compilers.
Say so in the Portability section of README.developer, in the hopes of
discouraging others from using that GCCism.
svn path=/trunk/; revision=22976
| -rw-r--r-- | doc/README.developer | 6 | ||||
| -rw-r--r-- | epan/dissectors/packet-dcp.c | 15 |
2 files changed, 13 insertions, 8 deletions
diff --git a/doc/README.developer b/doc/README.developer index 0befb17a01..fdaee44876 100644 --- a/doc/README.developer +++ b/doc/README.developer @@ -346,6 +346,12 @@ or something such as #define DBG(args) printf args +Don't use + + case N ... M: + +as that's not supported by all compilers. + snprintf() -> g_snprintf() snprintf() is not available on all platforms, so it's a good idea to use the g_snprintf() function declared by <glib.h> instead. diff --git a/epan/dissectors/packet-dcp.c b/epan/dissectors/packet-dcp.c index ab9142e234..c3ab27889a 100644 --- a/epan/dissectors/packet-dcp.c +++ b/epan/dissectors/packet-dcp.c @@ -336,15 +336,14 @@ static void dissect_feature_options(proto_tree *dcp_options_tree, tvbuff_t *tvb, proto_item_append_text(dcp_item, " %" G_GINT64_MODIFIER "u", tvb_get_ntoh_var(tvb, offset + 3, option_len - 3)); break; /* Reserved, specific, or unknown features */ - case 0: /* fall through */ - case 10 ... 127: - proto_item_append_text(dcp_item, "Reserved feature number %d", feature_number); - break; - case 193 ... 255: - proto_item_append_text(dcp_item, "CCID-specific feature number %d", feature_number); - break; default: - proto_item_append_text(dcp_item, "Unknown feature number %d", feature_number); + if (feature_number == 0 || + (feature_number >= 10 && feature_number <= 127)) + proto_item_append_text(dcp_item, "Reserved feature number %d", feature_number); + else if (feature_number >= 193 && feature_number <= 255) + proto_item_append_text(dcp_item, "CCID-specific feature number %d", feature_number); + else + proto_item_append_text(dcp_item, "Unknown feature number %d", feature_number); break; } proto_item_append_text(dcp_item, ")"); |