diff options
| author | Jeff Morriss <jeff.morriss@ulticom.com> | 2008-03-16 15:29:13 +0000 |
|---|---|---|
| committer | Jeff Morriss <jeff.morriss@ulticom.com> | 2008-03-16 15:29:13 +0000 |
| commit | 70a53138b30c25ebd7aa0243ff55cd5f134b006a (patch) | |
| tree | 8de31e4cfeacb1a82a7b36a1b387d55aade26656 /rawshark.c | |
| parent | 2693fce57b968e18b846c23dbaabb85f28d1c7e7 (diff) | |
| download | wireshark-70a53138b30c25ebd7aa0243ff55cd5f134b006a.tar.gz wireshark-70a53138b30c25ebd7aa0243ff55cd5f134b006a.tar.bz2 wireshark-70a53138b30c25ebd7aa0243ff55cd5f134b006a.zip | |
From Peter Fuller: free pref_str in set_link_type() if preferences aren't set. From me: call get_credential_inf() at startup.
svn path=/trunk/; revision=24656
Diffstat (limited to 'rawshark.c')
| -rw-r--r-- | rawshark.c | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/rawshark.c b/rawshark.c index 97c91178d2..4c61779e2f 100644 --- a/rawshark.c +++ b/rawshark.c @@ -399,12 +399,14 @@ set_link_type(const char *lt_arg) { if (dhandle) { encap = WTAP_ENCAP_USER0; pref_str = g_string_new("uat:user_dlts:"); - /* This must match the format used in the user_dlts file */ - g_string_sprintfa(pref_str, - "\"User 0 (DLT=147)\",\"%s\",\"0\",\"\",\"0\",\"\"", spec_ptr); + /* This must match the format used in the user_dlts file */ + g_string_sprintfa(pref_str, + "\"User 0 (DLT=147)\",\"%s\",\"0\",\"\",\"0\",\"\"", + spec_ptr); if (prefs_set_pref(pref_str->str) != PREFS_SET_OK) { - return FALSE; - } + g_string_free(pref_str, TRUE); + return FALSE; + } g_string_free(pref_str, TRUE); return TRUE; } @@ -444,6 +446,11 @@ main(int argc, char *argv[]) static const char optstring[] = OPTSTRING_INIT; /* + * Get credential information for later use. + */ + get_credential_info(); + + /* * Clear the filters arrays */ memset(rfilters, 0, sizeof(rfilters)); |