diff options
| author | Guy Harris <guy@alum.mit.edu> | 2004-12-20 22:13:48 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2004-12-20 22:13:48 +0000 |
| commit | e20d80ea570eec39cd3426cead33af107c489e16 (patch) | |
| tree | 08ad1422643e822657858922e5aa4b42c2017da7 /epan/dissectors/packet-image-gif.c | |
| parent | 8e36c366f86f385c2eb1b3f0b32033350750691b (diff) | |
Use "plurality()" rather than locally-defined "PLURALIZE()" macros, and
get rid of the definition of "PLURALIZE()" in modules that don't use it.
svn path=/trunk/; revision=12791
Diffstat (limited to 'epan/dissectors/packet-image-gif.c')
| -rw-r--r-- | epan/dissectors/packet-image-gif.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/epan/dissectors/packet-image-gif.c b/epan/dissectors/packet-image-gif.c index c58d5f5a56..1d93eb14d3 100644 --- a/epan/dissectors/packet-image-gif.c +++ b/epan/dissectors/packet-image-gif.c @@ -66,8 +66,6 @@ #define DebugLog(x) ; #endif -#define PLURALIZE(x) ((x) == 1 ? "" : "s") - #define IMG_GIF "image-gif" /************************** Variable declarations **************************/ @@ -227,8 +225,8 @@ dissect_gif(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) proto_item_append_text(ti, " (Global color table present)"); proto_item_append_text(ti, " (%u bit%s per color) (%u bit%s per pixel)", - color_resolution, PLURALIZE(color_resolution), - image_bpp, PLURALIZE(image_bpp)); + color_resolution, plurality(color_resolution, "", "s"), + image_bpp, plurality(image_bpp, "", "s")); subtree = proto_item_add_subtree(ti, ett_global_flags); proto_tree_add_item(subtree, hf_global_color_map_present, tvb, 10, 1, TRUE); @@ -392,8 +390,8 @@ dissect_gif(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) proto_item_append_text(ti2, " (Local color table present)"); proto_item_append_text(ti2, " (%u bit%s per color) (%u bit%s per pixel)", - color_resolution, PLURALIZE(color_resolution), - image_bpp, PLURALIZE(image_bpp)); + color_resolution, plurality(color_resolution, "", "s"), + image_bpp, plurality(image_bpp, "", "s")); subtree2 = proto_item_add_subtree(ti2, ett_local_flags); proto_tree_add_item(subtree2, hf_local_color_map_present, tvb, offset, 1, TRUE); |