Compare commits

...

2 Commits

@ -3365,6 +3365,7 @@ com_open(exec_context& ec, std::string cmdline, std::vector<std::string>& args)
} }
break; break;
} }
case file_format_t::MULTIPLEXED:
case file_format_t::UNKNOWN: { case file_format_t::UNKNOWN: {
auto open_res auto open_res
= lnav::filesystem::open_file(fn, O_RDONLY); = lnav::filesystem::open_file(fn, O_RDONLY);

@ -746,8 +746,7 @@ struct logline_cmp {
}; };
logfile_sub_source::rebuild_result logfile_sub_source::rebuild_result
logfile_sub_source::rebuild_index( logfile_sub_source::rebuild_index(std::optional<ui_clock::time_point> deadline)
std::optional<ui_clock::time_point> deadline)
{ {
if (this->tss_view == nullptr) { if (this->tss_view == nullptr) {
return rebuild_result::rr_no_change; return rebuild_result::rr_no_change;
@ -1822,7 +1821,6 @@ logfile_sub_source::eval_sql_filter(sqlite3_stmt* stmt,
continue; continue;
} }
if (strcmp(name, ":log_opid") == 0) { if (strcmp(name, ":log_opid") == 0) {
auto opid_attr_opt = get_string_attr(sa, logline::L_OPID);
if (values.lvv_opid_value) { if (values.lvv_opid_value) {
sqlite3_bind_text(stmt, sqlite3_bind_text(stmt,
lpc + 1, lpc + 1,
@ -2773,8 +2771,7 @@ logfile_sub_source::get_bookmark_metadata_context(
} }
} }
if (vl_iter == bv.begin()) { if (vl_iter == bv.begin()) {
return bookmark_metadata_context{ return bookmark_metadata_context{std::nullopt, std::nullopt, next_line};
std::nullopt, std::nullopt, next_line};
} }
--vl_iter; --vl_iter;
@ -2793,8 +2790,7 @@ logfile_sub_source::get_bookmark_metadata_context(
} }
--vl_iter; --vl_iter;
} }
return bookmark_metadata_context{ return bookmark_metadata_context{std::nullopt, std::nullopt, next_line};
std::nullopt, std::nullopt, next_line};
} }
std::optional<bookmark_metadata*> std::optional<bookmark_metadata*>

@ -347,6 +347,11 @@ static
std::string std::string
discover_tz_dir() discover_tz_dir()
{ {
auto tz_dir_env = getenv("TZDIR");
if (tz_dir_env != nullptr && tz_dir_env[0]) {
return tz_dir_env;
}
struct stat sb; struct stat sb;
using namespace std; using namespace std;
# ifndef __APPLE__ # ifndef __APPLE__

Loading…
Cancel
Save