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

tweaks: elide an intermediate copy of some line data

master
Benno Schulenberg 2016-06-14 12:06:58 +02:00
parent dfbabc0411
commit 80552aeab7
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/nano.c
View File

@ -246,23 +246,20 @@ partition *partition_filestruct(filestruct *top, size_t top_x,
* at (filebot, strlen(filebot->data)) again. */ * at (filebot, strlen(filebot->data)) again. */
void unpartition_filestruct(partition **p) void unpartition_filestruct(partition **p)
{ {
char *tmp;
assert(p != NULL && openfile->fileage != NULL && openfile->filebot != NULL); assert(p != NULL && openfile->fileage != NULL && openfile->filebot != NULL);
/* Reattach the line above the top of the partition, and restore the /* 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 * text before top_x from top_data. Free top_data when we're done
* with it. */ * with it. */
tmp = mallocstrcpy(NULL, openfile->fileage->data);
openfile->fileage->prev = (*p)->top_prev; openfile->fileage->prev = (*p)->top_prev;
if (openfile->fileage->prev != NULL) if (openfile->fileage->prev != NULL)
openfile->fileage->prev->next = openfile->fileage; openfile->fileage->prev->next = openfile->fileage;
openfile->fileage->data = charealloc(openfile->fileage->data, openfile->fileage->data = charealloc(openfile->fileage->data,
strlen((*p)->top_data) + strlen(openfile->fileage->data) + 1); strlen((*p)->top_data) + strlen(openfile->fileage->data) + 1);
strcpy(openfile->fileage->data, (*p)->top_data); charmove(openfile->fileage->data + strlen((*p)->top_data),
openfile->fileage->data, strlen(openfile->fileage->data) + 1);
strncpy(openfile->fileage->data, (*p)->top_data, strlen((*p)->top_data));
free((*p)->top_data); free((*p)->top_data);
strcat(openfile->fileage->data, tmp);
free(tmp);
/* Reattach the line below the bottom of the partition, and restore /* 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 * the text after bot_x from bot_data. Free bot_data when we're