aboutsummaryrefslogtreecommitdiffstats
path: root/ui
diff options
context:
space:
mode:
authorAlexis La Goutte <alexis.lagoutte@gmail.com>2014-06-16 18:49:46 +0200
committerGraham Bloice <graham.bloice@trihedral.com>2014-06-16 17:08:57 +0000
commitb71b68cd637de5501de9d5684c79b6c8b5b2dfd3 (patch)
treef7e051fec71a0badf80c964e9dd33fc633677cbc /ui
parentfaac494d989951d0995da00ea31e5b66511ae0d0 (diff)
Fix indent (Use 4spaces like end of the file and modelines info
Change-Id: I80e0193240032e62c685c5b976df921ea1e6a581 Reviewed-on: https://code.wireshark.org/review/2251 Reviewed-by: Graham Bloice <graham.bloice@trihedral.com> Tested-by: Graham Bloice <graham.bloice@trihedral.com>
Diffstat (limited to 'ui')
-rw-r--r--ui/gtk/conversation_hastables_dlg.c184
1 files changed, 92 insertions, 92 deletions
diff --git a/ui/gtk/conversation_hastables_dlg.c b/ui/gtk/conversation_hastables_dlg.c
index 072d38b401..6cb8c8f775 100644
--- a/ui/gtk/conversation_hastables_dlg.c
+++ b/ui/gtk/conversation_hastables_dlg.c
@@ -58,81 +58,81 @@ static GtkWidget *conversation_hastables_dlg_w = NULL;
static guint
conversation_hash_exact(gconstpointer v)
{
- const conversation_key *key = (const conversation_key *)v;
- guint hash_val;
- int i;
- const guint8 *ADD_ADDRESS_TO_HASH_data;
+ const conversation_key *key = (const conversation_key *)v;
+ guint hash_val;
+ int i;
+ const guint8 *ADD_ADDRESS_TO_HASH_data;
- hash_val = 0;
+ hash_val = 0;
#if 0
- ADD_ADDRESS_TO_HASH(hash_val, &key->addr1);
- hash_val += key->port1;
- ADD_ADDRESS_TO_HASH(hash_val, &key->addr2);
- hash_val += key->port2;
+ ADD_ADDRESS_TO_HASH(hash_val, &key->addr1);
+ hash_val += key->port1;
+ ADD_ADDRESS_TO_HASH(hash_val, &key->addr2);
+ hash_val += key->port2;
- return hash_val;
+ return hash_val;
#endif
- for ( i = 0; i < key->addr1.len; i++ ) {
- ADD_ADDRESS_TO_HASH_data = (const guint8 *)((&key->addr1)->data);
- hash_val += ADD_ADDRESS_TO_HASH_data[i];
- hash_val += ( hash_val << 10 );
- hash_val ^= ( hash_val >> 6 );
- }
-
- for ( i = 0; i < 4; i++ ) {
- ADD_ADDRESS_TO_HASH_data = (const guint8 *)(&key->port1);
- hash_val += ADD_ADDRESS_TO_HASH_data[i];
- hash_val += ( hash_val << 10 );
- hash_val ^= ( hash_val >> 6 );
- }
-
- for ( i = 0; i < key->addr2.len; i++ ) {
- ADD_ADDRESS_TO_HASH_data = (const guint8 *)((&key->addr2)->data);
- hash_val += ADD_ADDRESS_TO_HASH_data[i];
- hash_val += ( hash_val << 10 );
- hash_val ^= ( hash_val >> 6 );
- }
-
- for ( i = 0; i < 4; i++ ) {
- ADD_ADDRESS_TO_HASH_data = (const guint8 *)(&key->port2);
- hash_val += ADD_ADDRESS_TO_HASH_data[i];
- hash_val += ( hash_val << 10 );
- hash_val ^= ( hash_val >> 6 );
- }
-
- hash_val += ( hash_val << 3 );
- hash_val ^= ( hash_val >> 11 );
- hash_val += ( hash_val << 15 );
-
- return hash_val;
+ for ( i = 0; i < key->addr1.len; i++ ) {
+ ADD_ADDRESS_TO_HASH_data = (const guint8 *)((&key->addr1)->data);
+ hash_val += ADD_ADDRESS_TO_HASH_data[i];
+ hash_val += ( hash_val << 10 );
+ hash_val ^= ( hash_val >> 6 );
+ }
+
+ for ( i = 0; i < 4; i++ ) {
+ ADD_ADDRESS_TO_HASH_data = (const guint8 *)(&key->port1);
+ hash_val += ADD_ADDRESS_TO_HASH_data[i];
+ hash_val += ( hash_val << 10 );
+ hash_val ^= ( hash_val >> 6 );
+ }
+
+ for ( i = 0; i < key->addr2.len; i++ ) {
+ ADD_ADDRESS_TO_HASH_data = (const guint8 *)((&key->addr2)->data);
+ hash_val += ADD_ADDRESS_TO_HASH_data[i];
+ hash_val += ( hash_val << 10 );
+ hash_val ^= ( hash_val >> 6 );
+ }
+
+ for ( i = 0; i < 4; i++ ) {
+ ADD_ADDRESS_TO_HASH_data = (const guint8 *)(&key->port2);
+ hash_val += ADD_ADDRESS_TO_HASH_data[i];
+ hash_val += ( hash_val << 10 );
+ hash_val ^= ( hash_val >> 6 );
+ }
+
+ hash_val += ( hash_val << 3 );
+ hash_val ^= ( hash_val >> 11 );
+ hash_val += ( hash_val << 15 );
+
+ return hash_val;
}
static guint
conversation_hash_exact_old(gconstpointer v)
{
- const conversation_key *key = (const conversation_key *)v;
- guint hash_val;
+ const conversation_key *key = (const conversation_key *)v;
+ guint hash_val;
- hash_val = 0;
- ADD_ADDRESS_TO_HASH(hash_val, &key->addr1);
- hash_val += key->port1;
- ADD_ADDRESS_TO_HASH(hash_val, &key->addr2);
- hash_val += key->port2;
+ hash_val = 0;
+ ADD_ADDRESS_TO_HASH(hash_val, &key->addr1);
+ hash_val += key->port1;
+ ADD_ADDRESS_TO_HASH(hash_val, &key->addr2);
+ hash_val += key->port2;
- return hash_val;
+ return hash_val;
}
static void
conversation_hashtable_exact_to_texbuff(gpointer key, gpointer value _U_, gpointer user_data)
{
- gchar string_buff[CONV_STR_BUF_MAX];
- GtkTextBuffer *buffer = (GtkTextBuffer*)user_data;
- /*conversation_t *conversation = (conversation_t *)value;*/
- conversation_key *conv_key = (conversation_key*)key;
+ gchar string_buff[CONV_STR_BUF_MAX];
+ GtkTextBuffer *buffer = (GtkTextBuffer*)user_data;
+ /*conversation_t *conversation = (conversation_t *)value;*/
+ conversation_key *conv_key = (conversation_key*)key;
- g_snprintf(string_buff, CONV_STR_BUF_MAX, "Key:0x%x old key:0x%x\n",conversation_hash_exact(conv_key),conversation_hash_exact_old(conv_key));
+ g_snprintf(string_buff, CONV_STR_BUF_MAX, "Key:0x%x old key:0x%x\n",conversation_hash_exact(conv_key),conversation_hash_exact_old(conv_key));
- gtk_text_buffer_insert_at_cursor (buffer, string_buff, -1);
+ gtk_text_buffer_insert_at_cursor (buffer, string_buff, -1);
}
@@ -140,45 +140,45 @@ static void
conversation_info_to_texbuff(GtkTextBuffer *buffer)
{
gchar string_buff[CONV_STR_BUF_MAX];
- GHashTable *conversation_hashtable_exact;
- GHashTable *conversation_hashtable_no_addr2;
- GHashTable *conversation_hashtable_no_port2;
- GHashTable *conversation_hashtable_no_addr2_or_port2;
+ GHashTable *conversation_hashtable_exact;
+ GHashTable *conversation_hashtable_no_addr2;
+ GHashTable *conversation_hashtable_no_port2;
+ GHashTable *conversation_hashtable_no_addr2_or_port2;
g_snprintf(string_buff, CONV_STR_BUF_MAX, "Conversation hastables info:\n");
gtk_text_buffer_insert_at_cursor (buffer, string_buff, -1);
- conversation_hashtable_exact = get_conversation_hashtable_exact();
- if(conversation_hashtable_exact){
- g_snprintf(string_buff, CONV_STR_BUF_MAX, "conversation_hashtable_exact %i entries\n#\n",
- g_hash_table_size(conversation_hashtable_exact));
- gtk_text_buffer_insert_at_cursor (buffer, string_buff, -1);
- g_hash_table_foreach( conversation_hashtable_exact, conversation_hashtable_exact_to_texbuff, buffer);
- }
-
- conversation_hashtable_no_addr2 = get_conversation_hashtable_no_addr2();
- if(conversation_hashtable_no_addr2){
- g_snprintf(string_buff, CONV_STR_BUF_MAX, "conversation_hashtable_no_addr2 %i entries\n#\n",
- g_hash_table_size(conversation_hashtable_no_addr2));
- gtk_text_buffer_insert_at_cursor (buffer, string_buff, -1);
-
- }
-
- conversation_hashtable_no_port2 = get_conversation_hashtable_no_port2();
- if(conversation_hashtable_no_port2){
- g_snprintf(string_buff, CONV_STR_BUF_MAX, "conversation_hashtable_no_port2 %i entries\n#\n",
- g_hash_table_size(conversation_hashtable_no_port2));
- gtk_text_buffer_insert_at_cursor (buffer, string_buff, -1);
-
- }
-
- conversation_hashtable_no_addr2_or_port2 = get_conversation_hashtable_no_addr2_or_port2();
- if(conversation_hashtable_no_addr2_or_port2){
- g_snprintf(string_buff, CONV_STR_BUF_MAX, "conversation_hashtable_no_addr2_or_port2 %i entries\n#\n",
- g_hash_table_size(conversation_hashtable_no_addr2_or_port2));
- gtk_text_buffer_insert_at_cursor (buffer, string_buff, -1);
-
- }
+ conversation_hashtable_exact = get_conversation_hashtable_exact();
+ if(conversation_hashtable_exact){
+ g_snprintf(string_buff, CONV_STR_BUF_MAX, "conversation_hashtable_exact %i entries\n#\n",
+ g_hash_table_size(conversation_hashtable_exact));
+ gtk_text_buffer_insert_at_cursor (buffer, string_buff, -1);
+ g_hash_table_foreach( conversation_hashtable_exact, conversation_hashtable_exact_to_texbuff, buffer);
+ }
+
+ conversation_hashtable_no_addr2 = get_conversation_hashtable_no_addr2();
+ if(conversation_hashtable_no_addr2){
+ g_snprintf(string_buff, CONV_STR_BUF_MAX, "conversation_hashtable_no_addr2 %i entries\n#\n",
+ g_hash_table_size(conversation_hashtable_no_addr2));
+ gtk_text_buffer_insert_at_cursor (buffer, string_buff, -1);
+
+ }
+
+ conversation_hashtable_no_port2 = get_conversation_hashtable_no_port2();
+ if(conversation_hashtable_no_port2){
+ g_snprintf(string_buff, CONV_STR_BUF_MAX, "conversation_hashtable_no_port2 %i entries\n#\n",
+ g_hash_table_size(conversation_hashtable_no_port2));
+ gtk_text_buffer_insert_at_cursor (buffer, string_buff, -1);
+
+ }
+
+ conversation_hashtable_no_addr2_or_port2 = get_conversation_hashtable_no_addr2_or_port2();
+ if(conversation_hashtable_no_addr2_or_port2){
+ g_snprintf(string_buff, CONV_STR_BUF_MAX, "conversation_hashtable_no_addr2_or_port2 %i entries\n#\n",
+ g_hash_table_size(conversation_hashtable_no_addr2_or_port2));
+ gtk_text_buffer_insert_at_cursor (buffer, string_buff, -1);
+
+ }
}