Commit 82b9ef5e3725024ab74a2384e027a2cb380e238b - mozc

Remove redundant NULL/nullptr parameters Calling std::unique_ptr<T>::reset(T*) with NULL/nullptr is just redundant. We can safely remove those NULL/nullptr. This is a mechanical refactoring. No behavior change is intended. REF_BUG=9164610 REF_CL=112205175 REF_TIME=2016-01-14T17:01:23-08:00 REF_TIME_RAW=1452819683 -0800 Yohei Yukawa 8 years ago

20 changed file(s) with 29 addition(s) and 29 deletion(s). Raw diff Collapse all Expand all

-1

src/base/android_jni_proxy_test.cc less more

58	58	}
59	59
60	60	virtual void TearDown() {
61		jvm_.reset(NULL);
	61	jvm_.reset();
62	62	}
63	63
64	64	std::unique_ptr<MockJavaVM> jvm_;

-2

src/base/codegen_bytearray_stream_test.cc less more

55	55	}
56	56
57	57	virtual void TearDown() {
58		codegen_stream_.reset(NULL);
59		result_stream_.reset(NULL);
	58	codegen_stream_.reset();
	59	result_stream_.reset();
60	60	}
61	61
62	62	string ExpectedOutput(const string &var_name_base,

-1

src/base/multifile.cc less more

45	45	}
46	46
47	47	InputMultiFile::~InputMultiFile() {
48		ifs_.reset(NULL);
	48	ifs_.reset();
49	49	}
50	50
51	51	bool InputMultiFile::ReadLine(string* line) {

-4

src/base/thread.cc less more

137	137	if (0 != pthread_create(state_->handle_.get(), 0, &Thread::WrapperForPOSIX,
138	138	static_cast<void *>(this))) {
139	139	state_->is_running_ = false;
140		state_->handle_.reset(nullptr);
	140	state_->handle_.reset();
141	141	}
142	142	}
143	143

148	148	void Thread::Detach() {
149	149	if (state_->handle_ != nullptr) {
150	150	pthread_detach(*state_->handle_);
151		state_->handle_.reset(nullptr);
	151	state_->handle_.reset();
152	152	}
153	153	}
154	154

160	160	return;
161	161	}
162	162	pthread_join(*state_->handle_, nullptr);
163		state_->handle_.reset(nullptr);
	163	state_->handle_.reset();
164	164	}
165	165
166	166	namespace {

242	242	// pthread_cancel (or pthread_kill in PThreadCancel on Android) is
243	243	// asynchronous. Join the thread to behave like TerminateThread on Windows.
244	244	Join();
245		state_->handle_.reset(nullptr);
	245	state_->handle_.reset();
246	246	}
247	247	}
248	248

-1

src/base/win_sandbox.cc less more

881	881	num_bytes, &num_bytes)) {
882	882	const DWORD last_error = ::GetLastError();
883	883	DLOG(ERROR) << "GetTokenInformation failed. Last error: " << last_error;
884		buffer_.reset(nullptr);
	884	buffer_.reset();
885	885	return;
886	886	}
887	887	initialized_ = true;

-1

src/dictionary/system/system_dictionary.cc less more

1107	1107	}
1108	1108
1109	1109	void SystemDictionary::ClearReverseLookupCache() const {
1110		reverse_lookup_cache_.reset(nullptr);
	1110	reverse_lookup_cache_.reset();
1111	1111	}
1112	1112
1113	1113	namespace {

-2

src/dictionary/system/value_dictionary_test.cc less more

54	54	}
55	55
56	56	virtual void TearDown() {
57		louds_trie_.reset(nullptr);
58		louds_trie_builder_.reset(nullptr);
	57	louds_trie_.reset();
	58	louds_trie_builder_.reset();
59	59	}
60	60
61	61	void AddValue(const string &value) {

-1

src/ipc/ipc.cc less more

80	80	void IPCServer::Wait() {
81	81	if (server_thread_.get() != NULL) {
82	82	server_thread_->Join();
83		server_thread_.reset(NULL);
	83	server_thread_.reset();
84	84	}
85	85	}
86	86

-1

src/mozc_version_template.txt less more

0	0	MAJOR=2
1	1	MINOR=17
2		BUILD=2413
	2	BUILD=2414
3	3	REVISION=102
4	4	# NACL_DICTIONARY_VERSION is the target version of the system dictionary to be
5	5	# downloaded by NaCl Mozc.

-2

src/prediction/user_history_predictor.cc less more

430	430	void UserHistoryPredictor::WaitForSyncer() {
431	431	if (syncer_.get() != nullptr) {
432	432	syncer_->Join();
433		syncer_.reset(nullptr);
	433	syncer_.reset();
434	434	}
435	435	}
436	436

444	444	if (syncer_->IsRunning()) {
445	445	return false;
446	446	} else {
447		syncer_.reset(nullptr); // remove
	447	syncer_.reset();
448	448	}
449	449	}
450	450

-1

src/renderer/renderer_client.cc less more

284	284	CallCommand(client.get(), *(pending_command_.get()));
285	285	}
286	286	}
287		pending_command_.reset(NULL);
	287	pending_command_.reset();
288	288
289	289	// \|renderer_status_\| is also protected by mutex.
290	290	// Until this method finsihs, SetPendingCommand is blocked.

-1

src/rewriter/language_aware_rewriter_test.cc less more

96	96	// Unregisters mocked PackedDataManager.
97	97	packed::RegisterPackedDataManager(NULL);
98	98	#endif // MOZC_USE_PACKED_DICTIONARY
99		dictionary_mock_.reset(NULL);
	99	dictionary_mock_.reset();
100	100	usage_stats::UsageStats::ClearAllStatsForTest();
101	101	}
102	102

-1

src/rewriter/user_boundary_history_rewriter.cc less more

200	200	if (!storage_->OpenOrCreate(filename.c_str(),
201	201	kValueSize, kLRUSize, kSeedValue)) {
202	202	LOG(WARNING) << "cannot initialize UserBoundaryHistoryRewriter";
203		storage_.reset(NULL);
	203	storage_.reset();
204	204	return false;
205	205	}
206	206

-1

src/rewriter/user_segment_history_rewriter.cc less more

828	828	if (!storage_->OpenOrCreate(filename.c_str(),
829	829	kValueSize, kLRUSize, kSeedValue)) {
830	830	LOG(WARNING) << "cannot initialize UserSegmentHistoryRewriter";
831		storage_.reset(NULL);
	831	storage_.reset();
832	832	return false;
833	833	}
834	834

-2

src/session/session.cc less more

250	250	return;
251	251	}
252	252	context_.swap(prev_context_);
253		prev_context_.reset(NULL);
	253	prev_context_.reset();
254	254	}
255	255
256	256	void Session::ClearUndoContext() {
257		prev_context_.reset(NULL);
	257	prev_context_.reset();
258	258	}
259	259
260	260	void Session::EnsureIMEIsOn() {

-1

src/storage/louds/louds.cc less more

82	82
83	83	void Louds::Reset() {
84	84	index_.Reset();
85		select_cache_.reset(nullptr);
	85	select_cache_.reset();
86	86	select0_cache_size_ = 0;
87	87	select1_cache_size_ = 0;
88	88	}

-3

src/storage/lru_storage.cc less more

267	267	return false;
268	268	}
269	269	memset(mmap_->begin() + offset, '\0', mmap_->size() - offset);
270		lru_list_.reset(NULL);
	270	lru_list_.reset();
271	271	map_.clear();
272	272	Open(mmap_->begin(), mmap_->size());
273	273	return true;

494	494
495	495	void LRUStorage::Close() {
496	496	filename_.clear();
497		mmap_.reset(NULL);
498		lru_list_.reset(NULL);
	497	mmap_.reset();
	498	lru_list_.reset();
499	499	map_.clear();
500	500	}
501	501

-1

src/unix/ibus/mozc_engine_test.cc less more

56	56	}
57	57
58	58	virtual void TearDown() {
59		mozc_engine_.reset(NULL);
	59	mozc_engine_.reset();
60	60	}
61	61
62	62	client::ClientMock* mock_;

-1

src/win32/ime/ime_ui_window.cc less more

920	920	}
921	921
922	922	void InvalidateLangBarInfoCache() {
923		langbar_info_cache_.reset(nullptr);
	923	langbar_info_cache_.reset();
924	924	}
925	925
926	926	void SetDeferredLangBarUpdate(bool enabled, commands::CompositionMode mode) {

-1

src/win32/tip/tip_text_service.cc less more

632	632
633	633	TipUiHandler::OnDeactivate(this);
634	634
635		thread_context_.reset(nullptr);
	635	thread_context_.reset();
636	636	StorePointerForCurrentThread(nullptr);
637	637
638	638	return S_OK;