[tidy] minor cleanups

tstack · tstack · commit c64c8a85c9dc · 2024-12-28T21:47:52.000-08:00
diff --git a/src/base/keycodes.hh b/src/base/keycodes.hh
@@ -30,7 +30,7 @@
 #ifndef lnav_keycodes_hh
 #define lnav_keycodes_hh
 
-inline constexpr int
+constexpr int
 KEY_CTRL(char k)
 {
     return k & 0x1f;
diff --git a/src/breadcrumb_curses.cc b/src/breadcrumb_curses.cc
@@ -31,6 +31,7 @@
 
 #include "base/itertools.enumerate.hh"
 #include "base/itertools.hh"
+#include "base/keycodes.hh"
 #include "itertools.similar.hh"
 
 using namespace lnav::roles::literals;
@@ -233,8 +234,8 @@ breadcrumb_curses::handle_key(const ncinput& ch)
             case 'a':
             case 'A':
                 mapped_id = KEY_CTRL('a');
-            break;
-            break;
+                break;
+                break;
             case 'e':
             case 'E':
                 mapped_id = KEY_CTRL('e');
diff --git a/src/file_collection.hh b/src/file_collection.hh
@@ -33,11 +33,12 @@
 #define lnav_file_collection_hh
 
 #include <forward_list>
+#include <future>
 #include <list>
 #include <map>
 #include <set>
 #include <string>
-#include <utility>
+#include <vector>
 
 #include <sys/resource.h>
 
diff --git a/src/hist_source.hh b/src/hist_source.hh
@@ -34,7 +34,6 @@
 
 #include <cmath>
 #include <limits>
-#include <map>
 #include <string>
 #include <unordered_map>
 #include <vector>
diff --git a/src/hotkeys.cc b/src/hotkeys.cc
@@ -32,6 +32,7 @@
 #include "base/ansi_scrubber.hh"
 #include "base/injector.hh"
 #include "base/itertools.hh"
+#include "base/keycodes.hh"
 #include "base/math_util.hh"
 #include "base/opt_util.hh"
 #include "bookmarks.hh"
diff --git a/src/listview_curses.cc b/src/listview_curses.cc
@@ -38,6 +38,7 @@
 #include <time.h>
 
 #include "base/func_util.hh"
+#include "base/keycodes.hh"
 #include "base/lnav_log.hh"
 #include "config.h"
 
diff --git a/src/log_level.cc b/src/log_level.cc
@@ -33,7 +33,7 @@
 
 #include "config.h"
 
-const char* level_names[LEVEL__MAX + 1] = {
+const char* const level_names[LEVEL__MAX + 1] = {
     "unknown",
     "trace",
     "debug5",
diff --git a/src/log_level.hh b/src/log_level.hh
@@ -36,7 +36,7 @@
 
 #include "base/log_level_enum.hh"
 
-extern const char* level_names[LEVEL__MAX + 1];
+extern const char* const level_names[LEVEL__MAX + 1];
 
 constexpr size_t MAX_LEVEL_NAME_LEN = 8;
 
diff --git a/src/readline_curses.hh b/src/readline_curses.hh
@@ -36,14 +36,12 @@
 #include <exception>
 #include <functional>
 #include <map>
-#include <stack>
 #include <string>
 #include <utility>
 #include <vector>
 
 #include <errno.h>
 #include <poll.h>
-#include <readline/history.h>
 #include <readline/readline.h>
 #include <stdlib.h>
 #include <string.h>
@@ -146,11 +144,11 @@ public:
 
     std::string get_alt_value() const { return this->rc_alt_value; }
 
-    void update_poll_set(std::vector<struct pollfd>& pollfds) override;
+    void update_poll_set(std::vector<pollfd>& pollfds) override;
 
     void handle_key(const ncinput& ch);
 
-    void check_poll_set(const std::vector<struct pollfd>& pollfds) override;
+    void check_poll_set(const std::vector<pollfd>& pollfds) override;
 
     void focus(int context,
                const std::string& prompt,
@@ -219,7 +217,7 @@ public:
 
     void add_possibility(const int context,
                          const std::string& type,
-                         const char* values[])
+                         const char* const values[])
     {
         for (int lpc = 0; values[lpc]; lpc++) {
             this->add_possibility(context, type, values[lpc]);
@@ -228,8 +226,8 @@ public:
 
     void add_possibility(const int context,
                          const std::string& type,
-                         const char** first,
-                         const char** last)
+                         const char* const* first,
+                         const char* const* last)
     {
         for (; first < last; first++) {
             this->add_possibility(context, type, *first);
diff --git a/src/spectro_source.cc b/src/spectro_source.cc
@@ -32,6 +32,7 @@
 #include "spectro_source.hh"
 
 #include "base/ansi_scrubber.hh"
+#include "base/keycodes.hh"
 #include "base/math_util.hh"
 #include "config.h"
 
diff --git a/src/statusview_curses.cc b/src/statusview_curses.cc
@@ -108,11 +108,12 @@ statusview_curses::do_update()
     int top = this->vc_y < 0 ? height + this->vc_y : this->vc_y;
     int right = width;
     const auto attrs = vc.attrs_for_role(
-        this->sc_enabled ? this->sc_default_role : role_t::VCR_INACTIVE_STATUS);
+        this->sc_enabled ? this->vc_default_role : role_t::VCR_INACTIVE_STATUS);
 
     nccell clear_cell;
     nccell_init(&clear_cell);
-    nccell_prime(this->sc_window, &clear_cell, " ", 0, view_colors::to_channels(attrs));
+    nccell_prime(
+        this->sc_window, &clear_cell, " ", 0, view_colors::to_channels(attrs));
     ncplane_cursor_move_yx(this->sc_window, top, 0);
     ncplane_hline(this->sc_window, &clear_cell, width);
     nccell_release(this->sc_window, &clear_cell);
@@ -133,8 +134,10 @@ statusview_curses::do_update()
                     if (sa.sa_type == &VC_STYLE) {
                         auto sa_attrs = sa.sa_value.get<text_attrs>();
                         sa_attrs.clear_style(text_attrs::style::reverse);
-                        sa_attrs.ta_fg_color = styling::color_unit::make_empty();
-                        sa_attrs.ta_bg_color = styling::color_unit::make_empty();
+                        sa_attrs.ta_fg_color
+                            = styling::color_unit::make_empty();
+                        sa_attrs.ta_bg_color
+                            = styling::color_unit::make_empty();
                         sa.sa_value = sa_attrs;
                     } else if (sa.sa_type == &VC_ROLE) {
                         if (sa.sa_value.get<role_t>()
diff --git a/src/statusview_curses.hh b/src/statusview_curses.hh
@@ -165,6 +165,8 @@ public:
  */
 class statusview_curses : public view_curses {
 public:
+    statusview_curses() { this->vc_default_role = role_t::VCR_STATUS; }
+
     void set_data_source(status_data_source* src) { this->sc_source = src; }
     status_data_source* get_data_source() { return this->sc_source; }
 
@@ -174,9 +176,6 @@ public:
     void set_enabled(bool value) { this->sc_enabled = value; }
     bool get_enabled() const { return this->sc_enabled; }
 
-    void set_default_role(role_t role) { this->sc_default_role = role; }
-    role_t get_default_role() const { return this->sc_default_role; }
-
     void window_change();
 
     bool do_update() override;
diff --git a/src/timeline_source.cc b/src/timeline_source.cc
@@ -36,6 +36,7 @@
 #include "base/humanize.hh"
 #include "base/humanize.time.hh"
 #include "base/itertools.hh"
+#include "base/keycodes.hh"
 #include "base/math_util.hh"
 #include "command_executor.hh"
 #include "intervaltree/IntervalTree.h"
diff --git a/src/view_curses.cc b/src/view_curses.cc
@@ -37,6 +37,8 @@
 #include <cmath>
 #include <string>
 
+#include <zlib.h>
+
 #include "base/ansi_scrubber.hh"
 #include "base/attr_line.hh"
 #include "base/from_trait.hh"
@@ -1301,3 +1303,8 @@ screen_curses::create(const notcurses_options& options)
 
     return Ok(screen_curses(nc));
 }
+
+screen_curses::screen_curses(screen_curses&& other) noexcept
+    : sc_notcurses(std::exchange(other.sc_notcurses, nullptr))
+{
+}
diff --git a/src/view_curses.hh b/src/view_curses.hh
@@ -33,28 +33,24 @@
 #define view_curses_hh
 
 #include <functional>
+#include <optional>
 #include <string>
 #include <unordered_map>
 #include <vector>
 
-#include <limits.h>
 #include <notcurses/notcurses.h>
 #include <signal.h>
-#include <spookyhash/SpookyV2.h>
 #include <stdint.h>
 #include <sys/time.h>
-#include <zlib.h>
 
 #include "base/attr_line.hh"
 #include "base/enum_util.hh"
-#include "base/keycodes.hh"
 #include "base/lnav_log.hh"
-#include "base/lrucache.hpp"
-#include "base/opt_util.hh"
+#include "base/log_level_enum.hh"
+#include "base/result.h"
+#include "base/string_attr_type.hh"
 #include "config.h"
 #include "lnav_config_fwd.hh"
-#include "log_level.hh"
-#include "logfile_fwd.hh"
 #include "styling.hh"
 
 class view_curses;
@@ -83,14 +79,11 @@ public:
         }
     }
 
-    screen_curses(screen_curses&& other) noexcept
-        : sc_notcurses(std::exchange(other.sc_notcurses, nullptr))
-    {
-    }
+    screen_curses(screen_curses&& other) noexcept;
 
     screen_curses(const screen_curses&) = delete;
 
-    screen_curses& operator=(screen_curses&& other)
+    screen_curses& operator=(screen_curses&& other) noexcept
     {
         this->sc_notcurses = std::exchange(other.sc_notcurses, nullptr);
         return *this;
@@ -104,7 +97,7 @@ public:
     }
 
 private:
-    screen_curses(notcurses* nc) : sc_notcurses(nc) {}
+    explicit screen_curses(notcurses* nc) : sc_notcurses(nc) {}
 
     notcurses* sc_notcurses;
 };
@@ -122,7 +115,7 @@ public:
 
 class ui_periodic_timer {
 public:
-    static const struct itimerval INTERVAL;
+    static const itimerval INTERVAL;
 
     static ui_periodic_timer& singleton();
 
@@ -140,7 +133,7 @@ public:
         counter = this->upt_counter + decay;
     }
 
-    int fade_diff(sig_atomic_t& counter) const
+    int fade_diff(const sig_atomic_t& counter) const
     {
         if (this->upt_counter >= counter) {
             return 0;
@@ -341,7 +334,7 @@ struct mouse_event {
     mouse_button_t me_button;
     mouse_button_state_t me_state;
     uint8_t me_modifiers;
-    struct timeval me_time{};
+    timeval me_time{};
     int me_x;
     int me_y;
     int me_press_x{-1};
@@ -480,7 +473,7 @@ public:
             return false;
         }
 
-        bool retval;
+        bool retval = false;
         this->top() | [this, &retval](T* vc) {
             if (this->vc_needs_update) {
                 vc->set_needs_update();
diff --git a/test/drive_listview.cc b/test/drive_listview.cc
@@ -32,6 +32,7 @@
 #include <stdlib.h>
 #include <unistd.h>
 
+#include "base/auto_fd.hh"
 #include "base/injector.bind.hh"
 #include "config.h"
 #include "listview_curses.hh"

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@`
`30`	`30`	`#ifndef lnav_keycodes_hh`
`31`	`31`	`#define lnav_keycodes_hh`
`32`	`32`
`33`		`-inline constexpr int`
	`33`	`+constexpr int`
`34`	`34`	`KEY_CTRL(char k)`
`35`	`35`	`{`
`36`	`36`	`return k & 0x1f;`