From 4fcb4b5364bae89dd281e2c7f05271b580f7a146 Mon Sep 17 00:00:00 2001 From: John Thacker Date: Sun, 25 Feb 2024 20:28:25 -0500 Subject: [PATCH] Remove PREF_DECODE_AS_UINT PREF_DECODE_AS_UINT has been unused since all auto port preferences were made ranges by 8604d03a98607bf8dc62e3ee152f8c8289c4052b Remove it. Ping #14319 --- epan/prefs-int.h | 4 +- epan/prefs.c | 110 ++--------------------- sharkd_session.c | 5 +- ui/qt/manager/wireshark_preference.cpp | 1 - ui/qt/models/pref_models.cpp | 1 - ui/qt/module_preferences_scroll_area.cpp | 4 - ui/qt/preference_editor_frame.cpp | 2 - ui/qt/protocol_preferences_menu.cpp | 1 - 8 files changed, 10 insertions(+), 118 deletions(-) diff --git a/epan/prefs-int.h b/epan/prefs-int.h index 5d1061faf7..312720c509 100644 --- a/epan/prefs-int.h +++ b/epan/prefs-int.h @@ -98,8 +98,8 @@ struct pref_custom_cbs { #define PREF_CUSTOM (1u << 9) /* use and not as a generic protocol preference */ #define PREF_OBSOLETE (1u << 10) #define PREF_DIRNAME (1u << 11) -#define PREF_DECODE_AS_UINT (1u << 12) /* XXX - These are only supported for "internal" (non-protocol) */ -#define PREF_DECODE_AS_RANGE (1u << 13) /* use and not as a generic protocol preference */ +// Was PREF_DECODE_AS_UINT (1u << 12) +#define PREF_DECODE_AS_RANGE (1u << 13) /* XXX - Internal use only, not a generic protocol preference */ #define PREF_OPEN_FILENAME (1u << 14) #define PREF_PASSWORD (1u << 15) /* like string, but never saved to prefs file */ /** diff --git a/epan/prefs.c b/epan/prefs.c index 009faab3fc..1d0b35c9d3 100644 --- a/epan/prefs.c +++ b/epan/prefs.c @@ -331,7 +331,6 @@ free_pref(gpointer data, gpointer user_data _U_) case PREF_BOOL: case PREF_ENUM: case PREF_UINT: - case PREF_DECODE_AS_UINT: case PREF_STATIC_TEXT: case PREF_UAT: case PREF_COLOR: @@ -1996,12 +1995,6 @@ gboolean prefs_add_decode_as_value(pref_t *pref, guint value, gboolean replace) { switch(pref->type) { - case PREF_DECODE_AS_UINT: - /* This doesn't support multiple values for a dissector in Decode As because the - preference only supports a single value. This leads to a "last port for - dissector in Decode As wins" */ - *pref->varp.uint = value; - break; case PREF_DECODE_AS_RANGE: if (replace) { @@ -2023,18 +2016,14 @@ gboolean prefs_add_decode_as_value(pref_t *pref, guint value, gboolean replace) return TRUE; } -gboolean prefs_remove_decode_as_value(pref_t *pref, guint value, gboolean set_default) +gboolean prefs_remove_decode_as_value(pref_t *pref, guint value, gboolean set_default _U_) { switch(pref->type) { - case PREF_DECODE_AS_UINT: - if (set_default) { - *pref->varp.uint = pref->default_val.uint; - } else { - *pref->varp.uint = 0; - } - break; case PREF_DECODE_AS_RANGE: + /* XXX - We could set to the default if the value is the only one + * in the range. + */ prefs_range_remove_value(pref, value); break; default: @@ -2092,10 +2081,6 @@ pref_stash(pref_t *pref, gpointer unused _U_) { switch (pref->type) { - case PREF_DECODE_AS_UINT: - pref->stashed_val.uint = *pref->varp.uint; - break; - case PREF_UINT: pref->stashed_val.uint = *pref->varp.uint; break; @@ -2151,30 +2136,6 @@ pref_unstash(pref_t *pref, gpointer unstash_data_p) /* Revert the preference to its saved value. */ switch (pref->type) { - case PREF_DECODE_AS_UINT: - if (*pref->varp.uint != pref->stashed_val.uint) { - unstash_data->module->prefs_changed_flags |= prefs_get_effect_flags(pref); - - if (unstash_data->handle_decode_as) { - if (*pref->varp.uint != pref->default_val.uint) { - dissector_reset_uint(pref->name, *pref->varp.uint); - } - } - - *pref->varp.uint = pref->stashed_val.uint; - - if (unstash_data->handle_decode_as) { - sub_dissectors = find_dissector_table(pref->name); - if (sub_dissectors != NULL) { - handle = dissector_table_get_dissector_handle(sub_dissectors, unstash_data->module->title); - if (handle != NULL) { - dissector_change_uint(pref->name, *pref->varp.uint, handle); - } - } - } - } - break; - case PREF_UINT: if (*pref->varp.uint != pref->stashed_val.uint) { unstash_data->module->prefs_changed_flags |= prefs_get_effect_flags(pref); @@ -2304,10 +2265,6 @@ void reset_stashed_pref(pref_t *pref) { switch (pref->type) { - case PREF_DECODE_AS_UINT: - pref->stashed_val.uint = pref->default_val.uint; - break; - case PREF_UINT: pref->stashed_val.uint = pref->default_val.uint; break; @@ -2364,7 +2321,6 @@ pref_clean_stash(pref_t *pref, gpointer unused _U_) switch (pref->type) { case PREF_UINT: - case PREF_DECODE_AS_UINT: break; case PREF_BOOL: @@ -4490,7 +4446,6 @@ reset_pref(pref_t *pref) switch (type) { case PREF_UINT: - case PREF_DECODE_AS_UINT: *pref->varp.uint = pref->default_val.uint; break; @@ -5724,7 +5679,7 @@ deprecated_port_pref(gchar *pref_name, const gchar *value) ws_warning("Deprecated ports pref '%s.%s' not found", module->name, port_prefs[i].table_name); continue; } - if (pref->type != PREF_DECODE_AS_UINT && pref->type != PREF_DECODE_AS_RANGE) { + if (pref->type != PREF_DECODE_AS_RANGE) { ws_warning("Deprecated ports pref '%s.%s' has wrong type: %#x (%s)", module->name, port_prefs[i].table_name, pref->type, prefs_pref_type_name(pref)); } } @@ -5739,9 +5694,7 @@ deprecated_port_pref(gchar *pref_name, const gchar *value) pref = prefs_find_preference(module, port_prefs[i].table_name); if (pref != NULL) { module->prefs_changed_flags |= prefs_get_effect_flags(pref); - if (pref->type == PREF_DECODE_AS_UINT) { - *pref->varp.uint = uval; - } else if (pref->type == PREF_DECODE_AS_RANGE) { + if (pref->type == PREF_DECODE_AS_RANGE) { // The legacy preference was a port number, but the new // preference is a port range. Add to existing range. if (uval) { @@ -6334,41 +6287,6 @@ set_pref(gchar *pref_name, const gchar *value, void *private_data, *pref->varp.uint = uval; } break; - case PREF_DECODE_AS_UINT: - { - /* This is for backwards compatibility in case any of the preferences - that shared the "Decode As" preference name and used to be PREF_UINT - are now applied directly to the Decode As funtionality */ - - dissector_table_t sub_dissectors; - dissector_handle_t handle; - - if (!ws_basestrtou32(value, NULL, &uval, pref->info.base)) - return PREFS_SET_SYNTAX_ERR; /* number was bad */ - - if (*pref->varp.uint != uval) { - containing_module->prefs_changed_flags |= prefs_get_effect_flags(pref); - *pref->varp.uint = uval; - - /* Name of preference is the dissector table */ - sub_dissectors = find_dissector_table(pref->name); - if (sub_dissectors != NULL) { - handle = dissector_table_get_dissector_handle(sub_dissectors, module->title); - if (handle != NULL) { - if (uval != 0) { - dissector_change_uint(pref->name, uval, handle); - decode_build_reset_list(pref->name, dissector_table_get_type(sub_dissectors), GUINT_TO_POINTER(uval), NULL, NULL); - } else { - dissector_delete_uint(pref->name, *pref->varp.uint, handle); - decode_build_reset_list(pref->name, dissector_table_get_type(sub_dissectors), pref->varp.uint, NULL, NULL); - } - - /* XXX - Do we save the decode_as_entries file here? */ - } - } - } - break; - } case PREF_BOOL: /* XXX - give an error if it's neither "true" nor "false"? */ if (g_ascii_strcasecmp(value, "true") == 0) @@ -6580,10 +6498,6 @@ prefs_pref_type_name(pref_t *pref) type_name = "Custom"; break; - case PREF_DECODE_AS_UINT: - type_name = "Decode As value"; - break; - case PREF_DECODE_AS_RANGE: type_name = "Range (for Decode As)"; break; @@ -6740,10 +6654,6 @@ prefs_pref_type_description(pref_t *pref) type_desc = "A custom value"; break; - case PREF_DECODE_AS_UINT: - type_desc = "An integer value used in Decode As"; - break; - case PREF_DECODE_AS_RANGE: type_desc = "A string denoting an positive integer range for Decode As"; break; @@ -6785,11 +6695,6 @@ prefs_pref_is_default(pref_t *pref) switch (type) { - case PREF_DECODE_AS_UINT: - if (pref->default_val.uint == *pref->varp.uint) - return TRUE; - break; - case PREF_UINT: if (pref->default_val.uint == *pref->varp.uint) return TRUE; @@ -6886,7 +6791,6 @@ prefs_pref_to_str(pref_t *pref, pref_source_t source) { switch (type) { - case PREF_DECODE_AS_UINT: case PREF_UINT: { guint pref_uint = *(guint *) valp; @@ -7007,7 +6911,6 @@ write_pref(gpointer data, gpointer user_data) case PREF_UAT: /* Nothing to do; don't bother printing the description */ return; - case PREF_DECODE_AS_UINT: case PREF_DECODE_AS_RANGE: /* Data is saved through Decode As mechanism and not part of preferences file */ return; @@ -7086,7 +6989,6 @@ count_non_uat_pref(gpointer data, gpointer user_data) { case PREF_UAT: case PREF_OBSOLETE: - case PREF_DECODE_AS_UINT: case PREF_DECODE_AS_RANGE: case PREF_PROTO_TCP_SNDAMB_ENUM: //These types are not written in preference file diff --git a/sharkd_session.c b/sharkd_session.c index eedeac0cb7..3cefc07d27 100644 --- a/sharkd_session.c +++ b/sharkd_session.c @@ -5175,7 +5175,6 @@ sharkd_session_process_dumpconf_cb(pref_t *pref, gpointer d) switch (prefs_get_type(pref)) { case PREF_UINT: - case PREF_DECODE_AS_UINT: sharkd_json_value_anyf("u", "%u", prefs_get_uint_value_real(pref, pref_current)); if (prefs_get_uint_base(pref) != 10) sharkd_json_value_anyf("ub", "%u", prefs_get_uint_base(pref)); @@ -5291,8 +5290,8 @@ sharkd_session_process_dumpconf_mod_cb(module_t *module, gpointer d) * Output object with attributes: * (o) prefs - object with module preferences * (m) [KEY] - preference name - * (o) u - preference value (for PREF_UINT, PREF_DECODE_AS_UINT) - * (o) ub - preference value suggested base for display (for PREF_UINT, PREF_DECODE_AS_UINT) and if different than 10 + * (o) u - preference value (for PREF_UINT) + * (o) ub - preference value suggested base for display (for PREF_UINT) and if different than 10 * (o) b - preference value (only for PREF_BOOL) (1 true, 0 false) * (o) s - preference value (for PREF_STRING, PREF_SAVE_FILENAME, PREF_OPEN_FILENAME, PREF_DIRNAME, PREF_PASSWORD, PREF_DISSECTOR) * (o) e - preference possible values (only for PREF_ENUM) diff --git a/ui/qt/manager/wireshark_preference.cpp b/ui/qt/manager/wireshark_preference.cpp index d49153bc3a..91f8bd2006 100644 --- a/ui/qt/manager/wireshark_preference.cpp +++ b/ui/qt/manager/wireshark_preference.cpp @@ -102,7 +102,6 @@ public: UIntPreference(QObject * parent = Q_NULLPTR) : StringPreference(parent) {} }; REGISTER_PREFERENCE_TYPE(PREF_UINT, UIntPreference) -REGISTER_PREFERENCE_TYPE(PREF_DECODE_AS_UINT, UIntPreference) class EnumPreference : public WiresharkPreference { diff --git a/ui/qt/models/pref_models.cpp b/ui/qt/models/pref_models.cpp index a2797fd577..883114be78 100644 --- a/ui/qt/models/pref_models.cpp +++ b/ui/qt/models/pref_models.cpp @@ -470,7 +470,6 @@ bool AdvancedPrefsModel::setData(const QModelIndex &dataindex, const QVariant &v item->setChanged(true); switch (item->getPrefType()) { - case PREF_DECODE_AS_UINT: case PREF_UINT: { bool ok; diff --git a/ui/qt/module_preferences_scroll_area.cpp b/ui/qt/module_preferences_scroll_area.cpp index 8dc8379ee4..486411a019 100644 --- a/ui/qt/module_preferences_scroll_area.cpp +++ b/ui/qt/module_preferences_scroll_area.cpp @@ -74,7 +74,6 @@ pref_show(pref_t *pref, gpointer user_data) switch (prefs_get_type(pref)) { case PREF_UINT: - case PREF_DECODE_AS_UINT: { QHBoxLayout *hb = new QHBoxLayout(); QLabel *label = new QLabel(prefs_get_title(pref)); @@ -338,9 +337,6 @@ ModulePreferencesScrollArea::ModulePreferencesScrollArea(module_t *module, QWidg if (!pref) continue; switch (prefs_get_type(pref)) { - case PREF_DECODE_AS_UINT: - connect(le, &QLineEdit::textEdited, this, &ModulePreferencesScrollArea::uintLineEditTextEdited); - break; case PREF_UINT: connect(le, &QLineEdit::textEdited, this, &ModulePreferencesScrollArea::uintLineEditTextEdited); break; diff --git a/ui/qt/preference_editor_frame.cpp b/ui/qt/preference_editor_frame.cpp index 83dc6e3517..9596d5b8ab 100644 --- a/ui/qt/preference_editor_frame.cpp +++ b/ui/qt/preference_editor_frame.cpp @@ -92,7 +92,6 @@ void PreferenceEditorFrame::editPreference(preference *pref, pref_module *module switch (prefs_get_type(pref_)) { case PREF_UINT: - case PREF_DECODE_AS_UINT: connect(ui->preferenceLineEdit, &SyntaxLineEdit::textChanged, this, &PreferenceEditorFrame::uintLineEditTextEdited); show = true; @@ -243,7 +242,6 @@ void PreferenceEditorFrame::on_buttonBox_accepted() unsigned int apply = 0; switch(prefs_get_type(pref_)) { case PREF_UINT: - case PREF_DECODE_AS_UINT: apply = prefs_set_uint_value(pref_, new_uint_, pref_stashed); break; case PREF_STRING: diff --git a/ui/qt/protocol_preferences_menu.cpp b/ui/qt/protocol_preferences_menu.cpp index 033064952b..3f9feb8b47 100644 --- a/ui/qt/protocol_preferences_menu.cpp +++ b/ui/qt/protocol_preferences_menu.cpp @@ -267,7 +267,6 @@ void ProtocolPreferencesMenu::addMenuItem(preference *pref) case PREF_OPEN_FILENAME: case PREF_DIRNAME: case PREF_RANGE: - case PREF_DECODE_AS_UINT: case PREF_DECODE_AS_RANGE: case PREF_PASSWORD: case PREF_DISSECTOR: