Remove all the verbose-mode code from merge.c, and put most of it in

mergecap.c (get rid of the verbose printing of information for each
packet).

Have "merge_append_files()" return FALSE only on a write error, as
"merge_files()" does.

Sort the routines in "merge.c" in the order from "merge.h".

svn path=/trunk/; revision=12422

1 files changed, 2 insertions, 3 deletions

diff --git a/file.c b/file.c
index f1a407fc51..f54a520e76 100644
--- a/file.c
+++ b/file.c
@@ -980,9 +980,8 @@ cf_merge_files(const char *out_filename, int out_fd, int in_file_count,
   gboolean          ret;
 
   /* open the input files */
-  in_file_count = merge_open_in_files(in_file_count, in_filenames, &in_files,
-                                      &err, &err_info, &err_fileno);
-  if (in_file_count < 2) {
+  if (!merge_open_in_files(in_file_count, in_filenames, &in_files,
+                           &err, &err_info, &err_fileno)) {
     free(in_files);
     cf_open_failure_alert_box(in_filenames[err_fileno], err, err_info, FALSE, 0);
     return FALSE;