From 0eb1aeb7d8e77123fff2fa8ad87568e6513caad5 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Tue, 10 Sep 2019 20:16:53 +0200 Subject: [PATCH] Styles: add `noexcept` --- src/Styles.cxx | 12 ++++++------ src/Styles.hxx | 5 +++-- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/src/Styles.cxx b/src/Styles.cxx index 1123ff8a..23b43014 100644 --- a/src/Styles.cxx +++ b/src/Styles.cxx @@ -90,7 +90,7 @@ struct StyleData { #ifndef ENABLE_COLORS constexpr StyleData(const char *_name, Style, - short, short, attr_t, attr_t _mono) + short, short, attr_t, attr_t _mono) noexcept :name(_name), mono(_mono) {} #endif }; @@ -188,7 +188,7 @@ static StyleData styles[size_t(Style::END)] = { }; static constexpr auto & -GetStyle(Style style) +GetStyle(Style style) noexcept { return styles[size_t(style)]; } @@ -197,7 +197,7 @@ GetStyle(Style style) gcc_pure static Style -StyleByName(const char *name) +StyleByName(const char *name) noexcept { for (size_t i = 1; i < size_t(Style::END); ++i) if (!strcasecmp(styles[i].name, name)) @@ -207,7 +207,7 @@ StyleByName(const char *name) } static void -colors_update_pair(Style style) +colors_update_pair(Style style) noexcept { auto &data = GetStyle(style); @@ -337,7 +337,7 @@ ModifyStyle(const char *name, const char *value) } void -ApplyStyles() +ApplyStyles() noexcept { if (has_colors()) { /* initialize color support */ @@ -360,7 +360,7 @@ ApplyStyles() #endif void -SelectStyle(WINDOW *w, Style style) +SelectStyle(WINDOW *w, Style style) noexcept { const auto &data = GetStyle(style); diff --git a/src/Styles.hxx b/src/Styles.hxx index b1a72877..9c72eea9 100644 --- a/src/Styles.hxx +++ b/src/Styles.hxx @@ -60,10 +60,11 @@ void ModifyStyle(const char *name, const char *value); void -ApplyStyles(); +ApplyStyles() noexcept; + #endif void -SelectStyle(WINDOW *w, Style style); +SelectStyle(WINDOW *w, Style style) noexcept; #endif -- 2.20.1