| commit | fb41e82c77e4887c7892c90584e3a2bc0b3c4895 | |
| author | Paul Eggert <eggert@cs.ucla.edu> | |
| Fri, 3 Dec 2010 23:11:46 +0000 (3 15:11 -0800) | ||
| committer | Paul Eggert <eggert@cs.ucla.edu> | |
| Sat, 4 Dec 2010 07:43:31 +0000 (3 23:43 -0800) | ||
| tree | 2ae7f59a13402c64b27a12c13048642b4687146b | treesnapshot (tar.gz zip) |
| parent | f2d977aff104415832bcb6487943344d03f51450 | commitdiff |
sort: fix problems with merge node dest pointer
* src/sort.c (mergelines_node): Return void, not size_t. All
callers changed. Change *node->dest here, not in caller.
Do not change node->dest: it's not needed and could cause problems
on (mostly theoretical) hosts that do not allow adding integers to
null pointers.
(queue_check_insert_parent): Omit MERGED parameter; no longer needed.
All callers changed.
* src/sort.c (mergelines_node): Return void, not size_t. All
callers changed. Change *node->dest here, not in caller.
Do not change node->dest: it's not needed and could cause problems
on (mostly theoretical) hosts that do not allow adding integers to
null pointers.
(queue_check_insert_parent): Omit MERGED parameter; no longer needed.
All callers changed.
| src/sort.c | diffblobblamehistory |