emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

patch: move closer to toybox code

Browse Source 
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2010-08-13 16:41:15 +02:00
parent 760d0ebbe5
commit 6373bb7740
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
editors/patch.c
View File

@ -82,6 +82,9 @@ void TOY_llist_free(void *list, void (*freeit)(void *data))
if (list==pop) break; if (list==pop) break;
} }
} }
//Override bbox's names
#define llist_pop TOY_llist_pop
#define llist_free TOY_llist_free
// Add an entry to the end off a doubly linked list // Add an entry to the end off a doubly linked list
static static
@ -292,7 +295,7 @@ static void fail_hunk(void)
// this file and advance to next file. // this file and advance to next file.
TT.state = 2; TT.state = 2;
TOY_llist_free(TT.current_hunk, do_line); llist_free(TT.current_hunk, do_line);
TT.current_hunk = NULL; TT.current_hunk = NULL;
delete_tempfile(TT.filein, TT.fileout, &TT.tempname); delete_tempfile(TT.filein, TT.fileout, &TT.tempname);
TT.state = 0; TT.state = 0;
@ -378,7 +381,7 @@ static int apply_one_hunk(void)
fdprintf(2, "NOT: %s\n", plist->data); fdprintf(2, "NOT: %s\n", plist->data);
TT.state = 3; TT.state = 3;
check = TOY_llist_pop(&buf); check = llist_pop(&buf);
check->prev->next = buf; check->prev->next = buf;
buf->prev = check->prev; buf->prev = check->prev;
do_line(check); do_line(check);
@ -405,13 +408,13 @@ static int apply_one_hunk(void)
out: out:
// We have a match. Emit changed data. // We have a match. Emit changed data.
TT.state = "-+"[reverse]; TT.state = "-+"[reverse];
TOY_llist_free(TT.current_hunk, do_line); llist_free(TT.current_hunk, do_line);
TT.current_hunk = NULL; TT.current_hunk = NULL;
TT.state = 1; TT.state = 1;
done: done:
if (buf) { if (buf) {
buf->prev->next = NULL; buf->prev->next = NULL;
TOY_llist_free(buf, do_line); llist_free(buf, do_line);
} }
return TT.state; return TT.state;