X-Git-Url: http://git.vrable.net/?p=cumulus.git;a=blobdiff_plain;f=store.cc;h=f87b671e3a1e943c02376f3145c8afdf61d63bec;hp=bfeb18a77ceadcaaeca8f555283430847a4fa24e;hb=15f090d3b2f0bf3994aacd00ab07da3b1f65ea00;hpb=dd553bb0b2ac2fe7a1904d2f2670f37e3bb25ae6

diff --git a/store.cc b/store.cc
index bfeb18a..f87b671 100644
--- a/store.cc
+++ b/store.cc
@@ -41,6 +41,7 @@
 #include <string>
 #include <iostream>
 
+#include "hash.h"
 #include "store.h"
 #include "ref.h"
 #include "util.h"
@@ -77,14 +78,14 @@ Tarfile::~Tarfile()
     tar_write(buf, TAR_BLOCK_SIZE);
 
     if (close(filter_fd) != 0)
-        throw IOException("Error closing Tarfile");
+        fatal("Error closing Tarfile");
 
     /* ...and wait for filter process to finish. */
     int status;
     waitpid(filter_pid, &status, 0);
 
     if (!WIFEXITED(status) || WEXITSTATUS(status) != 0) {
-        throw IOException("Filter process error");
+        fatal("Filter process error");
     }
 
     close(real_fd);
@@ -101,13 +102,13 @@ int spawn_filter(int fd_out, const char *program, pid_t *filter_pid)
 
     /* Create a pipe for communicating with the filter process. */
     if (pipe(fds) < 0) {
-        throw IOException("Unable to create pipe for filter");
+        fatal("Unable to create pipe for filter");
     }
 
     /* Create a child process which can exec() the filter program. */
     pid = fork();
     if (pid < 0)
-        throw IOException("Unable to fork filter process");
+        fatal("Unable to fork filter process");
 
     if (pid > 0) {
         /* Parent process */
@@ -150,7 +151,7 @@ void Tarfile::tar_write(const char *data, size_t len)
             if (errno == EINTR)
                 continue;
             fprintf(stderr, "Write error: %m\n");
-            throw IOException("Write error");
+            fatal("Write error");
         }
 
         len -= res;
@@ -172,7 +173,7 @@ void Tarfile::write_object(int id, const char *data, size_t len)
     sprintf(header.mode, "%07o", 0600);
     sprintf(header.uid, "%07o", 0);
     sprintf(header.gid, "%07o", 0);
-    sprintf(header.size, "%011o", len);
+    sprintf(header.size, "%011o", (int)len);
     sprintf(header.mtime, "%011o", (int)time(NULL));
     header.typeflag = '0';
     strcpy(header.magic, "ustar  ");
@@ -281,7 +282,7 @@ void TarSegmentStore::dump_stats()
     for (map<string, pair<int64_t, int64_t> >::iterator i = group_sizes.begin();
          i != group_sizes.end(); ++i) {
         printf("    %s: %lld (%lld compressed)\n", i->first.c_str(),
-               i->second.first, i->second.second);
+               (long long)i->second.first, (long long)i->second.second);
     }
 }
 
@@ -338,7 +339,8 @@ void LbsObject::checksum()
 {
     assert(written);
 
-    SHA1Checksum hash;
-    hash.process(data, data_len);
-    ref.set_checksum(hash.checksum_str());
+    Hash *hash = Hash::New();
+    hash->update(data, data_len);
+    ref.set_checksum(hash->digest_str());
+    delete hash;
 }