diff options
| author | Jakub Zawadzki <darkjames-ws@darkjames.pl> | 2012-07-27 08:47:54 +0000 |
|---|---|---|
| committer | Jakub Zawadzki <darkjames-ws@darkjames.pl> | 2012-07-27 08:47:54 +0000 |
| commit | 40e809be57160d70d86df26759ac96cd1803bdcd (patch) | |
| tree | 444491c8dde975f50aac229a48a3ced2419e7e2e /epan/dissectors/packet-6lowpan.c | |
| parent | a920dbe17707cd0468af23b1a827c0681efe0c0e (diff) | |
6lowpan: cleanup dynamic configuration construction.
g_string_printf() -> g_strdup_printf()
svn path=/trunk/; revision=44065
Diffstat (limited to 'epan/dissectors/packet-6lowpan.c')
| -rw-r--r-- | epan/dissectors/packet-6lowpan.c | 19 |
1 files changed, 6 insertions, 13 deletions
diff --git a/epan/dissectors/packet-6lowpan.c b/epan/dissectors/packet-6lowpan.c index 559b73eb8e..bf7cbd0de8 100644 --- a/epan/dissectors/packet-6lowpan.c +++ b/epan/dissectors/packet-6lowpan.c @@ -2548,10 +2548,7 @@ proto_register_6lowpan(void) /* Register preferences. */ prefs_module = prefs_register_protocol(proto_6lowpan, prefs_6lowpan_apply); for (i = 0; i < LOWPAN_CONTEXT_COUNT; i++) { - GString *pref_name, *pref_title, *pref_desc; - pref_name = g_string_new(""); - pref_title = g_string_new(""); - pref_desc = g_string_new(""); + char *pref_name, *pref_title; /* * Inspired by the IEEE 802.11 dissector - the preferences are expecting @@ -2560,15 +2557,11 @@ proto_register_6lowpan(void) * and leave them allocated. OMG, an intentional memory leak; I must be * an evil developer. Good thing we have MMU's in this day and age. */ - g_string_printf(pref_name, "context%d", i); - g_string_printf(pref_title, "Context %d", i); - g_string_printf(pref_desc, "IPv6 prefix to use for stateful address decompression."); - prefs_register_string_preference(prefs_module, pref_name->str, pref_title->str, - pref_desc->str, &lowpan_context_prefs[i]); - /* Don't free the ->str */ - g_string_free(pref_name, FALSE); - g_string_free(pref_title, FALSE); - g_string_free(pref_desc, FALSE); + pref_name = g_strdup_printf("context%d", i); + pref_title = g_strdup_printf("Context %d", i); + prefs_register_string_preference(prefs_module, pref_name, pref_title, + "IPv6 prefix to use for stateful address decompression.", + &lowpan_context_prefs[i]); } } /* proto_register_6lowpan */ |