diff options
| author | Gerald Combs <gerald@wireshark.org> | 2013-01-14 23:23:50 +0000 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2013-01-14 23:23:50 +0000 |
| commit | b0ef1a67ed0fe5556bed03bc759e0087b1911d8a (patch) | |
| tree | f5536df934453b076a5431557f13d383447870ac /epan/prefs.c | |
| parent | e4f46ce55f9147f6852a810041f1ce6d2f054cf0 (diff) | |
| download | wireshark-b0ef1a67ed0fe5556bed03bc759e0087b1911d8a.tar.gz wireshark-b0ef1a67ed0fe5556bed03bc759e0087b1911d8a.tar.bz2 wireshark-b0ef1a67ed0fe5556bed03bc759e0087b1911d8a.zip | |
strcmp → g_strcmp0. Fixes a crash on Windows.
svn path=/trunk/; revision=47085
Diffstat (limited to 'epan/prefs.c')
| -rw-r--r-- | epan/prefs.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/epan/prefs.c b/epan/prefs.c index cf6568d14b..9c3fc78f86 100644 --- a/epan/prefs.c +++ b/epan/prefs.c @@ -1365,7 +1365,7 @@ static char * column_hidden_to_str_cb(pref_t* pref, gboolean default_val) { static gboolean column_hidden_is_default_cb(pref_t* pref) { char *cur_hidden_str = column_hidden_to_str_cb(pref, FALSE); - gboolean is_default = strcmp(cur_hidden_str, pref->default_val.string) == 0; + gboolean is_default = g_strcmp0(cur_hidden_str, pref->default_val.string) == 0; g_free(cur_hidden_str); return is_default; @@ -1557,10 +1557,10 @@ static gboolean column_format_is_default_cb(pref_t* pref) { while (pref_col && def_col) { cfmt = (fmt_data *) pref_col->data; def_cfmt = (fmt_data *) def_col->data; - if ((strcmp(cfmt->title, def_cfmt->title) != 0) || + if ((g_strcmp0(cfmt->title, def_cfmt->title) != 0) || (cfmt->fmt != def_cfmt->fmt) || (((cfmt->fmt == COL_CUSTOM) && (cfmt->custom_field)) && - ((strcmp(cfmt->custom_field, def_cfmt->custom_field) != 0) || + ((g_strcmp0(cfmt->custom_field, def_cfmt->custom_field) != 0) || (cfmt->resolved != def_cfmt->resolved)))) { is_default = FALSE; break; |