diff options
| author | Bill Meier <wmeier@newsguy.com> | 2013-03-20 01:18:10 +0000 |
|---|---|---|
| committer | Bill Meier <wmeier@newsguy.com> | 2013-03-20 01:18:10 +0000 |
| commit | 0df5a9390d41149dfc87440d72e7669ba96748ec (patch) | |
| tree | 8accf4dfc301adfc679ed7f21b7123cb4b2c55f9 /epan/circuit.c | |
| parent | a43e5a7eb9fe1ad5a89e7cfd556a791a50fefee7 (diff) | |
From beroset:
remove C++ incompatibilities
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8416 attachment #10397
svn path=/trunk/; revision=48438
Diffstat (limited to 'epan/circuit.c')
| -rw-r--r-- | epan/circuit.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/epan/circuit.c b/epan/circuit.c index daf6423685..4ea8fab477 100644 --- a/epan/circuit.c +++ b/epan/circuit.c @@ -115,11 +115,11 @@ circuit_new(circuit_type ctype, guint32 circuit_id, guint32 first_frame) circuit_t *circuit, *old_circuit; circuit_key *new_key; - new_key = se_alloc(sizeof(struct circuit_key)); + new_key = se_new(struct circuit_key); new_key->ctype = ctype; new_key->circuit_id = circuit_id; - circuit = se_alloc(sizeof(circuit_t)); + circuit = se_new(circuit_t); circuit->next = NULL; circuit->first_frame = first_frame; circuit->last_frame = 0; /* not known yet */ @@ -133,7 +133,7 @@ circuit_new(circuit_type ctype, guint32 circuit_id, guint32 first_frame) /* * Is there already a circuit with this circuit ID? */ - old_circuit = g_hash_table_lookup(circuit_hashtable, new_key); + old_circuit = (circuit_t *)g_hash_table_lookup(circuit_hashtable, new_key); if (old_circuit != NULL) { /* * Yes. Find the last circuit in the list of circuits @@ -179,7 +179,7 @@ find_circuit(circuit_type ctype, guint32 circuit_id, guint32 frame) * OK, search the list of circuits with that type and ID for * a circuit whose range of frames includes that frame number. */ - for (circuit = g_hash_table_lookup(circuit_hashtable, &key); + for (circuit = (circuit_t *)g_hash_table_lookup(circuit_hashtable, &key); circuit != NULL; circuit = circuit->next) { /* * The circuit includes that frame number if: @@ -227,7 +227,7 @@ p_compare(gconstpointer a, gconstpointer b) void circuit_add_proto_data(circuit_t *conv, int proto, void *proto_data) { - circuit_proto_data *p1 = se_alloc(sizeof(circuit_proto_data)); + circuit_proto_data *p1 = se_new(circuit_proto_data); p1->proto = proto; p1->proto_data = proto_data; |