diff options
| author | Alex Vakulenko <avakulenko@chromium.org> | 2014-03-25 12:36:28 -0700 |
|---|---|---|
| committer | chrome-internal-fetch <chrome-internal-fetch@google.com> | 2014-03-27 18:45:11 +0000 |
| commit | 75039d7397f03dff77bdf4e26398049ff88edc4c (patch) | |
| tree | a1403721dd45f801d8d95bbbcc612a71bdbb4483 /gpio_handler.cc | |
| parent | 032e772f76a6cd0b4caf1af7bd02dd81af2dc7dd (diff) | |
update_engine: update to libbase 242728
Made update_engine link with libchrome-242728 and fixed compile
issues due to changes in namespaces and include file layout.
Also removed some of suppressed compiler warnings and fixed the
issues masked by them (e.g. mismatched printf-like specifiers).
Added -Wextra compiler option to enable additional useful warnings
to ensure more strict checking... Had to disable "unused-parameter"
though since we have a lot of functions (mainly in fakes) that do
not use all of their parameters.
BUG=chromium:351593
TEST=Unit tests passed.
CQ-DEPEND=CL:191721
Change-Id: I1aa63a48d5f1f4ea75ba6b00aec7aa5f3bad15c4
Reviewed-on: https://chromium-review.googlesource.com/191510
Reviewed-by: Alex Vakulenko <avakulenko@chromium.org>
Commit-Queue: Alex Vakulenko <avakulenko@chromium.org>
Tested-by: Alex Vakulenko <avakulenko@chromium.org>
Diffstat (limited to 'gpio_handler.cc')
| -rw-r--r-- | gpio_handler.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/gpio_handler.cc b/gpio_handler.cc index 1bbc9069..7495ed9a 100644 --- a/gpio_handler.cc +++ b/gpio_handler.cc @@ -5,9 +5,9 @@ #include "update_engine/gpio_handler.h" #include <base/memory/scoped_ptr.h> -#include <base/string_util.h> -#include <base/stringprintf.h> -#include <base/time.h> +#include <base/strings/string_util.h> +#include <base/strings/stringprintf.h> +#include <base/time/time.h> #include <glib.h> #include "update_engine/file_descriptor.h" @@ -300,8 +300,8 @@ bool StandardGpioHandler::OpenGpioFd(StandardGpioHandler::GpioId id, const char* dev_name, bool is_write) { CHECK(id >= 0 && id < kGpioIdMax && dev_name); - string file_name = StringPrintf("%s/%s", gpios_[id].dev_path.c_str(), - dev_name); + string file_name = base::StringPrintf("%s/%s", gpios_[id].dev_path.c_str(), + dev_name); if (!fd_->Open(file_name.c_str(), (is_write ? O_WRONLY : O_RDONLY))) { if (fd_->IsSettingErrno()) { PLOG(ERROR) << "failed to open " << file_name |