>From fc5e8c3e3419a7352762788c0c2d2f592866c716 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hubert=20Figui=C3=A8re?= Date: Fri, 4 Nov 2016 23:59:41 -0400 Subject: [PATCH 3/3] Fix -Wswitch-default warnings --- src/dbgengine/nmv-dbg-common.h | 3 +++ src/dbgengine/nmv-debugger-utils.cc | 3 +++ src/dbgengine/nmv-gdb-engine.cc | 3 +++ src/dbgengine/nmv-gdbmi-parser.cc | 7 ++++++ src/dbgengine/nmv-i-debugger.h | 3 +++ src/langs/nmv-cpp-ast.cc | 3 +++ src/persp/dbgperspective/nmv-dbg-perspective.cc | 29 ++++++++++++++++++++++ src/persp/dbgperspective/nmv-set-jump-to-dialog.cc | 9 +++++++ src/uicommon/nmv-source-editor.cc | 4 +++ tests/templated-var.cc | 3 +++ 10 files changed, 67 insertions(+) diff --git a/src/dbgengine/nmv-dbg-common.h b/src/dbgengine/nmv-dbg-common.h index 1be7f25..b536350 100644 --- a/src/dbgengine/nmv-dbg-common.h +++ b/src/dbgengine/nmv-dbg-common.h @@ -328,6 +328,9 @@ public: case IDebugger::SIGNAL_RECEIVED: return "signal-received"; break; + default: + LOG_ERROR ("Invalid reason"); + break; } return result; } diff --git a/src/dbgengine/nmv-debugger-utils.cc b/src/dbgengine/nmv-debugger-utils.cc index e33e507..842bd9f 100644 --- a/src/dbgengine/nmv-debugger-utils.cc +++ b/src/dbgengine/nmv-debugger-utils.cc @@ -189,6 +189,9 @@ variable_format_to_string (IDebugger::Variable::Format a_format) case IDebugger::Variable::UNKNOWN_FORMAT: result = "unknown"; break; + default: + LOG_ERROR ("Invalid format"); + break; } return result; } diff --git a/src/dbgengine/nmv-gdb-engine.cc b/src/dbgengine/nmv-gdb-engine.cc index c5707ac..32effc8 100644 --- a/src/dbgengine/nmv-gdb-engine.cc +++ b/src/dbgengine/nmv-gdb-engine.cc @@ -168,6 +168,9 @@ location_to_string (const Loc &a_loc, location_to_string (loc, a_str); } break; + default: + LOG_ERROR ("Invalid location kind"); + break; } } diff --git a/src/dbgengine/nmv-gdbmi-parser.cc b/src/dbgengine/nmv-gdbmi-parser.cc index ab55b5c..4d7ab25 100644 --- a/src/dbgengine/nmv-gdbmi-parser.cc +++ b/src/dbgengine/nmv-gdbmi-parser.cc @@ -320,6 +320,10 @@ gdbmi_list_to_string (GDBMIListSafePtr a_list, case GDBMIList::UNDEFINED_TYPE: a_string += ""; break; + default: + LOG_ERROR ("Invalid gdmi list type"); + a_string += ""; + break; } a_string += "]"; return is_ok; @@ -349,6 +353,9 @@ gdbmi_value_to_string (GDBMIValueSafePtr a_value, result = gdbmi_tuple_to_string (a_value->get_tuple_content (), a_string); break; + default: + LOG_ERROR ("Invalid content_type"); + result = false; } return result; } diff --git a/src/dbgengine/nmv-i-debugger.h b/src/dbgengine/nmv-i-debugger.h index 28fd1f6..4716bcc 100644 --- a/src/dbgengine/nmv-i-debugger.h +++ b/src/dbgengine/nmv-i-debugger.h @@ -1060,6 +1060,9 @@ public: case PROGRAM_EXITED: str = "PROGRAM_EXITED"; break; + default: + LOG_ERROR ("Unknown state" << static_cast (a_state)); + break; } return str; } diff --git a/src/langs/nmv-cpp-ast.cc b/src/langs/nmv-cpp-ast.cc index 36f61a5..726d809 100644 --- a/src/langs/nmv-cpp-ast.cc +++ b/src/langs/nmv-cpp-ast.cc @@ -22,6 +22,7 @@ * *See COPYRIGHT file copyright information. */ +#include "common/nmv-log-stream-utils.h" #include "nmv-cpp-ast.h" NEMIVER_BEGIN_NAMESPACE (nemiver) @@ -304,6 +305,8 @@ ExprBase::operator_to_string (Operator a_op) return OP_XOR_EQ; case OR_EQ: return OP_OR_EQ; + default: + LOG_ERROR ("Invalid op"); } return OP_UNDEFINED; } diff --git a/src/persp/dbgperspective/nmv-dbg-perspective.cc b/src/persp/dbgperspective/nmv-dbg-perspective.cc index 9671c8e..04840b6 100644 --- a/src/persp/dbgperspective/nmv-dbg-perspective.cc +++ b/src/persp/dbgperspective/nmv-dbg-perspective.cc @@ -1768,6 +1768,9 @@ DBGPerspective::on_breakpoint_go_to_source_action break; case SourceEditor::BUFFER_TYPE_UNDEFINED: break; + default: + LOG_ERROR ("Invalid source editor buffer type"); + break; } } @@ -1879,6 +1882,9 @@ DBGPerspective::on_sv_markers_region_clicked_signal (int a_line, break; case SourceEditor::BUFFER_TYPE_UNDEFINED: break; + default: + LOG_ERROR ("Invalid editor buffer type"); + break; } } @@ -4443,6 +4449,9 @@ DBGPerspective::set_where (const IDebugger::Frame &a_frame, a_do_scroll, a_try_hard); case SourceEditor::BUFFER_TYPE_UNDEFINED: break; + default: + LOG_ERROR ("Invalid editor buffer type"); + break; } return false; } @@ -6795,6 +6804,9 @@ DBGPerspective::do_jump_and_break_to_location (const Loc &a_location) JUMP_TO_LOC_AFTER_ENABLE_BP (loc); } break; + default: + LOG_ERROR ("Invalid breakpoint location kind"); + break; } } } else { @@ -6819,6 +6831,8 @@ DBGPerspective::do_jump_and_break_to_location (const Loc &a_location) (static_cast (a_location)); JUMP_TO_LOC_AFTER_SET_BP (loc); } + default: + LOG_ERROR ("Invalid breakpoint location kind"); break; } } @@ -7050,6 +7064,9 @@ DBGPerspective::append_breakpoint (const IDebugger::Breakpoint &a_breakpoint) break; case SourceEditor::BUFFER_TYPE_UNDEFINED: break; + default: + LOG_ERROR ("Invalid editor buffer type"); + break; } } else if (!a_breakpoint.has_multiple_locations ()) { // We not could find an editor for the file of the breakpoint. @@ -7123,6 +7140,9 @@ DBGPerspective::get_breakpoint (const Loc &a_location) const static_cast (a_location); return get_breakpoint (loc.address ()); } + default: + LOG_ERROR ("Invalid breakpoint location kind"); + break; } // Should not be reached. return 0; @@ -7307,6 +7327,9 @@ DBGPerspective::delete_visual_breakpoint (map::it case SourceEditor::BUFFER_TYPE_UNDEFINED: THROW ("should not be reached"); break; + default: + THROW ("should not be reached - invalid type"); + break; } LOG_DD ("going to erase breakpoint number " << a_i->first); @@ -7394,6 +7417,9 @@ DBGPerspective::apply_decorations (SourceEditor *a_editor, break; case SourceEditor::BUFFER_TYPE_UNDEFINED: break; + default: + LOG_ERROR ("Invalid buffer type"); + break; } return result; } @@ -7560,6 +7586,9 @@ DBGPerspective::is_breakpoint_set_at_location (const Loc &a_location, a_enabled); } break; + default: + LOG_ERROR ("Invalid breakpoint location type"); + break; } // Should not be reached return false; diff --git a/src/persp/dbgperspective/nmv-set-jump-to-dialog.cc b/src/persp/dbgperspective/nmv-set-jump-to-dialog.cc index 3622331..d00dadf 100644 --- a/src/persp/dbgperspective/nmv-set-jump-to-dialog.cc +++ b/src/persp/dbgperspective/nmv-set-jump-to-dialog.cc @@ -169,6 +169,9 @@ public: case MODE_BINARY_LOCATION: radio_binary_location->set_active (); break; + default: + LOG_ERROR ("Invalid location setting mode"); + break; } } @@ -205,6 +208,9 @@ public: AddressLoc *loc = new AddressLoc (a); return loc; } + default: + LOG_ERROR ("Invalid location"); + break; } // end case return 0; @@ -242,6 +248,9 @@ public: entry_address->set_text (o.str ()); } break; + default: + LOG_ERROR ("Invalid location type"); + break; } } diff --git a/src/uicommon/nmv-source-editor.cc b/src/uicommon/nmv-source-editor.cc index da7daa0..b886d7b 100644 --- a/src/uicommon/nmv-source-editor.cc +++ b/src/uicommon/nmv-source-editor.cc @@ -305,6 +305,8 @@ struct SourceEditor::Priv { return &asm_ctxt.markers; case SourceEditor::BUFFER_TYPE_UNDEFINED: return 0; + default: + LOG_ERROR ("Invalid buffer type."); } return 0; } @@ -881,6 +883,8 @@ SourceEditor::current_location () const return new AddressLoc (a); } break; + default: + LOG_ERROR ("Invalid buffer type"); } return 0; diff --git a/tests/templated-var.cc b/tests/templated-var.cc index 43e8251..3c14206 100644 --- a/tests/templated-var.cc +++ b/tests/templated-var.cc @@ -44,6 +44,9 @@ operator<< (std::ostream &a_out, const plot &a_plot) case plot::BAR : a_out << "plot::BAR"; break; + default: + a_out << "undefined"; + break; } return a_out; } -- 2.9.3