summaryrefslogtreecommitdiffabout
path: root/src
authorMichael Krelin <hacker@klever.net>2013-02-13 22:44:04 (UTC)
committer Michael Krelin <hacker@klever.net>2013-02-13 22:44:04 (UTC)
commit2f324e506a84775b10b3eace4b50df9bf3ba57b6 (patch) (side-by-side diff)
treec150e0f307ab15477caf9bca422ee4cf76c2abff /src
parent2a5950df692f8a2c9d51a2a3e0c4d41fe0d3e7c9 (diff)
downloadiii-2f324e506a84775b10b3eace4b50df9bf3ba57b6.zip
iii-2f324e506a84775b10b3eace4b50df9bf3ba57b6.tar.gz
iii-2f324e506a84775b10b3eace4b50df9bf3ba57b6.tar.bz2
remove unused in-memory digest calculation
Signed-off-by: Michael Krelin <hacker@klever.net>
Diffstat (limited to 'src') (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
@@ -138,66 +138,57 @@ tmpdir_t::tmpdir_t(const std::string& dt) : dir(dt) {
}
tmpdir_t::~tmpdir_t() {
assert(!dir.empty());
if(rmdir(dir.c_str())) {
syslog(LOG_WARNING,"Failed to remove '%s' directory",dir.c_str());
}
}
std::string tmpdir_t::get_file(const std::string& f) {
std::string::size_type ls = f.rfind('/');
return dir+'/'+(
(ls==std::string::npos)
? f
: f.substr(ls+1)
);
}
tarchive_t::tarchive_t(const char *fn) : a(archive_read_new()), e(0) {
if(!a) throw std::runtime_error("failed to archive_read_new()");
if(archive_read_support_format_tar(a)) {
archive_read_finish(a);
throw std::runtime_error("failed to archive_read_support_format_tar()");
}
if(archive_read_open_filename(a,fn,16384)) {
archive_read_finish(a);
throw std::runtime_error("failed to archive_read_open_memory()");
}
}
tarchive_t::~tarchive_t() {
assert(a);
archive_read_finish(a);
}
bool tarchive_t::read_next_header() {
assert(a);
return archive_read_next_header(a,&e)==ARCHIVE_OK;
}
std::string tarchive_t::entry_pathname() {
assert(a); assert(e);
return archive_entry_pathname(e);
}
bool tarchive_t::read_data_into_fd(int fd) {
assert(a);
return archive_read_data_into_fd(a,fd)==ARCHIVE_OK;
}
-
-binary_t integrity_digest(const void *ptr,size_t size,const std::string& ukey) {
- md5_digester rv;
- std::transform( (block512_t*)ptr, ((block512_t*)ptr)+size/sizeof(block512_t),
- rv.updater<uint16_t>(), block512_t::tcpcksum );
- rv.update( binary_t(ukey) );
- return rv.final();
-}
-
mimewrite_tarfile::mimewrite_tarfile(tmpdir_t& d) {
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);
}
mimewrite_tarfile::~mimewrite_tarfile() {
unlink(fn.c_str());
}
int mimewrite_tarfile::write(const char *buf,size_t len) {
return f.write(buf,len) ? (idigest.update(buf,len),SOAP_OK) : SOAP_ERR;
}
diff --git a/src/eyetil.h b/src/eyetil.h
index 8af18a4..22e07f1 100644
--- a/src/eyetil.h
+++ b/src/eyetil.h
@@ -87,52 +87,50 @@ struct integrity_digester {
};
class tmpdir_t {
public:
std::string dir;
tmpdir_t(const std::string& dt);
~tmpdir_t();
std::string get_file(const std::string& f);
};
class tarchive_t {
public:
struct archive *a;
struct archive_entry *e;
tarchive_t(const char *);
~tarchive_t();
bool read_next_header();
std::string entry_pathname();
bool read_data_into_fd(int fd);
};
struct mimewrite_base {
virtual ~mimewrite_base() { }
virtual int write(const char *buf,size_t len) = 0;
virtual void close() = 0;
};
struct mimewrite_string : public mimewrite_base {
std::string str;
int write(const char *buf,size_t len) { str.append(buf,len); return SOAP_OK; };
void close() { }
};
struct mimewrite_tarfile : public mimewrite_base {
std::string fn;
std::fstream f;
integrity_digester idigest;
mimewrite_tarfile(tmpdir_t& d);
~mimewrite_tarfile();
int write(const char *buf,size_t len);
void close() { }
};
-binary_t integrity_digest(const void *ptr,size_t size,
- const std::string& ukey);
#endif /* __EYETIL_H */