diff options
| author | jmayer <jmayer@f5534014-38df-0310-8fa8-9805f1628bb7> | 2003-03-10 02:06:33 +0000 |
|---|---|---|
| committer | jmayer <jmayer@f5534014-38df-0310-8fa8-9805f1628bb7> | 2003-03-10 02:06:33 +0000 |
| commit | 56003a17583bfae9d95115c95aa71723da8ec023 (patch) | |
| tree | 56248b6d86fe23aaa713869db0ed67f682825bb5 /packet-ssl.c | |
| parent | f6416665f82083a84267bf39b5ef558e2ee392b6 (diff) | |
Pointer <--> int converions cause warnings on ia64.
Modified a patch originally contained in the SuSE distro
to do the conversions via glib macros.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@7330 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'packet-ssl.c')
| -rw-r--r-- | packet-ssl.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/packet-ssl.c b/packet-ssl.c index 2eeb74b9ca..b144e5c68c 100644 --- a/packet-ssl.c +++ b/packet-ssl.c @@ -2,7 +2,7 @@ * Routines for ssl dissection * Copyright (c) 2000-2001, Scott Renfro <scott@renfro.org> * - * $Id: packet-ssl.c,v 1.25 2003/01/27 19:50:05 guy Exp $ + * $Id: packet-ssl.c,v 1.26 2003/03/10 02:06:31 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -611,7 +611,7 @@ dissect_ssl(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) conv_data = conversation_get_proto_data(conversation, proto_ssl); if (conv_data != NULL) { - conv_version = (guint)conv_data; + conv_version = GPOINTER_TO_UINT(conv_data); } /* Initialize the protocol column; we'll set it later when we @@ -743,7 +743,7 @@ dissect_ssl(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) * this conversation, do so. */ if (conv_data == NULL) { - conv_data = (void *)conv_version; + conv_data = GINT_TO_POINTER(conv_version); conversation_add_proto_data(conversation, proto_ssl, conv_data); } @@ -2211,7 +2211,7 @@ ssl_set_conv_version(packet_info *pinfo, guint version) /* get rid of the current data */ conversation_delete_proto_data(conversation, proto_ssl); } - conversation_add_proto_data(conversation, proto_ssl, (void *)version); + conversation_add_proto_data(conversation, proto_ssl, GINT_TO_POINTER(version)); } static int |