tequilaOS/platform_system_core
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "base: rename unique_fd::clear() to unique_fd::reset()." am: 14d3a1ac9d am: 8c9ecb9c2c

Browse source 
am: bac29cb665

Change-Id: I078430bfdd43d3fa14a220debc7623f4931158e8
This commit is contained in:
Josh Gao 2016-09-21 01:12:57 +00:00 committed by android-build-merger
commit 11a172e5b7
2 changed files with 5 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
adb/shell_service.cpp
View file

@ -493,10 +493,10 @@ void Subprocess::PassDataStreams() {
// We also need to close the pipes connected to the child process
// so that if it ignores SIGHUP and continues to write data it
// won't fill up the pipe and block.
stdinout_sfd_.clear();
stderr_sfd_.clear();
stdinout_sfd_.reset();
stderr_sfd_.reset();
}
dead_sfd->clear();
dead_sfd->reset();
}
}
}

8
base/include/android-base/unique_fd.h
View file

@ -55,7 +55,7 @@ class unique_fd_impl final {
unique_fd_impl() : value_(-1) {}
explicit unique_fd_impl(int value) : value_(value) {}
~unique_fd_impl() { clear(); }
~unique_fd_impl() { reset(); }
unique_fd_impl(unique_fd_impl&& other) : value_(other.release()) {}
unique_fd_impl& operator=(unique_fd_impl&& s) {
@ -63,17 +63,13 @@ class unique_fd_impl final {
return *this;
}
void reset(int new_value) {
void reset(int new_value = -1) {
if (value_ != -1) {
Closer::Close(value_);
}
value_ = new_value;
}
void clear() {
reset(-1);
}
int get() const { return value_; }
operator int() const { return get(); }