# # patch "ChangeLog" # from [67e45834f2d1b3f5d62ba648c23f7ab624f8f6df] # to [104302bfd80545e4da3ecc8519293ce0cc4aa710] # # patch "transforms.cc" # from [b86e7728a3cdded2731266cafc985a11ce3c0654] # to [eee4d7adba92b000dbaf37d192239ca92f01b11b] # # patch "transforms.hh" # from [5503553f3b535622dded1cbe4fffafa9b1bad2f6] # to [89eac835c660c0f18f5e894c41d33d6b46b0870e] # ======================================================================== --- ChangeLog 67e45834f2d1b3f5d62ba648c23f7ab624f8f6df +++ ChangeLog 104302bfd80545e4da3ecc8519293ce0cc4aa710 @@ -1,5 +1,9 @@ 2005-08-23 Nathaniel Smith + * transforms.{cc,hh} (localized, localized_as_string): Remove. + +2005-08-23 Nathaniel Smith + * transforms.cc (utf8_to_system): Make fast. 2005-08-23 Nathaniel Smith ======================================================================== --- transforms.cc b86e7728a3cdded2731266cafc985a11ce3c0654 +++ transforms.cc eee4d7adba92b000dbaf37d192239ca92f01b11b @@ -666,62 +666,6 @@ free(out); } -inline static fs::path -localized_impl(string const & utf) -{ -#ifdef __APPLE__ - // on OS X paths for the filesystem/kernel are UTF-8 encoded. - return mkpath(utf); -#else - if (filesystem_is_utf8()) - return mkpath(utf); - if (filesystem_is_ascii_extension() && is_all_ascii(utf)) - return mkpath(utf); - fs::path tmp = mkpath(utf), ret; - for (fs::path::iterator i = tmp.begin(); i != tmp.end(); ++i) - { - external ext; - utf8_to_system(utf8(*i), ext); - ret /= mkpath(ext()); - } - return ret; -#endif -} - -std::string -localized_as_string(file_path const & fp) -{ -#ifdef __APPLE__ - // on OS X paths for the filesystem/kernel are UTF-8 encoded. - return fp(); -#else - if (filesystem_is_utf8()) - return fp(); - if (filesystem_is_ascii_extension() && is_all_ascii(fp())) - return fp(); - return localized(fp).native_file_string(); -#endif -} - -fs::path -localized(file_path const & fp) -{ - return localized_impl(fp()); -} - -fs::path -localized(local_path const & lp) -{ - return localized_impl(lp()); -} - -fs::path -localized(utf8 const & utf) -{ - return localized_impl(utf()); -} - - void internalize_cert_name(utf8 const & utf, cert_name & c) { ======================================================================== --- transforms.hh 5503553f3b535622dded1cbe4fffafa9b1bad2f6 +++ transforms.hh 89eac835c660c0f18f5e894c41d33d6b46b0870e @@ -178,11 +178,6 @@ void ace_to_utf8(ace const & ac, utf8 & utf); void utf8_to_ace(utf8 const & utf, ace & a); -fs::path localized(file_path const & path); -fs::path localized(local_path const & path); -fs::path localized(utf8 const & path); -std::string localized_as_string(file_path const & path); - // specific internal / external conversions for various vocab terms void internalize_cert_name(utf8 const & utf, cert_name & c); void internalize_cert_name(external const & ext, cert_name & c);