nano

commit 28a6d9f3009c950daa13d4d62a3bcd33c21fbc93
parent f92606491c7b5d68a44b4f9ee502b9123826f796
Author: Benno Schulenberg <bensberg@telfort.nl>
Date:   Wed,  5 Jun 2019 15:32:50 +0200

tweaks: rename four elements of the holder struct, for more contrast

Diffstat:
M
src/nano.c
 | 
28
++++++++++++++--------------
M
src/nano.h
 | 
8
++++----

2 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/src/nano.c b/src/nano.c
@@ -215,16 +215,16 @@ void partition_buffer(linestruct *top, size_t top_x,
 
 	/* Remember which line is above the top of the partition, detach the
 	 * top of the partition from it, and save the text before top_x. */
-	sphere->top_prev = top->prev;
+	sphere->before = top->prev;
 	top->prev = NULL;
-	sphere->top_data = mallocstrncpy(NULL, top->data, top_x + 1);
-	sphere->top_data[top_x] = '\0';
+	sphere->antedata = mallocstrncpy(NULL, top->data, top_x + 1);
+	sphere->antedata[top_x] = '\0';
 
 	/* Remember which line is below the bottom of the partition, detach the
 	 * bottom of the partition from it, and save the text after bot_x. */
-	sphere->bot_next = bot->next;
+	sphere->after = bot->next;
 	bot->next = NULL;
-	sphere->bot_data = mallocstrcpy(NULL, bot->data + bot_x);
+	sphere->postdata = mallocstrcpy(NULL, bot->data + bot_x);
 
 	/* Remove all text after bot_x at the bottom of the partition. */
 	bot->data[bot_x] = '\0';
@@ -240,26 +240,26 @@ void unpartition_buffer()
 	/* Reattach the line above the top of the partition, and restore the
 	 * text before top_x from top_data.  Free top_data when we're done
 	 * with it. */
-	openfile->filetop->prev = sphere->top_prev;
+	openfile->filetop->prev = sphere->before;
 	if (openfile->filetop->prev != NULL)
 		openfile->filetop->prev->next = openfile->filetop;
 	openfile->filetop->data = charealloc(openfile->filetop->data,
-				strlen(sphere->top_data) + strlen(openfile->filetop->data) + 1);
-	charmove(openfile->filetop->data + strlen(sphere->top_data),
+				strlen(sphere->antedata) + strlen(openfile->filetop->data) + 1);
+	charmove(openfile->filetop->data + strlen(sphere->antedata),
 				openfile->filetop->data, strlen(openfile->filetop->data) + 1);
-	strncpy(openfile->filetop->data, sphere->top_data, strlen(sphere->top_data));
-	free(sphere->top_data);
+	strncpy(openfile->filetop->data, sphere->antedata, strlen(sphere->antedata));
+	free(sphere->antedata);
 
 	/* Reattach the line below the bottom of the partition, and restore
 	 * the text after bot_x from bot_data.  Free bot_data when we're
 	 * done with it. */
-	openfile->filebot->next = sphere->bot_next;
+	openfile->filebot->next = sphere->after;
 	if (openfile->filebot->next != NULL)
 		openfile->filebot->next->prev = openfile->filebot;
 	openfile->filebot->data = charealloc(openfile->filebot->data,
-				strlen(openfile->filebot->data) + strlen(sphere->bot_data) + 1);
-	strcat(openfile->filebot->data, sphere->bot_data);
-	free(sphere->bot_data);
+				strlen(openfile->filebot->data) + strlen(sphere->postdata) + 1);
+	strcat(openfile->filebot->data, sphere->postdata);
+	free(sphere->postdata);
 
 	/* Restore the top and bottom of the buffer, if they were
 	 * different from the top and bottom of the partition. */
diff --git a/src/nano.h b/src/nano.h
@@ -295,16 +295,16 @@ typedef struct linestruct {
 typedef struct holder_type {
 	linestruct *filetop;
 		/* The top line of the buffer. */
-	linestruct *top_prev;
+	linestruct *before;
 		/* The line before the top line of the partition. */
-	char *top_data;
+	char *antedata;
 		/* The text on the top line of the partition before the beginning
 		 * of the partition. */
 	linestruct *filebot;
 		/* The bottom line of the buffer. */
-	linestruct *bot_next;
+	linestruct *after;
 		/* The line after the bottom line of the partition. */
-	char *bot_data;
+	char *postdata;
 		/* The text on the bottom line of the partition after the end
 		 * of the partition. */
 } holder_type;