ariadne
/
smol
2
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

tweaks: rename a function and swap its two parameters

master
Benno Schulenberg 2017-09-17 17:29:43 +02:00
parent 067a920517
commit 231fe4bf01
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/history.c
View File

@ -358,23 +358,21 @@ void load_history(void)
free(legacyhist); free(legacyhist);
} }
/* Write the lines of a history list, starting with the line at head, to /* Write the lines of a history list, starting at head, from oldest to newest,
* the open file at hist. Return TRUE if the write succeeded, and FALSE * to the given file. Return TRUE if writing succeeded, and FALSE otherwise. */
* otherwise. */ bool write_list(const filestruct *head, FILE *histfile)
bool writehist(FILE *hist, const filestruct *head)
{ {
const filestruct *item; const filestruct *item;
/* Write a history list, from the oldest item to the newest. */
for (item = head; item != NULL; item = item->next) { for (item = head; item != NULL; item = item->next) {
size_t length = strlen(item->data); size_t length = strlen(item->data);
/* Decode 0x0A bytes as embedded NULs. */ /* Decode 0x0A bytes as embedded NULs. */
sunder(item->data); sunder(item->data);
if (fwrite(item->data, sizeof(char), length, hist) < length) if (fwrite(item->data, sizeof(char), length, histfile) < length)
return FALSE; return FALSE;
if (putc('\n', hist) == EOF) if (putc('\n', histfile) == EOF)
return FALSE; return FALSE;
} }
@ -405,8 +403,8 @@ void save_history(void)
/* Don't allow others to read or write the history file. */ /* Don't allow others to read or write the history file. */
chmod(searchhist, S_IRUSR | S_IWUSR); chmod(searchhist, S_IRUSR | S_IWUSR);
if (!writehist(hist, searchtop) || !writehist(hist, replacetop) || if (!write_list(searchtop, hist) || !write_list(replacetop, hist) ||
!writehist(hist, executetop)) !write_list(executetop, hist))
fprintf(stderr, _("Error writing %s: %s\n"), searchhist, fprintf(stderr, _("Error writing %s: %s\n"), searchhist,
strerror(errno)); strerror(errno));