github/textmate
1
1
Fork 0
mirror of https://github.com/textmate/textmate.git synced 2026-04-28 03:00:34 -04:00
Code Issues Packages Projects Releases Wiki Activity

Make dictionary map function optional for cache_t::load

Browse Source
This commit is contained in:
Allan Odgaard
2013-08-15 21:05:19 +02:00
parent 7a12fd1c41
commit 36c5dbba6b
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Applications/QuickLookGenerator/src/generate.mm
View File

@@ -15,8 +15,6 @@
OAK_EXTERN_C_BEGIN
static plist::dictionary_t prune_dictionary (plist::dictionary_t const& plist) { return plist; }
static void initialize (CFBundleRef generatorBundle)
{
static dispatch_once_t onceToken;
@@ -35,7 +33,7 @@ static void initialize (CFBundleRef generatorBundle)
paths.push_back(path::join(path, "Bundles"));
plist::cache_t cache;
cache.load(path::join(path::home(), "Library/Caches/com.macromates.TextMate/BundlesIndex.plist"), &prune_dictionary);
cache.load(path::join(path::home(), "Library/Caches/com.macromates.TextMate/BundlesIndex.plist"));
auto index = create_bundle_index(paths, cache);
bundles::set_index(index.first, index.second);

4
Frameworks/plist/src/fs_cache.cc
View File

@@ -23,13 +23,15 @@ static std::string read_link (std::string const& path)
return NULL_STR;
}
static plist::dictionary_t dictionary_identity_function (plist::dictionary_t const& plist) { return plist; }
namespace plist
{
int32_t const cache_t::kPropertyCacheFormatVersion = 2;
void cache_t::load (std::string const& path, plist::dictionary_t (*prune_dictionary)(plist::dictionary_t const&))
{
_prune_dictionary = prune_dictionary;
_prune_dictionary = prune_dictionary ?: dictionary_identity_function;
int32_t version;
auto plist = plist::load(path);

2
Frameworks/plist/src/fs_cache.h
View File

@@ -8,7 +8,7 @@ namespace plist
{
struct PUBLIC cache_t
{
void load (std::string const& path, plist::dictionary_t (*prune_dictionary)(plist::dictionary_t const&));
void load (std::string const& path, plist::dictionary_t (*prune_dictionary)(plist::dictionary_t const&) = NULL);
void save (std::string const& path) const;
bool dirty () const { return _dirty; }