X-Git-Url: http://git.pippins.net/embedvideo/.git/static/git-logo.png?a=blobdiff_plain;f=main.cpp;h=3a86a2bb2df27c03a56a987ff49419129ec683db;hb=0038f2b0e5a51baef501d94ee91ea8e469298fd5;hp=de22d91e28bb13388dd7dfd2b4b72863b0ee3288;hpb=b1faa07ab41440b9af427937f43084d517c3dcf9;p=backups%2F.git

diff --git a/main.cpp b/main.cpp
index de22d91..3a86a2b 100644
--- a/main.cpp
+++ b/main.cpp
@@ -29,20 +29,19 @@ template<class I, class O, class INT>
 bool copy_until_full( I begin, I end, O out, INT &space ) {
   bool complete = true;
 
-  I i = begin;
-  while( 0 != space && i != end ) {
-    INT size = (*i)->getFileSize();
+  while( 0 != space && begin != end ) {
+    INT size = (*begin)->getFileSize();
     INT blocksize = blocks( size ) * bytes_in_block;
 
     if( blocksize <= space ) {
       space -= blocksize;
-      out = *i;
+      out = *begin;
       ++out;
     } else {
       // We missed a file that should be included so the backup is not complete
       complete = false;
     }
-    ++i;
+    ++begin;
   }
   return complete;
 }
@@ -155,29 +154,28 @@ int main() {
 
   // Now find the list of files to backup.
   file_set backups;
-  insert_iterator<file_set> backups_i( backups, backups.begin() );
 
   // backup all added files
-  copy( added.begin(), added.end(), backups_i );
+  copy( added.begin(), added.end(), inserter( backups, backups.begin() ) );
 
   // Track the total size of added files
   unsigned long long added_blocks, added_bytes;
   sizes( added.begin(), added.end(), added_blocks, added_bytes );
 
-  file_vector modified_files;
+  file_vector modified_v;
   // Backup files that have been modified
   file_set::iterator i = common.begin(), j = old_common.begin();
   for( ; i != common.end(); ++i, ++j ) {
     (*i)->setLastBackupDate( (*j)->getLastBackupDate() );
 
-    if( needs_backup( *j, *i ) ) modified_files.push_back( *i );
+    if( needs_backup( *j, *i ) ) modified_v.push_back( *i );
   }
 
-  copy( modified_files.begin(), modified_files.end(), backups_i );
+  copy( modified_v.begin(), modified_v.end(), inserter( backups, backups.begin() ) );
 
   // Track the total size of modified files
   unsigned long long modified_blocks, modified_bytes;
-  sizes( modified_files.begin(), modified_files.end(), modified_blocks, modified_bytes );
+  sizes( modified_v.begin(), modified_v.end(), modified_blocks, modified_bytes );
 
   // Now, sort the backups by filesize and build a list that'll fit on a DVD
   file_vector backups_s;
@@ -187,7 +185,7 @@ int main() {
   sort( backups_s.begin(), backups_s.end(), sizecmp );
 
   file_set final;
-  unsigned long long space = 0x100000000ULL; // After looking at how big the ISO can be and how many 1K blocks are left after formatting the filesystem I decided on an even 4GB target
+  unsigned long long space = 0x100000000ULL;
 
   insert_iterator<file_set> final_i( final, final.begin() );