summaryrefslogtreecommitdiffstats
path: root/merge.cc
diff options
context:
space:
mode:
authorDaniel Baumann <mail@daniel-baumann.ch>2015-11-07 11:52:38 +0000
committerDaniel Baumann <mail@daniel-baumann.ch>2015-11-07 11:52:38 +0000
commitd296515f4777d1e4b7d78e6aa8ea698162bfbc2b (patch)
tree3a4ce9f245a9eb30538daa0b9b62c16146d9ad0e /merge.cc
parentAdding debian version 1.17-1. (diff)
downloadlziprecover-d296515f4777d1e4b7d78e6aa8ea698162bfbc2b.tar.xz
lziprecover-d296515f4777d1e4b7d78e6aa8ea698162bfbc2b.zip
Merging upstream version 1.18~pre1.
Signed-off-by: Daniel Baumann <mail@daniel-baumann.ch>
Diffstat (limited to '')
-rw-r--r--merge.cc4
1 files changed, 2 insertions, 2 deletions
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 )