diff options
| author | Chih-Hung Hsieh <chh@google.com> | 2017-10-18 16:28:14 -0700 |
|---|---|---|
| committer | Chih-Hung Hsieh <chh@google.com> | 2017-10-20 15:46:36 -0700 |
| commit | 373d3c7257fa815d0b9ee8f16874470a6002042e (patch) | |
| tree | 2488faeb9a5a2dfd9f76054bd4ba001b4806ffb3 /memtrack | |
| parent | d7bf23ae7b93ec93b8b7c2ce98eaa2ea94f387aa (diff) | |
| download | extras-373d3c7257fa815d0b9ee8f16874470a6002042e.tar.gz | |
Use -Werror in system/extras
* Remove unused variables.
* Fix redefined macro warnings.
* Fix sign-compare warnings.
* Fix 'return false' in main().
* Keep existing warnings to fix later.
Bug: 66996870
Test: build with WITH_TIDY=1
Change-Id: Ib92ef5297693595fb84ed4f8e61665bda4cee312
Diffstat (limited to 'memtrack')
| -rw-r--r-- | memtrack/Android.mk | 2 | ||||
| -rw-r--r-- | memtrack/memtrack.cpp | 2 | ||||
| -rw-r--r-- | memtrack/memtrack.h | 4 |
3 files changed, 6 insertions, 2 deletions
diff --git a/memtrack/Android.mk b/memtrack/Android.mk index 5fa9f157..cd99b6cc 100644 --- a/memtrack/Android.mk +++ b/memtrack/Android.mk @@ -24,6 +24,7 @@ LOCAL_SRC_FILES := $(src_files) LOCAL_MODULE_PATH := $(TARGET_OUT_OPTIONAL_EXECUTABLES) LOCAL_MODULE := memtrack_share +LOCAL_CFLAGS := -Wall -Werror -Wno-error=unused-value LOCAL_C_INCLUDES += $(includes) LOCAL_SHARED_LIBRARIES := \ @@ -37,6 +38,7 @@ LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk LOCAL_SRC_FILES := $(src_files) LOCAL_MODULE_PATH := $(TARGET_OUT_OPTIONAL_EXECUTABLES) LOCAL_MODULE := memtrack +LOCAL_CFLAGS := -Wall -Werror -Wno-error=unused-value LOCAL_FORCE_STATIC_EXECUTABLE := true LOCAL_STATIC_LIBRARIES := \ diff --git a/memtrack/memtrack.cpp b/memtrack/memtrack.cpp index 8ff5c07d..d3736091 100644 --- a/memtrack/memtrack.cpp +++ b/memtrack/memtrack.cpp @@ -68,7 +68,7 @@ bool FileData::isAvail(size_t bytes_needed) { while (cur_idx_ + bytes_needed >= len_) { bytes = read(fd_, data_ + len_, max_ - len_); if (bytes == 0 || bytes == -1) { - read_complete_; + read_complete_; // unused read? break; } len_ += bytes; diff --git a/memtrack/memtrack.h b/memtrack/memtrack.h index 602fdb22..6c3ab453 100644 --- a/memtrack/memtrack.h +++ b/memtrack/memtrack.h @@ -24,7 +24,9 @@ #include <vector> #define DEFAULT_SLEEP_DELAY_SECONDS 5 -#define NS_PER_SEC 1000000000LL +#ifndef NS_PER_SEC +#define NS_PER_SEC 1000000000ULL +#endif class FileData { public: |