diff options
| author | Ulf Lamping <ulf.lamping@web.de> | 2004-12-24 23:17:38 +0000 |
|---|---|---|
| committer | Ulf Lamping <ulf.lamping@web.de> | 2004-12-24 23:17:38 +0000 |
| commit | dc0fc1896e6fd6760ce052ed522a5ae010b211ce (patch) | |
| tree | b4f33735858274052bfa0521e5d785c53a9a8def /epan | |
| parent | ed556cd7c4940403a6326ad790bc1353e958ae21 (diff) | |
use GLib's pointer to int conversion macros to prevent compiler warnings
svn path=/trunk/; revision=12830
Diffstat (limited to 'epan')
| -rw-r--r-- | epan/dissectors/packet-dcerpc.c | 4 | ||||
| -rw-r--r-- | epan/dissectors/packet-dcm.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/epan/dissectors/packet-dcerpc.c b/epan/dissectors/packet-dcerpc.c index abd38946af..2e33fedc72 100644 --- a/epan/dissectors/packet-dcerpc.c +++ b/epan/dissectors/packet-dcerpc.c @@ -860,14 +860,14 @@ static guint dcerpc_cn_call_hash (gconstpointer k) { const dcerpc_cn_call_key *key = (const dcerpc_cn_call_key *)k; - return ((guint32)key->conv) + key->call_id + key->smb_fid; + return GPOINTER_TO_UINT(key->conv) + key->call_id + key->smb_fid; } static guint dcerpc_dg_call_hash (gconstpointer k) { const dcerpc_dg_call_key *key = (const dcerpc_dg_call_key *)k; - return (((guint32)key->conv) + key->seqnum + key->act_id.Data1 + return (GPOINTER_TO_UINT(key->conv) + key->seqnum + key->act_id.Data1 + (key->act_id.Data2 << 16) + key->act_id.Data3 + (key->act_id.Data4[0] << 24) + (key->act_id.Data4[1] << 16) + (key->act_id.Data4[2] << 8) + (key->act_id.Data4[3] << 0) diff --git a/epan/dissectors/packet-dcm.c b/epan/dissectors/packet-dcm.c index 32fca4c9bf..9f06251440 100644 --- a/epan/dissectors/packet-dcm.c +++ b/epan/dissectors/packet-dcm.c @@ -263,7 +263,7 @@ dcm_init(void) unsigned int i; dcm_tagTable = g_hash_table_new(NULL, NULL); for (i = 0; i < sizeof(tagData) / sizeof(dcmTag_t); i++) - g_hash_table_insert(dcm_tagTable, (gpointer)tagData[i].tag, + g_hash_table_insert(dcm_tagTable, GINT_TO_POINTER(tagData[i].tag), (gpointer) (tagData+i)); } } @@ -504,7 +504,7 @@ dcm_tag2str(guint16 grp, guint16 elm, guint8 syntax, tvbuff_t *tvb, int offset, return buf; } tag = (grp << 16) | elm; - if (NULL == (dtag = g_hash_table_lookup(dcm_tagTable, (gconstpointer) tag))) + if (NULL == (dtag = g_hash_table_lookup(dcm_tagTable, GUINT_TO_POINTER(tag)))) dtag = &utag; strcpy(buf, dtag->desc); |