X-Git-Url: http://git.pippins.net/embedvideo/.git/static/git-logo.png?a=blobdiff_plain;f=main.cpp;h=b85ee5276e4ed8f074ad094788493ed182613db0;hb=ec1b9b3f44b0b6af802abab8ccd26ae1ce2b9c44;hp=8540adfb56c480db0d6284b3811bafd051773ec2;hpb=ddc36cb7ada4575030f31894eba76c3fc96e2826;p=backups%2F.git

diff --git a/main.cpp b/main.cpp
index 8540adf..b85ee52 100644
--- a/main.cpp
+++ b/main.cpp
@@ -35,7 +35,7 @@ bool copy_until_full( I begin, I end, O out, INT &space ) {
 
     if( blocksize <= space ) {
       space -= blocksize;
-      out = *begin;
+      *out = *begin;
       ++out;
     } else {
       // We missed a file that should be included so the backup is not complete
@@ -62,27 +62,25 @@ void populate_set( istream &in, SET &files ) {
 template<class SET>
 void partition_sets( const SET &current, const SET &old,
                      SET &added, SET &common, SET &old_common, SET &deleted  ) {
-  FileDataNameCmp cmp;
-
   set_difference(   current.begin(), current.end(),
                     old.begin(),     old.end(),
                     inserter( added, added.begin() ),
-                    cmp );
+                    FileData::namecmp );
 
   set_difference(   old.begin(),     old.end(),
                     current.begin(), current.end(),
                     inserter( deleted, deleted.begin() ),
-                    cmp );
+                    FileData::namecmp );
 
   set_intersection( current.begin(), current.end(),
                     old.begin(),     old.end(),
                     inserter( common, common.begin() ),
-                    cmp );
+                    FileData::namecmp );
 
   set_intersection( old.begin(),    old.end(),
                     common.begin(), common.end(),
                     inserter( old_common, old_common.begin() ),
-                    cmp );
+                    FileData::namecmp );
 }
 
 template<class INT>
@@ -182,8 +180,7 @@ int main() {
   file_vector backups_s;
   copy( backups.begin(), backups.end(), back_inserter( backups_s ) );
 
-  FileDataSizeCmp sizecmp;
-  sort( backups_s.rbegin(), backups_s.rend(), sizecmp );
+  sort( backups_s.rbegin(), backups_s.rend(), FileData::sizecmp );
 
   file_set final;
   unsigned long long space = 0x100000000ULL;
@@ -203,17 +200,15 @@ int main() {
   // collection left with actual content.
   if( 0 != space ) {
     file_vector leftovers;
-    FileDataNameCmp cmp;
     set_difference( current.begin(), current.end(),
                     final.begin(),   final.end(),
                     back_inserter( leftovers ),
-                    cmp );
+                    FileData::namecmp );
 
-    FileDataLastBackupCmp lastbackupcmp;
-    // Achieve 'last back date then by filesize' by first sorting by filesizing
+    // Achieve 'last back date then by filesize' by first sorting by filesize
     // and then running stable sort by last backup date.
-    sort(        leftovers.rbegin(), leftovers.rend(), sizecmp );
-    stable_sort( leftovers.begin(),  leftovers.end(),  lastbackupcmp );
+    sort(        leftovers.rbegin(), leftovers.rend(), FileData::sizecmp );
+    stable_sort( leftovers.begin(),  leftovers.end(),  FileData::lastbackupcmp );
 
     copy_until_full( leftovers.begin(), leftovers.end(), final_i, space );
   }