From 783525be485838dd5a2884c1b2f33c5cebdadd1a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= <besser82@fedoraproject.org>
Date: Sat, 1 Jul 2017 10:14:14 +0200
Subject: [PATCH 1/3] Fix warning: 'bool trip_sort' defined but not used
[-Wunused-function]
---
src/thd_trip_point.h | 4 ----
src/thd_zone.cpp | 4 ++++
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/thd_trip_point.h b/src/thd_trip_point.h
index 7981d58..cf24d15 100644
--- a/src/thd_trip_point.h
+++ b/src/thd_trip_point.h
@@ -171,8 +171,4 @@ class cthd_trip_point {
}
}
};
-
-static bool trip_sort(cthd_trip_point trip1, cthd_trip_point trip2) {
- return (trip1.get_trip_temp() < trip2.get_trip_temp());
-}
#endif
diff --git a/src/thd_zone.cpp b/src/thd_zone.cpp
index 9f327fd..31dd3ea 100644
--- a/src/thd_zone.cpp
+++ b/src/thd_zone.cpp
@@ -34,6 +34,10 @@
#include "thd_zone.h"
#include "thd_engine.h"
+static bool trip_sort(cthd_trip_point trip1, cthd_trip_point trip2) {
+ return (trip1.get_trip_temp() < trip2.get_trip_temp());
+}
+
cthd_zone::cthd_zone(int _index, std::string control_path, sensor_relate_t rel) :
index(_index), zone_sysfs(control_path.c_str()), zone_temp(0), zone_active(
false), zone_cdev_binded_status(false), type_str(), sensor_rel(
From 6384069b9373d87dba64d12aab1a782c498eff67 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= <besser82@fedoraproject.org>
Date: Sat, 1 Jul 2017 10:20:25 +0200
Subject: [PATCH 2/3] Fix warning: unused variable 'enabled'
[-Wunused-variable]
---
src/thd_cdev_modem.cpp | 1 -
1 file changed, 1 deletion(-)
diff --git a/src/thd_cdev_modem.cpp b/src/thd_cdev_modem.cpp
index a56e8e1..b466da5 100644
--- a/src/thd_cdev_modem.cpp
+++ b/src/thd_cdev_modem.cpp
@@ -173,7 +173,6 @@ int cthd_cdev_modem::get_modem_property(DBusConnection* conn,
DBusMessageIter key, var;
char *property_name;
- dbus_bool_t enabled;
dbus_message_iter_recurse(&dict, &key);
From 9250e90645215001ba2171ef2770723c47e13d79 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= <besser82@fedoraproject.org>
Date: Sat, 1 Jul 2017 10:23:21 +0200
Subject: [PATCH 3/3] Enable -Werror to keep code clean
---
Android.mk | 2 +-
Makefile.am | 5 +++--
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/Android.mk b/Android.mk
index 1a40bda..8612682 100644
--- a/Android.mk
+++ b/Android.mk
@@ -37,7 +37,7 @@ LOCAL_SRC_FILES := \
LOCAL_C_INCLUDES += external/libxml2/include
LOCAL_MODULE_TAGS := optional
-LOCAL_CFLAGS := -DTDRUNDIR='"/data/thermal-daemon"' -DTDCONFDIR='"/system/etc/thermal-daemon"' -Wno-unused-parameter
+LOCAL_CFLAGS := -DTDRUNDIR='"/data/thermal-daemon"' -DTDCONFDIR='"/system/etc/thermal-daemon"' -Wno-unused-parameter -Werror
LOCAL_STATIC_LIBRARIES := libxml2
LOCAL_SHARED_LIBRARIES := liblog libcutils libdl libc++ libicuuc libicui18n libbinder libutils
LOCAL_PRELINK_MODULE := false
diff --git a/Makefile.am b/Makefile.am
index ee96893..e76c163 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -14,8 +14,9 @@ AM_CXXFLAGS = ${DBUS_CFLAGS}\
-Wreorder \
-Wsign-compare \
-Wreturn-type \
- -Wunused-but-set-variable\
- -Wformat
+ -Wunused-but-set-variable \
+ -Wformat \
+ -Werror
EXTRA_DIST=Makefile.glib \
thermald.pc.in