aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorUlf Lamping <ulf.lamping@web.de>2005-08-20 15:58:42 +0000
committerUlf Lamping <ulf.lamping@web.de>2005-08-20 15:58:42 +0000
commit925489be0b01f952bf774c2162c430c087134271 (patch)
treeda8a668024c3393e41b60850c8bf9c4e8f855a50
parentc597abee5765d03cd01bde5f7a03e7decf3b5487 (diff)
removed MSVC warnings:
packet-camel.c(6829) : warning C4101: 'version_str' : unreferenced local variable packet-quakeworld.c(172) : warning C4090: 'return' : different 'const' qualifiers packet-smb.c(10859) : warning C4101: 'target_name_len' : unreferenced local variable packet-smb.c(10860) : warning C4101: 'fn_len' : unreferenced local variable packet-smb.c(10858) : warning C4101: 'fn' : unreferenced local variable svn path=/trunk/; revision=15474
-rw-r--r--epan/dissectors/packet-camel.c2
-rw-r--r--epan/dissectors/packet-quakeworld.c12
-rw-r--r--epan/dissectors/packet-smb.c6
3 files changed, 10 insertions, 10 deletions
diff --git a/epan/dissectors/packet-camel.c b/epan/dissectors/packet-camel.c
index 8b863647a6..4138d9c8e9 100644
--- a/epan/dissectors/packet-camel.c
+++ b/epan/dissectors/packet-camel.c
@@ -6826,7 +6826,7 @@ static guint8 camel_pdu_size = 0;
static int
dissect_camel_camelPDU(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) {
- char *version_ptr, *version_str;
+ char *version_ptr /*, *version_str*/;
opcode = 0;
application_context_version = 0;
diff --git a/epan/dissectors/packet-quakeworld.c b/epan/dissectors/packet-quakeworld.c
index 20a1712115..058b4e7ddb 100644
--- a/epan/dissectors/packet-quakeworld.c
+++ b/epan/dissectors/packet-quakeworld.c
@@ -165,7 +165,7 @@ Cmd_Argc(void)
}
-static char*
+static const char*
Cmd_Argv(int arg)
{
if ( arg >= cmd_argc )
@@ -397,8 +397,8 @@ dissect_quakeworld_ConnectionlessPacket(tvbuff_t *tvb, packet_info *pinfo,
}
if (direction == DIR_C2S) {
- /* client to sever commands */
- char *c;
+ /* client to server commands */
+ const char *c;
Cmd_TokenizeString(text);
c = Cmd_Argv(0);
@@ -417,7 +417,7 @@ dissect_quakeworld_ConnectionlessPacket(tvbuff_t *tvb, packet_info *pinfo,
int version;
int qport;
int challenge;
- char *infostring;
+ const char *infostring;
proto_item *argument_item = NULL;
proto_tree *argument_tree = NULL;
proto_item *info_item = NULL;
@@ -467,7 +467,7 @@ dissect_quakeworld_ConnectionlessPacket(tvbuff_t *tvb, packet_info *pinfo,
info_tree = proto_item_add_subtree(
info_item, ett_quakeworld_connectionless_connect_infostring);
dissect_id_infostring(tvb, info_tree, offset + Cmd_Argv_start(4),
- infostring,
+ /* XXX - this cast is ugly! */ (char *) infostring,
ett_quakeworld_connectionless_connect_infostring_key_value,
hf_quakeworld_connectionless_connect_infostring_key_value,
hf_quakeworld_connectionless_connect_infostring_key,
@@ -477,7 +477,7 @@ dissect_quakeworld_ConnectionlessPacket(tvbuff_t *tvb, packet_info *pinfo,
strcpy(command, "Get Challenge");
command_len = Cmd_Argv_length(0);
} else if (strcmp(c,"rcon") == 0) {
- char* password;
+ const char* password;
int i;
char remaining[MAX_TEXT_SIZE+1];
proto_item *argument_item = NULL;
diff --git a/epan/dissectors/packet-smb.c b/epan/dissectors/packet-smb.c
index 245bfd6670..460e2b7356 100644
--- a/epan/dissectors/packet-smb.c
+++ b/epan/dissectors/packet-smb.c
@@ -10855,9 +10855,9 @@ dissect_disposition_info(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree
int offset, guint16 *bcp, gboolean *trunc)
{
smb_info_t *si = pinfo->private_data;
- const char *fn;
- guint32 target_name_len;
- int fn_len;
+/* const char *fn;*/
+/* guint32 target_name_len;*/
+/* int fn_len;*/
DISSECTOR_ASSERT(si);