Commit cb3fc889 authored by Benno Schulenberg's avatar Benno Schulenberg
Browse files

tweaks: rename a variable and rewrap two lines

No related merge requests found
Showing with 11 additions and 10 deletions
+11 -10
...@@ -3040,7 +3040,6 @@ void save_history(void) ...@@ -3040,7 +3040,6 @@ void save_history(void)
void save_poshistory(void) void save_poshistory(void)
{ {
char *poshist = poshistfilename(); char *poshist = poshistfilename();
char *statusstr = NULL;
poshiststruct *posptr; poshiststruct *posptr;
FILE *hist; FILE *hist;
...@@ -3056,23 +3055,25 @@ void save_poshistory(void) ...@@ -3056,23 +3055,25 @@ void save_poshistory(void)
chmod(poshist, S_IRUSR | S_IWUSR); chmod(poshist, S_IRUSR | S_IWUSR);
for (posptr = position_history; posptr != NULL; posptr = posptr->next) { for (posptr = position_history; posptr != NULL; posptr = posptr->next) {
char *path_and_location;
size_t length; size_t length;
/* Assume 20 decimal positions each for line and column number, /* Assume 20 decimal positions each for line and column number,
* plus two spaces, plus the line feed, plus the null byte. */ * plus two spaces, plus the line feed, plus the null byte. */
statusstr = charalloc(strlen(posptr->filename) + 44); path_and_location = charalloc(strlen(posptr->filename) + 44);
sprintf(statusstr, "%s %ld %ld\n", posptr->filename, (long)posptr->lineno, sprintf(path_and_location, "%s %ld %ld\n", posptr->filename,
(long)posptr->xno); (long)posptr->lineno, (long)posptr->xno);
length = strlen(statusstr); length = strlen(path_and_location);
/* Encode newlines in filenames as nulls. */ /* Encode newlines in filenames as nulls. */
sunder(statusstr); sunder(path_and_location);
/* Restore the terminating newline. */ /* Restore the terminating newline. */
statusstr[length - 1] = '\n'; path_and_location[length - 1] = '\n';
if (fwrite(statusstr, sizeof(char), length, hist) < length) if (fwrite(path_and_location, sizeof(char), length, hist) < length)
fprintf(stderr, _("Error writing %s: %s\n"), poshist, strerror(errno)); fprintf(stderr, _("Error writing %s: %s\n"),
free(statusstr); poshist, strerror(errno));
free(path_and_location);
} }
fclose(hist); fclose(hist);
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment