osmocom
/
wireshark
14
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Apply yet another set of the optimization patches: 

there's two structures with the same name conversation_t, change one to conv_t

svn path=/trunk/; revision=23423
This commit is contained in:
Anders Broman 2007-11-10 16:09:10 +00:00
parent 03c7a3c920
commit 4093b817c6
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
gtk/conversations_fc.c
View File

@ -39,6 +39,7 @@
#include <epan/tap.h>
#include "../register.h"
#include "conversations_table.h"
#include <epan/conversation.h>
#include <epan/dissectors/packet-scsi.h>
#include <epan/dissectors/packet-fc.h>

10
gtk/conversations_table.c
View File

@ -341,8 +341,8 @@ ct_sort_column(GtkCList *clist, gconstpointer ptr1, gconstpointer ptr2)
{
guint32 idx1, idx2;
conversations_table *ct = OBJECT_GET_DATA(clist, CONV_PTR_KEY);
conversation_t *conv1 = NULL;
conversation_t *conv2 = NULL;
conv_t *conv1 = NULL;
conv_t *conv2 = NULL;
const GtkCListRow *row1 = ptr1;
const GtkCListRow *row2 = ptr2;
@ -1568,7 +1568,7 @@ add_conversation_table_data(conversations_table *ct, const address *src, const a
{
const address *addr1, *addr2;
guint32 port1, port2;
conversation_t *conversation=NULL;
conv_t *conversation=NULL;
int conversation_idx=0;
gboolean new_conversation;
@ -1600,7 +1600,7 @@ add_conversation_table_data(conversations_table *ct, const address *src, const a
instead of just one */
/* if we dont have any entries at all yet */
if(ct->conversations==NULL){
ct->conversations=g_malloc(sizeof(conversation_t));
ct->conversations=g_malloc(sizeof(conv_t));
ct->num_conversations=1;
conversation=&ct->conversations[0];
conversation_idx=0;
@ -1629,7 +1629,7 @@ add_conversation_table_data(conversations_table *ct, const address *src, const a
if(conversation==NULL){
new_conversation=TRUE;
ct->num_conversations++;
ct->conversations=g_realloc(ct->conversations, ct->num_conversations*sizeof(conversation_t));
ct->conversations=g_realloc(ct->conversations, ct->num_conversations*sizeof(conv_t));
conversation=&ct->conversations[ct->num_conversations-1];
conversation_idx=ct->num_conversations-1;
}

4
gtk/conversations_table.h
View File

@ -43,7 +43,7 @@ typedef struct _conversation_t {
guint64 tx_frames; /**< number of transmitted packets */
guint64 rx_bytes; /**< number of received bytes */
guint64 tx_bytes; /**< number of transmitted bytes */
} conversation_t;
} conv_t;
/** Conversation widget */
typedef struct _conversations_table {
@ -57,7 +57,7 @@ typedef struct _conversations_table {
GtkWidget *menu; /**< context menu */
gboolean has_ports; /**< table has ports */
guint32 num_conversations; /**< number of conversations */
conversation_t *conversations; /**< array of conversation values */
conv_t *conversations; /**< array of conversation values */
gboolean resolve_names; /**< resolve address names? */
} conversations_table;