[tidy] minor cleanups

Author: tstack

src/all_logs_vtab.cc

@@ -30,6 +30,7 @@
 #include "all_logs_vtab.hh"
 
 #include "base/attr_line.hh"
+#include "base/intern_string.hh"
 #include "config.h"
 #include "data_parser.hh"
 #include "elem_to_json.hh"

src/all_logs_vtab.hh

@@ -30,9 +30,12 @@
 #ifndef lnav_all_logs_vtab_hh
 #define lnav_all_logs_vtab_hh
 
-#include <array>
+#include <cstdint>
+#include <vector>
 
+#include "log_format.hh"
 #include "log_vtab_impl.hh"
+#include "logfile.hh"
 
 /**
  * A virtual table that provides access to all log messages from all formats.

src/grep_proc.hh

@@ -70,7 +70,9 @@ public:
      * @param line The line to retrieve.
      * @param value_out The destination for the line value.
      */
-    virtual std::optional<line_info> grep_value_for_line(LineType line, std::string& value_out) = 0;
+    virtual std::optional<line_info> grep_value_for_line(LineType line,
+                                                         std::string& value_out)
+        = 0;
 
     virtual LineType grep_initial_line(LineType start, LineType highest)
     {
@@ -165,7 +167,7 @@ public:
 
     using injectable = grep_proc(std::shared_ptr<pollable_supervisor>);
 
-    virtual ~grep_proc();
+    ~grep_proc() override;
 
     /** @param gpd The sink to send results to. */
     void set_sink(grep_proc_sink<LineType>* gpd) { this->gp_sink = gpd; }

src/input_dispatcher.cc

@@ -79,6 +79,9 @@ input_dispatcher::new_input(const struct timeval& current_time,
               ch.utf8,
               eff_str.c_str(),
               ch.evtype);
+    if (ncinput_mouse_p(&ch)) {
+        log_debug("  mouse [x=%d;y=%d]", ch.x, ch.y);
+    }
     if (!ncinput_mouse_p(&ch) && ch.evtype == NCTYPE_RELEASE) {
         return;
     }
@@ -106,7 +109,8 @@ input_dispatcher::new_input(const struct timeval& current_time,
                         }).unwrapOr(size_t{1});
         log_debug("seq_size %d", seq_size);
         if (seq_size == 1) {
-            snprintf(keyseq.data(), keyseq.size(), "x%02x", ch.eff_text[0] & 0xff);
+            snprintf(
+                keyseq.data(), keyseq.size(), "x%02x", ch.eff_text[0] & 0xff);
             log_debug("key %s", keyseq.data());
             handled = this->id_key_handler(nc, ch, keyseq.data());
         }

src/lnav_util.hh

@@ -42,12 +42,12 @@
 
 #include <fcntl.h>
 #include <poll.h>
+#include <stdio.h>
 #include <sys/resource.h>
 #include <sys/time.h>
 #include <sys/types.h>
 #include <time.h>
 
-#include "base/auto_mem.hh"
 #include "base/intern_string.hh"
 #include "base/lnav.console.hh"
 #include "base/result.h"

src/log_format_loader.hh

@@ -41,6 +41,7 @@
 #include "base/intern_string.hh"
 #include "base/lnav.console.hh"
 #include "shlex.resolver.hh"
+#include "yajlpp/yajlpp_def.hh"
 
 class log_vtab_manager;
 
@@ -66,7 +67,7 @@ struct script_metadata {
     std::string sm_description;
 };
 
-void extract_metadata_from_file(struct script_metadata& meta_inout);
+void extract_metadata_from_file(script_metadata& meta_inout);
 
 struct available_scripts {
     std::map<std::string, std::vector<script_metadata>> as_scripts;
@@ -75,7 +76,7 @@ struct available_scripts {
 void find_format_scripts(const std::vector<std::filesystem::path>& extra_paths,
                          available_scripts& scripts);
 
-extern const struct json_path_container format_handlers;
-extern const struct json_path_container root_format_handler;
+extern const json_path_container format_handlers;
+extern const json_path_container root_format_handler;
 
 #endif

src/md4cpp.hh

@@ -33,6 +33,7 @@
 #include <map>
 #include <string>
 #include <unordered_map>
+#include <vector>
 
 #include "base/intern_string.hh"
 #include "base/result.h"
@@ -143,7 +144,8 @@ std::string escape_html(const std::string& content);
 
 namespace literals {
 
-inline std::string operator"" _emoji(const char* str, std::size_t len)
+inline std::string
+operator"" _emoji(const char* str, std::size_t len)
 {
     const auto& em = get_emoji_map();
     const auto key = std::string(str, len);

src/sql_help.hh

@@ -33,8 +33,11 @@
 #define sql_help_hh
 
 #include <map>
+#include <string>
+#include <vector>
 
 #include "base/attr_line.hh"
+#include "base/intern_string.hh"
 #include "help_text.hh"
 
 extern string_attr_type<void> SQL_COMMAND_ATTR;
@@ -78,7 +81,7 @@ bool is_prql(const string_fragment& sf);
 
 void annotate_prql_statement(attr_line_t& al);
 
-extern const char* prql_keywords[];
+extern const char* const prql_keywords[];
 extern std::multimap<std::string, const help_text*> prql_functions;
 
 }  // namespace sql
@@ -87,7 +90,7 @@ namespace prql {
 
 std::string quote_ident(std::string id);
 
-}
+}  // namespace prql
 
 }  // namespace lnav
 

src/sql_util.cc

@@ -1056,7 +1056,7 @@ annotate_sql_statement(attr_line_t& al)
         = lnav::pcre2pp::code::from_const(R"(^;?(\.\w+))");
     static const auto ws_pattern = lnav::pcre2pp::code::from_const(R"(\A\s+)");
 
-    auto& line = al.get_string();
+    const auto& line = al.get_string();
     auto& sa = al.get_attrs();
 
     if (lnav::sql::is_prql(line)) {
@@ -1282,7 +1282,7 @@ is_prql(const string_fragment& sf)
     return (trimmed.startswith("let ") || trimmed.startswith("from"));
 }
 
-const char* prql_transforms[] = {
+static const char* const prql_transforms[] = {
     "aggregate",
     "append",
     "derive",
@@ -1299,7 +1299,7 @@ const char* prql_transforms[] = {
     nullptr,
 };
 
-const char* prql_keywords[] = {
+const char* const prql_keywords[] = {
     "average", "avg", "case", "count", "count_distinct", "false", "func",
     "into",    "let", "max",  "min",   "module",         "null",  "prql",
     "stddev",  "sum", "true", "type",