X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Futil.h;h=857f872f63c4d4a6f9805f5207d856de80eb9920;hb=491ac453512ac1982f62fc0d2a310586427601d7;hp=ca00ecb9147a1a232760426636d9cc16b35e667b;hpb=e8c4fd0e0581849fcf41d918e79b00b84fe24d70;p=libdcp.git diff --git a/src/util.h b/src/util.h index ca00ecb9..857f872f 100644 --- a/src/util.h +++ b/src/util.h @@ -27,7 +27,6 @@ #include "types.h" #include #include -#include #include #include #include @@ -78,6 +77,7 @@ extern std::string content_kind_to_string (ContentKind kind); extern ContentKind content_kind_from_string (std::string kind); extern bool empty_or_white_space (std::string s); extern boost::shared_ptr decompress_j2k (uint8_t* data, int64_t size, int reduce); +extern bool ids_equal (std::string a, std::string b); extern void init (); @@ -87,10 +87,9 @@ extern void add_signer (xmlpp::Element* parent, CertificateChain const & certifi extern int base64_decode (std::string const & in, unsigned char* out, int out_length); extern boost::optional relative_to_root (boost::filesystem::path root, boost::filesystem::path file); -extern std::string tm_to_string (struct tm *); -extern std::string utc_offset_to_string (int); -extern std::string ptime_to_string (boost::posix_time::ptime); extern FILE * fopen_boost (boost::filesystem::path, std::string); +extern std::string file_to_string (boost::filesystem::path, uintmax_t max_length = 65536); +extern std::string private_key_fingerprint (std::string key); template std::list >