nano

commit cb3fc8892ad00fef9c895c979b8a58d28e97e3d9
parent 06d9ee89e5678acbca4fde1e6f82b3e7c55d6139
Author: Benno Schulenberg <bensberg@justemail.net>
Date:   Sun, 18 Dec 2016 16:34:19 +0100

tweaks: rename a variable and rewrap two lines

Diffstat:
M
src/files.c
 | 
21
+++++++++++----------

1 file changed, 11 insertions(+), 10 deletions(-)
diff --git a/src/files.c b/src/files.c
@@ -3040,7 +3040,6 @@ void save_history(void)
 void save_poshistory(void)
 {
     char *poshist = poshistfilename();
-    char *statusstr = NULL;
     poshiststruct *posptr;
     FILE *hist;
 
@@ -3056,23 +3055,25 @@ void save_poshistory(void)
 	chmod(poshist, S_IRUSR | S_IWUSR);
 
 	for (posptr = position_history; posptr != NULL; posptr = posptr->next) {
+	    char *path_and_location;
 	    size_t length;
 
 	    /* Assume 20 decimal positions each for line and column number,
 	     * plus two spaces, plus the line feed, plus the null byte. */
-	    statusstr = charalloc(strlen(posptr->filename) + 44);
-	    sprintf(statusstr, "%s %ld %ld\n", posptr->filename, (long)posptr->lineno,
-			(long)posptr->xno);
-	    length = strlen(statusstr);
+	    path_and_location = charalloc(strlen(posptr->filename) + 44);
+	    sprintf(path_and_location, "%s %ld %ld\n", posptr->filename,
+			(long)posptr->lineno, (long)posptr->xno);
+	    length = strlen(path_and_location);
 
 	    /* Encode newlines in filenames as nulls. */
-	    sunder(statusstr);
+	    sunder(path_and_location);
 	    /* Restore the terminating newline. */
-	    statusstr[length - 1] = '\n';
+	    path_and_location[length - 1] = '\n';
 
-	    if (fwrite(statusstr, sizeof(char), length, hist) < length)
-		fprintf(stderr, _("Error writing %s: %s\n"), poshist, strerror(errno));
-	    free(statusstr);
+	    if (fwrite(path_and_location, sizeof(char), length, hist) < length)
+		fprintf(stderr, _("Error writing %s: %s\n"),
+					poshist, strerror(errno));
+	    free(path_and_location);
 	}
 	fclose(hist);
     }