From 79cd96ee549de2d24d5ba81d6f8fa4d642943b52 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sat, 7 Nov 2015 12:51:28 +0100 Subject: Merging upstream version 1.17~rc2. Signed-off-by: Daniel Baumann --- file_index.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'file_index.cc') diff --git a/file_index.cc b/file_index.cc index de685a3..49511bf 100644 --- a/file_index.cc +++ b/file_index.cc @@ -85,8 +85,8 @@ File_index::File_index( const int infd ) const long long member_size = trailer.member_size(); if( member_size < min_member_size || member_size > pos ) { - if( member_vector.empty() ) // maybe trailing garbage - { --pos; continue; } + if( member_vector.empty() ) + { --pos; continue; } // maybe trailing garbage set_num_error( "Member size in trailer is corrupt at pos ", pos - 8 ); break; } @@ -95,8 +95,8 @@ File_index::File_index( const int infd ) { set_errno_error( "Error reading member header: " ); break; } if( !header.verify_magic() || !header.verify_version() ) { - if( member_vector.empty() ) // maybe trailing garbage - { --pos; continue; } + if( member_vector.empty() ) + { --pos; continue; } // maybe trailing garbage set_num_error( "Bad header at pos ", pos - member_size ); break; } -- cgit v1.2.3