diff options
| author | Anders Broman <anders.broman@ericsson.com> | 2006-06-20 05:57:29 +0000 |
|---|---|---|
| committer | Anders Broman <anders.broman@ericsson.com> | 2006-06-20 05:57:29 +0000 |
| commit | c72d4e8f2e3b5e82ba6c39973baf36fe680aa898 (patch) | |
| tree | 28a0a278d84026892053ceac29a4b418598960a4 /epan/emem.c | |
| parent | d327d37e829a8dfe31d1c91681e7d3e81be7cf87 (diff) | |
From Albert Chin:
Fix some C++ comments in C source files and fixes some non-constant initializations.
svn path=/trunk/; revision=18521
Diffstat (limited to 'epan/emem.c')
| -rw-r--r-- | epan/emem.c | 22 |
1 files changed, 16 insertions, 6 deletions
diff --git a/epan/emem.c b/epan/emem.c index e1b51a3714..cedfda900e 100644 --- a/epan/emem.c +++ b/epan/emem.c @@ -1388,12 +1388,17 @@ void se_tree_insert_string(se_string_hash_t* se_tree, const gchar* k, void* v) { guint32 div = (len-1)/4; guint32 residual = 0; se_tree_key_t key[] = { - {1,&len}, - {div,(guint32*)(&k[0])}, - {1,&residual}, + {1,NULL}, + {0,NULL}, + {1,NULL}, {0,NULL} }; + key[0].key = &len; + key[1].length = div; + key[1].key = (guint32*)(&k[0]); + key[2].key = &residual; + if (! div) { key[1].length = key[2].length; key[1].key = key[2].key; @@ -1423,12 +1428,17 @@ void* se_tree_lookup_string(se_string_hash_t* se_tree, const gchar* k) { guint32 div = (len-1)/4; guint32 residual = 0; se_tree_key_t key[] = { - {1,&len}, - {div,(guint32*)(&k[0])}, - {1,&residual}, + {1,NULL}, + {0,NULL}, + {1,NULL}, {0,NULL} }; + key[0].key = &len; + key[1].length = div; + key[1].key = (guint32*)(&k[0]); + key[2].key = &residual; + if (! div) { key[1].length = key[2].length; key[1].key = key[2].key; |