From 469fd74a7b6784c3eaec6618b002330c242eb26a Mon Sep 17 00:00:00 2001 From: Allan Odgaard Date: Tue, 4 Aug 2015 13:19:55 +0200 Subject: [PATCH] Rely on ARC to manage GCD types (10.8) --- Applications/TextMate/src/main.mm | 6 +----- Frameworks/HTMLOutput/src/helpers/HOJSBridge.mm | 2 -- Frameworks/OakTextView/src/OakTextView.mm | 1 - Frameworks/command/src/runner.h | 1 - Frameworks/command/src/runner.mm | 8 -------- Frameworks/document/src/merge.cc | 1 - Frameworks/editor/src/editor.cc | 1 - Frameworks/io/src/exec.cc | 3 --- Frameworks/network/src/tbz.cc | 3 --- Frameworks/scm/src/scm.cc | 1 - Frameworks/settings/src/track_paths.h | 4 ---- 11 files changed, 1 insertion(+), 30 deletions(-) diff --git a/Applications/TextMate/src/main.mm b/Applications/TextMate/src/main.mm index 606b6b02..b16d06ac 100644 --- a/Applications/TextMate/src/main.mm +++ b/Applications/TextMate/src/main.mm @@ -60,11 +60,7 @@ int main (int argc, char const* argv[]) } try { - int res = NSApplicationMain(argc, argv); - dispatch_release(sigUsr1Src); - dispatch_release(sigIntSrc); - dispatch_release(sigTermSrc); - return res; + return NSApplicationMain(argc, argv); } catch(std::exception const& e) { crash_reporter_info_t info(text::format("C++ Exception: %s", e.what())); diff --git a/Frameworks/HTMLOutput/src/helpers/HOJSBridge.mm b/Frameworks/HTMLOutput/src/helpers/HOJSBridge.mm index 17619869..fad32e1f 100644 --- a/Frameworks/HTMLOutput/src/helpers/HOJSBridge.mm +++ b/Frameworks/HTMLOutput/src/helpers/HOJSBridge.mm @@ -219,8 +219,6 @@ OAK_DEBUG_VAR(HTMLOutput_JSShellCommand); } } } - - dispatch_release(group); } } return self; diff --git a/Frameworks/OakTextView/src/OakTextView.mm b/Frameworks/OakTextView/src/OakTextView.mm index 8405a1d9..e674aa14 100644 --- a/Frameworks/OakTextView/src/OakTextView.mm +++ b/Frameworks/OakTextView/src/OakTextView.mm @@ -3298,7 +3298,6 @@ static char const* kOakMenuItemTitle = "OakMenuItemTitle"; io::exhaust_fd(process.err, &error); }); dispatch_group_wait(group, DISPATCH_TIME_FOREVER); - dispatch_release(group); if(res = WIFEXITED(status) && WEXITSTATUS(status) == 0) { diff --git a/Frameworks/command/src/runner.h b/Frameworks/command/src/runner.h index 100b7d55..d5706a26 100644 --- a/Frameworks/command/src/runner.h +++ b/Frameworks/command/src/runner.h @@ -48,7 +48,6 @@ namespace command { runner_t () = delete; runner_t (bundle_command_t const& command, ng::buffer_api_t const& buffer, ng::ranges_t const& selection, std::map const& environment, std::string const& pwd, delegate_ptr delegate); - ~runner_t (); void launch (); void wait (); diff --git a/Frameworks/command/src/runner.mm b/Frameworks/command/src/runner.mm index 14cb305b..a4ea77a9 100644 --- a/Frameworks/command/src/runner.mm +++ b/Frameworks/command/src/runner.mm @@ -115,14 +115,11 @@ static pid_t run_command (dispatch_group_t rootGroup, std::string const& cmd, in perror("waitpid"); }); - dispatch_retain(rootGroup); dispatch_group_enter(rootGroup); dispatch_group_notify(group, queue, ^{ completionHandler(status); dispatch_group_leave(rootGroup); - dispatch_release(rootGroup); }); - dispatch_release(group); return pid; } @@ -145,11 +142,6 @@ namespace command fix_shebang(&_command.command); } - runner_t::~runner_t () - { - dispatch_release(_dispatch_group); - } - runner_ptr runner (bundle_command_t const& command, ng::buffer_api_t const& buffer, ng::ranges_t const& selection, std::map const& environment, delegate_ptr delegate, std::string const& pwd) { return std::make_shared(command, buffer, selection, environment, pwd, delegate); diff --git a/Frameworks/document/src/merge.cc b/Frameworks/document/src/merge.cc index 48089a1e..b075da82 100644 --- a/Frameworks/document/src/merge.cc +++ b/Frameworks/document/src/merge.cc @@ -28,7 +28,6 @@ std::string merge (std::string const& oldContent, std::string const& myContent, perror("waitpid"); }); dispatch_group_wait(group, DISPATCH_TIME_FOREVER); - dispatch_release(group); if(conflict) *conflict = WIFEXITED(status) && WEXITSTATUS(status) != 0; diff --git a/Frameworks/editor/src/editor.cc b/Frameworks/editor/src/editor.cc index 9da75cc9..c776547f 100644 --- a/Frameworks/editor/src/editor.cc +++ b/Frameworks/editor/src/editor.cc @@ -430,7 +430,6 @@ namespace ng perror("waitpid"); }); dispatch_group_wait(group, DISPATCH_TIME_FOREVER); - dispatch_release(group); } unlink(scriptPath.c_str()); diff --git a/Frameworks/io/src/exec.cc b/Frameworks/io/src/exec.cc index 30139fd8..c201e948 100644 --- a/Frameworks/io/src/exec.cc +++ b/Frameworks/io/src/exec.cc @@ -121,10 +121,7 @@ namespace io }); dispatch_group_wait(group, DISPATCH_TIME_FOREVER); - dispatch_release(group); - D(DBF_IO_Exec, if(!error.empty()) bug("error from command: “%s”\n", error.c_str());); - return success ? output : NULL_STR; } diff --git a/Frameworks/network/src/tbz.cc b/Frameworks/network/src/tbz.cc index 864f6e00..692c56ab 100644 --- a/Frameworks/network/src/tbz.cc +++ b/Frameworks/network/src/tbz.cc @@ -27,10 +27,7 @@ namespace network tbz_t::~tbz_t () { if(_group) - { dispatch_group_wait(_group, DISPATCH_TIME_FOREVER); - dispatch_release(_group); - } } bool tbz_t::wait_for_tbz (std::string* output, std::string* error) diff --git a/Frameworks/scm/src/scm.cc b/Frameworks/scm/src/scm.cc index 50d68255..aae1113c 100644 --- a/Frameworks/scm/src/scm.cc +++ b/Frameworks/scm/src/scm.cc @@ -397,7 +397,6 @@ namespace scm dispatch_semaphore_signal(semaphore); }); dispatch_semaphore_wait(semaphore, DISPATCH_TIME_FOREVER); - dispatch_release(semaphore); info->pop_callback(); } diff --git a/Frameworks/settings/src/track_paths.h b/Frameworks/settings/src/track_paths.h index 0705df6e..a42c07e2 100644 --- a/Frameworks/settings/src/track_paths.h +++ b/Frameworks/settings/src/track_paths.h @@ -62,10 +62,7 @@ private: ~track_fds_t () { for(auto pair : _records) - { dispatch_source_cancel(pair.second->source); - dispatch_release(pair.second->source); - } _records.clear(); } @@ -91,7 +88,6 @@ private: if(pair != _records.end()) { dispatch_source_cancel(pair->second->source); - dispatch_release(pair->second->source); _records.erase(pair); } }