Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2024-12-26 12:53:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix history.cpp merge

Browse source
This commit is contained in:
Aaron Gyes 2016-07-01 03:24:00 -07:00
parent 6a36144587
commit 1fb4cc0e76
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/history.cpp
View file

@ -791,14 +791,14 @@ static size_t read_line(const char *base, size_t cursor, size_t len, std::string
/* Locate the newline */ /* Locate the newline */
assert(cursor <= len); assert(cursor <= len);
const char *start = base + cursor; const char *start = base + cursor;
const char *newline = (char *)memchr(start, '\n', len - cursor); const char *a_newline = (char *)memchr(start, '\n', len - cursor);
if (newline != NULL) if (a_newline != NULL)
{ {
/* We found a newline. */ /* We found a newline. */
result.assign(start, newline - start); result.assign(start, a_newline - start);
/* Return the amount to advance the cursor; skip over the newline */ /* Return the amount to advance the cursor; skip over the newline */
return newline - start + 1; return a_newline - start + 1;
} }
else else
{ {
@ -1799,7 +1799,7 @@ void history_t::populate_from_bash(FILE *stream)
if (success) if (success)
{ {
/* Skip the newline */ /* Skip the newline */
char *newline = strchr(buff, '\n'); char *a_newline = strchr(buff, '\n');
if (a_newline) *a_newline = '\0'; if (a_newline) *a_newline = '\0';
has_newline = (a_newline != NULL); has_newline = (a_newline != NULL);