diff options
| author | josh.macdonald <jmacd@users.noreply.github.com> | 2007-12-17 03:34:10 +0000 |
|---|---|---|
| committer | josh.macdonald <jmacd@users.noreply.github.com> | 2007-12-17 03:34:10 +0000 |
| commit | d22f1e1becc52f5bc41319c44d8a71225ee82742 (patch) | |
| tree | 0acffab5358ec3a6ef2a1fbd0a7aa5c9a9a61107 | |
| parent | 7e94b75cd4c567ca855514caa126632486a0f054 (diff) | |
Fix.
| -rw-r--r-- | xdelta3/xdelta3-main.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/xdelta3/xdelta3-main.h b/xdelta3/xdelta3-main.h index ec0f858..d6b237f 100644 --- a/xdelta3/xdelta3-main.h +++ b/xdelta3/xdelta3-main.h | |||
| @@ -1609,7 +1609,7 @@ main_init_merge_state (xd3_stream *stream, main_merge *merge) | |||
| 1609 | static int | 1609 | static int |
| 1610 | main_merge_arguments (main_merge_list* merges) | 1610 | main_merge_arguments (main_merge_list* merges) |
| 1611 | { | 1611 | { |
| 1612 | int ret; | 1612 | /* int ret; */ |
| 1613 | main_merge *merge = NULL; | 1613 | main_merge *merge = NULL; |
| 1614 | 1614 | ||
| 1615 | if (main_merge_list_empty (merges)) | 1615 | if (main_merge_list_empty (merges)) |
| @@ -1623,10 +1623,10 @@ main_merge_arguments (main_merge_list* merges) | |||
| 1623 | { | 1623 | { |
| 1624 | DP(RINT "TODO MERGE FILE: %s\n", merge->filename); | 1624 | DP(RINT "TODO MERGE FILE: %s\n", merge->filename); |
| 1625 | 1625 | ||
| 1626 | if ((ret = main_init_merge_state (stream, NULL))) | 1626 | /* if ((ret = main_init_merge_state (NULL, NULL))) */ |
| 1627 | { | 1627 | /* { */ |
| 1628 | return ret; | 1628 | /* return ret; */ |
| 1629 | } | 1629 | /* } */ |
| 1630 | 1630 | ||
| 1631 | merge = main_merge_list_next (merge); | 1631 | merge = main_merge_list_next (merge); |
| 1632 | } | 1632 | } |