summaryrefslogtreecommitdiffabout
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--src/eyetil.cc9
-rw-r--r--src/eyetil.h2
2 files changed, 0 insertions, 11 deletions
diff --git a/src/eyetil.cc b/src/eyetil.cc
index 5bceec7..5489d7b 100644
--- a/src/eyetil.cc
+++ b/src/eyetil.cc
@@ -180,21 +180,12 @@ std::string tarchive_t::entry_pathname() {
180 180
181bool tarchive_t::read_data_into_fd(int fd) { 181bool tarchive_t::read_data_into_fd(int fd) {
182 assert(a); 182 assert(a);
183 return archive_read_data_into_fd(a,fd)==ARCHIVE_OK; 183 return archive_read_data_into_fd(a,fd)==ARCHIVE_OK;
184} 184}
185 185
186
187binary_t integrity_digest(const void *ptr,size_t size,const std::string& ukey) {
188 md5_digester rv;
189 std::transform( (block512_t*)ptr, ((block512_t*)ptr)+size/sizeof(block512_t),
190 rv.updater<uint16_t>(), block512_t::tcpcksum );
191 rv.update( binary_t(ukey) );
192 return rv.final();
193}
194
195mimewrite_tarfile::mimewrite_tarfile(tmpdir_t& d) { 186mimewrite_tarfile::mimewrite_tarfile(tmpdir_t& d) {
196 f.open((fn=d.get_file("the-tarfile.tar")).c_str(),std::ios_base::in|std::ios_base::out|std::ios_base::trunc|std::ios_base::binary); 187 f.open((fn=d.get_file("the-tarfile.tar")).c_str(),std::ios_base::in|std::ios_base::out|std::ios_base::trunc|std::ios_base::binary);
197} 188}
198mimewrite_tarfile::~mimewrite_tarfile() { 189mimewrite_tarfile::~mimewrite_tarfile() {
199 unlink(fn.c_str()); 190 unlink(fn.c_str());
200} 191}
diff --git a/src/eyetil.h b/src/eyetil.h
index 8af18a4..22e07f1 100644
--- a/src/eyetil.h
+++ b/src/eyetil.h
@@ -129,10 +129,8 @@ struct mimewrite_tarfile : public mimewrite_base {
129 integrity_digester idigest; 129 integrity_digester idigest;
130 mimewrite_tarfile(tmpdir_t& d); 130 mimewrite_tarfile(tmpdir_t& d);
131 ~mimewrite_tarfile(); 131 ~mimewrite_tarfile();
132 int write(const char *buf,size_t len); 132 int write(const char *buf,size_t len);
133 void close() { } 133 void close() { }
134}; 134};
135binary_t integrity_digest(const void *ptr,size_t size,
136 const std::string& ukey);
137 135
138#endif /* __EYETIL_H */ 136#endif /* __EYETIL_H */