# # # patch "ChangeLog" # from [50b81d75b5543aba1af981d1dd42ac1702665b39] # to [951d5f13768cfdf2db237ff7473118a1902a2749] # # patch "database.cc" # from [f8f7f8527f83e67261971c80d737f4f2ab45dffc] # to [8e5e51df5808453cd5320e72f334452c472ea6d6] # # patch "database.hh" # from [ecaa2ff0d3b4a335ae680c3e92ba33b33ddfd194] # to [d14bc2664321aa1b2c753e568ea1c0b85eeccca4] # ============================================================ --- ChangeLog 50b81d75b5543aba1af981d1dd42ac1702665b39 +++ ChangeLog 951d5f13768cfdf2db237ff7473118a1902a2749 @@ -1,5 +1,10 @@ 2006-01-10 Nathaniel Smith + * database.cc (manifest_cert_exists, put_manifest_cert): + (get_manifest_cert, get_manifest_certs): Remove unused methods. + +2006-01-10 Nathaniel Smith + * database.cc (put_reverse_version, put_file_reverse_version): Whoops, missed some dead code. ============================================================ --- database.cc f8f7f8527f83e67261971c80d737f4f2ab45dffc +++ database.cc 8e5e51df5808453cd5320e72f334452c472ea6d6 @@ -1881,19 +1881,7 @@ return cert_exists(cert.inner(), "revision_certs"); } -bool -database::manifest_cert_exists(manifest const & cert) -{ - return cert_exists(cert.inner(), "manifest_certs"); -} - void -database::put_manifest_cert(manifest const & cert) -{ - put_cert(cert.inner(), "manifest_certs"); -} - -void database::put_revision_cert(revision const & cert) { put_cert(cert.inner(), "revision_certs"); @@ -2026,37 +2014,7 @@ return (res.size() == 1); } -bool -database::manifest_cert_exists(hexenc const & hash) -{ - results res; - vector certs; - fetch(res, one_col, any_rows, - "SELECT id " - "FROM manifest_certs " - "WHERE hash = ?", - hash().c_str()); - I(res.size() == 0 || res.size() == 1); - return (res.size() == 1); -} - void -database::get_manifest_cert(hexenc const & hash, - manifest & c) -{ - results res; - vector certs; - fetch(res, 5, one_row, - "SELECT id, name, value, keypair, signature " - "FROM manifest_certs " - "WHERE hash = ?", - hash().c_str()); - results_to_certs(res, certs); - I(certs.size() == 1); - c = manifest(certs[0]); -} - -void database::get_manifest_certs(manifest_id const & id, vector< manifest > & ts) { @@ -2077,18 +2035,7 @@ copy(certs.begin(), certs.end(), back_inserter(ts)); } -void -database::get_manifest_certs(manifest_id const & id, - cert_name const & name, - vector< manifest > & ts) -{ - vector certs; - get_certs(id.inner(), name, certs, "manifest_certs"); - ts.clear(); - copy(certs.begin(), certs.end(), back_inserter(ts)); -} - // completions void database::complete(string const & partial, ============================================================ --- database.hh ecaa2ff0d3b4a335ae680c3e92ba33b33ddfd194 +++ database.hh d14bc2664321aa1b2c753e568ea1c0b85eeccca4 @@ -259,7 +259,7 @@ std::set & children); void get_revision_manifest(revision_id const & cid, - manifest_id & mid); + manifest_id & mid); void deltify_revision(revision_id const & rid); @@ -310,10 +310,6 @@ // note: this section is ridiculous. please do something about it. - bool manifest_cert_exists(manifest const & cert); - bool manifest_cert_exists(hexenc const & hash); - void put_manifest_cert(manifest const & cert); - bool revision_cert_exists(revision const & cert); bool revision_cert_exists(hexenc const & hash); @@ -356,13 +352,6 @@ void get_manifest_certs(cert_name const & name, std::vector< manifest > & certs); - void get_manifest_certs(manifest_id const & id, - cert_name const & name, - std::vector< manifest > & certs); - - void get_manifest_cert(hexenc const & hash, - manifest & cert); - // epochs void get_epochs(std::map & epochs);