Skip to content

Fix #25 #28

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
presuku wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix #25 #28

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f2e6ee2
change read_len to read_sum.
presuku May 31, 2017
08dd0de
remove needless code.
presuku May 31, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions src/search.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -403,7 +403,6 @@ int search(int fd,
ssize_t read_len;
int buf_offset = 0;
int match_count = 0;
bool do_search = false;
char *buf = (char *)hw_calloc(n + 1, SIZE_OF_CHAR);
char *last_new_line_scan_pos = buf;
char *last_line_end;
Expand All @@ -418,7 +417,7 @@ int search(int fd,
// Search end position of the last line in the buffer. We search from the first position
// and end position of the last line.
size_t search_len;
if (read_len < NMAX) {
if (read_sum < NMAX) {
last_line_end = buf + read_sum;
search_len = read_sum;
buf[read_sum] = eol;
Expand All @@ -432,8 +431,6 @@ int search(int fd,
search_len = last_line_end - buf;
}

do_search = true;

// Search the pattern and construct matching results. The results will be stored to list
// `match_lines`.
int count = search_buffer(
Expand Down