diff options
| author | Jörg Mayer <jmayer@loplof.de> | 2007-03-28 03:55:27 +0000 |
|---|---|---|
| committer | Jörg Mayer <jmayer@loplof.de> | 2007-03-28 03:55:27 +0000 |
| commit | 9de252158ee8618114b4e230e042e84a2d786184 (patch) | |
| tree | 21cd94183605e6d4ab07964311a67d8918b4db80 /epan | |
| parent | fa3af74ba7170a0e76ce9dd56f29c1f553c71b4a (diff) | |
warning fixes
svn path=/trunk/; revision=21239
Diffstat (limited to 'epan')
| -rw-r--r-- | epan/dissectors/packet-h263.c | 11 | ||||
| -rw-r--r-- | epan/dissectors/packet-mpeg-pes.c | 2 |
2 files changed, 6 insertions, 7 deletions
diff --git a/epan/dissectors/packet-h263.c b/epan/dissectors/packet-h263.c index 13db67b5d5..c1ff6d0ff6 100644 --- a/epan/dissectors/packet-h263.c +++ b/epan/dissectors/packet-h263.c @@ -327,7 +327,7 @@ dissect_h263( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree ) #define cVALS(x) (const value_string*)(x) -proto_item * +static proto_item * h263_proto_tree_add_bits(proto_tree *tree, int hf_index, tvbuff_t *tvb, gint bit_offset, gint no_of_bits) { gint offset; @@ -344,7 +344,6 @@ h263_proto_tree_add_bits(proto_tree *tree, int hf_index, tvbuff_t *tvb, gint bit guint32 mask32 = 0xffffffff; guint8 shift; int i; - const char *format = NULL; if((bit_offset&0x7)==0) is_bytealigned = TRUE; @@ -440,7 +439,7 @@ h263_proto_tree_add_bits(proto_tree *tree, int hf_index, tvbuff_t *tvb, gint bit /* prepare the string */ str=ep_alloc(256); - g_snprintf(str, 256, ""); + str[0]='0'; for(bit=0;bit<((int)(bit_offset&0x07));bit++){ if(bit&&(!(bit%4))){ strcat(str, " "); @@ -494,7 +493,7 @@ h263_proto_tree_add_bits(proto_tree *tree, int hf_index, tvbuff_t *tvb, gint bit return proto_tree_add_uint_format(tree, hf_index, tvb, offset, length, value, "%s: %s", str, - val_to_str(value, cVALS(hfinfo->strings), "Unknown"), value); + val_to_str(value, cVALS(hfinfo->strings), "Unknown")); } switch(hfinfo->display){ case BASE_DEC: @@ -520,8 +519,8 @@ h263_proto_tree_add_bits(proto_tree *tree, int hf_index, tvbuff_t *tvb, gint bit /* * Length is used for the "Extra header" otherwise set to -1. */ -int -dissect_h263_picture_layer( tvbuff_t *tvb, proto_tree *tree, gint offset, gint length, gboolean is_rfc4626) +static int +dissect_h263_picture_layer( tvbuff_t *tvb, proto_tree *tree, gint offset, gint length _U_, gboolean is_rfc4626) { proto_tree *h263_opptype_tree = NULL; proto_item *opptype_item = NULL; diff --git a/epan/dissectors/packet-mpeg-pes.c b/epan/dissectors/packet-mpeg-pes.c index f89d697f6a..44e09c4fc0 100644 --- a/epan/dissectors/packet-mpeg-pes.c +++ b/epan/dissectors/packet-mpeg-pes.c @@ -605,7 +605,7 @@ enum { STREAM_PADDING = 0xbe, STREAM_PRIVATE2 = 0xbf, STREAM_AUDIO = 0xc0, - STREAM_VIDEO = 0xe0, + STREAM_VIDEO = 0xe0 }; void |