From d296515f4777d1e4b7d78e6aa8ea698162bfbc2b Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sat, 7 Nov 2015 12:52:38 +0100 Subject: Merging upstream version 1.18~pre1. Signed-off-by: Daniel Baumann --- merge.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'merge.cc') diff --git a/merge.cc b/merge.cc index b2249e6..75faf07 100644 --- a/merge.cc +++ b/merge.cc @@ -480,12 +480,12 @@ int merge_files( const std::vector< std::string > & filenames, { done = try_merge_member( mpos, msize, block_vector, color_vector, infd_vector, output_filename, outfd, verbosity ); - if( !done && verbosity >= 1 ) std::fputs( "\n", stdout ); + if( !done && verbosity >= 1 ) std::fputc( '\n', stdout ); } if( !done ) done = try_merge_member1( mpos, msize, block_vector, color_vector, infd_vector, output_filename, outfd, verbosity ); - if( verbosity >= 1 ) std::fputs( "\n", stdout ); + if( verbosity >= 1 ) std::fputc( '\n', stdout ); if( !done ) { if( verbosity >= 2 ) -- cgit v1.2.3