diff options
| author | Jörg Mayer <jmayer@loplof.de> | 2007-03-09 13:14:09 +0000 |
|---|---|---|
| committer | Jörg Mayer <jmayer@loplof.de> | 2007-03-09 13:14:09 +0000 |
| commit | fb820f0a07833637cf8bc50c43069af44e4f72df (patch) | |
| tree | 79ff79525a9df4f1ffbec0be7b74ec11f519b1ba /epan/dissectors/packet-vnc.c | |
| parent | 147d66441ea9830df3545ef86b2296367aa71ed6 (diff) | |
GCC warning fixes
epan/dissectors/
packet-bctp.c:
no newline at end of file
packet-epl.c:
C++ style comments are not allowed in ISO C90
packet-sccp.c:
missing initializer
packet-sccp.h:
comma at end of enumerator list
packet-sctp.c:
suggest parentheses around assignment used as truth value
packet-vnc.c:
control reaches end of non-void function
pointer targets in passing argument 1 of 'g_strtod' differ in
signedness
pointer targets in passing argument 3 of 'vnc_client_to_server'
differ in signedness
gtk/
main.c:
C++ style comments are not allowed in ISO C90
u3.h:
function declaration isn't a prototype
Other (trivial) stuff
packet-sccp.h:
Add svn properties
svn path=/trunk/; revision=21011
Diffstat (limited to 'epan/dissectors/packet-vnc.c')
| -rw-r--r-- | epan/dissectors/packet-vnc.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/epan/dissectors/packet-vnc.c b/epan/dissectors/packet-vnc.c index 7583f2758c..8abd9e7864 100644 --- a/epan/dissectors/packet-vnc.c +++ b/epan/dissectors/packet-vnc.c @@ -379,7 +379,7 @@ dissect_vnc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) guint8 num_security_types; guint32 text_len; /* Part of: Client Cut Text & Server Cut Text */ guint32 auth_result, desktop_name_len; - guint offset = 0; + gint offset = 0; /* Set up structures needed to add the protocol subtree and manage it */ proto_item *ti=NULL; @@ -506,7 +506,7 @@ dissect_vnc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree_add_item(vnc_tree, hf_vnc_server_proto_ver, tvb, 4, 7, FALSE); per_conversation_info->server_proto_ver = - g_strtod(tvb_get_ephemeral_string(tvb, 4, 7), NULL); + g_strtod((char *)tvb_get_ephemeral_string(tvb, 4, 7), NULL); if (check_col(pinfo->cinfo, COL_INFO)) col_add_fstr(pinfo->cinfo, COL_INFO, @@ -519,7 +519,7 @@ dissect_vnc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree_add_item(vnc_tree, hf_vnc_client_proto_ver, tvb, 4, 7, FALSE); per_conversation_info->client_proto_ver = - g_strtod(tvb_get_ephemeral_string(tvb, 4, 7), NULL); + g_strtod((char *)tvb_get_ephemeral_string(tvb, 4, 7), NULL); if (check_col(pinfo->cinfo, COL_INFO)) col_add_fstr(pinfo->cinfo, COL_INFO, @@ -1524,6 +1524,7 @@ vnc_server_set_colormap_entries(tvbuff_t *tvb, packet_info *pinfo, gint *offset, *offset, 2, FALSE); *offset += 2; } + return *offset; } @@ -1558,6 +1559,8 @@ vnc_server_cut_text(tvbuff_t *tvb, packet_info *pinfo, gint *offset, proto_tree_add_item(tree, hf_vnc_server_cut_text, tvb, *offset, text_len, FALSE); *offset += text_len; + + return *offset; } |