Skip to content

Commit e1d92fb

Browse files
committed
[log_format] fix some issues from last commit
1 parent 7afde7c commit e1d92fb

2 files changed

Lines changed: 5 additions & 5 deletions

File tree

src/log_format.cc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2356,11 +2356,11 @@ external_log_format::scan_tabular(logfile& lf,
23562356
}
23572357
sep = sep_sf.data()[0];
23582358
log_info(" %ld:found 'sep=' header: %x",
2359-
std::distance(dst.begin(), ll_iter),
2359+
std::distance(lf.begin(), ll_iter),
23602360
sep.value());
23612361
} else if (hdr_sf.startswith("#")) {
23622362
log_info(" %ld:comment header -- %.*s",
2363-
std::distance(dst.begin(), ll_iter),
2363+
std::distance(lf.begin(), ll_iter),
23642364
hdr_sf.length(),
23652365
hdr_sf.data());
23662366
} else {
@@ -2393,7 +2393,7 @@ external_log_format::scan_tabular(logfile& lf,
23932393
return scan_no_match{"not enough columns matched"};
23942394
}
23952395

2396-
for (auto prev_iter = dst.begin(); prev_iter != ll_iter;
2396+
for (auto prev_iter = lf.begin(); prev_iter != ll_iter;
23972397
++prev_iter)
23982398
{
23992399
prev_iter->set_time(std::chrono::microseconds::zero());
@@ -2402,7 +2402,7 @@ external_log_format::scan_tabular(logfile& lf,
24022402
}
24032403

24042404
log_info(" %ld:found column header -- %.*s",
2405-
std::distance(dst.begin(), ll_iter),
2405+
std::distance(lf.begin(), ll_iter),
24062406
hdr_sf.length(),
24072407
hdr_sf.data());
24082408

src/log_format_ext.hh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -523,7 +523,7 @@ public:
523523
std::shared_ptr<yajl_handle_t> jlf_yajl_handle;
524524
shared_buffer jlf_share_manager;
525525

526-
file_ssize_t tlf_header_end;
526+
file_ssize_t tlf_header_end{0};
527527
char tlf_separator{','};
528528

529529
private:

0 commit comments

Comments
 (0)