Merge lp:~sforshee/powerd/fix-warnings into lp:powerd

[Seth Forshee]

Enable -Wall for all files and fix resulting warnings

Enable -Wall for all files and fix resulting warnings

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:70
http://jenkins.qa.ubuntu.com/job/powerd-ci/82/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/powerd-saucy-armhf-ci/36
        deb: http://jenkins.qa.ubuntu.com/job/powerd-saucy-armhf-ci/36/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins:8080/job/powerd-ci/82/rebuild

review: Approve (continuous-integration)

[lp:~sforshee/powerd/fix-warnings]

62. By PS Jenkins bot on 2013-07-03

Releasing 0.13+13.10.20130703-0ubuntu1 to ubuntu.

Approved by PS Jenkins bot.

63. By Matt Fischer on 2013-07-10

Cleanup upstart job by removing unneeded environment variables and have the job respawn if powerd dies unexpectedly. Simplify the sigterm handler, which also removes the duplicate calls to unown name which were causing warnings.
Finally, fix LP: #1195800 by simply exiting if we lose or never get our dbus name.
. Fixes: https://bugs.launchpad.net/bugs/1195800.

Approved by PS Jenkins bot, Seth Forshee.

[Matt Fischer (mfisch)]

Approve

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:71
http://jenkins.qa.ubuntu.com/job/powerd-ci/86/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/powerd-saucy-armhf-ci/40
        deb: http://jenkins.qa.ubuntu.com/job/powerd-saucy-armhf-ci/40/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins:8080/job/powerd-ci/86/rebuild

review: Approve (continuous-integration)

[lp:~sforshee/powerd/fix-warnings]

64. By Seth Forshee on 2013-07-10

Enable -Wall for all files and fix resulting warnings.

Approved by PS Jenkins bot, Matthew Fischer.

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2013-06-28 16:08:55 +0000
+++ CMakeLists.txt	2013-07-10 21:26:38 +0000
@@ -8,10 +8,12 @@
     set(CMAKE_BUILD_TYPE "Release")
 endif()
 
-set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS} -O0 -ggdb -g")
-set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS} -O0 -ggdb -g")
-set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS} -O3")
-set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS} -O3")
+set(CMAKE_C_FLAGS "-Wall")
+set(CMAKE_CXX_FLAGS "-Wall")
+set(CMAKE_C_FLAGS_DEBUG "-O0 -ggdb -g")
+set(CMAKE_CXX_FLAGS_DEBUG "-O0 -ggdb -g")
+set(CMAKE_C_FLAGS_RELEASE "-O3")
+set(CMAKE_CXX_FLAGS_RELEASE "-O3")
 
 set(GDBUS_NAME powerd-dbus)
 
 
=== modified file 'src/backlight.c'
--- src/backlight.c	2013-06-28 19:53:24 +0000
+++ src/backlight.c	2013-07-10 21:26:38 +0000
@@ -31,6 +31,7 @@
 #include <unistd.h>
 #include <libudev.h>
 #include <glib.h>
+#include <glib-unix.h>
 
 #include "powerd-internal.h"
 #include "log.h"
@@ -345,7 +346,7 @@
 static void bl_destroy(gpointer data)
 {
     struct bl_device *bl = data;
-    free_backlight(data);
+    free_backlight(bl);
 }
 
 void powerd_backlight_deinit(void)
 
=== modified file 'src/display-request.c'
--- src/display-request.c	2013-07-02 14:50:36 +0000
+++ src/display-request.c	2013-07-10 21:26:38 +0000
@@ -54,9 +54,11 @@
 
 static void update_internal_state(void)
 {
-    struct powerd_display_request new_state = {0,};
+    struct powerd_display_request new_state;
     int i;
 
+    memset(&new_state, 0, sizeof(new_state));
+
     /* Default to off if no request for display to be on */
     if (display_state_count.state[POWERD_DISPLAY_STATE_ON] > 0)
         new_state.state = POWERD_DISPLAY_STATE_ON;
@@ -132,9 +134,6 @@
 static gboolean update_request(struct powerd_display_request *new_req)
 {
     struct display_request_internal *ireq;
-    gboolean found = FALSE;
-    unsigned int flags;
-    int i;
 
     ireq = g_hash_table_lookup(display_request_hash, new_req->cookie);
     if (!ireq) {
@@ -279,11 +278,13 @@
                                     GDBusMethodInvocation *invocation,
                                     int state, int brightness, guint32 flags)
 {
-    struct powerd_display_request req = {0,};
+    struct powerd_display_request req;
     const char *owner;
     char ext_cookie[UUID_STR_LEN];
     int ret;
 
+    memset(&req, 0, sizeof(req));
+
     owner = g_dbus_method_invocation_get_sender(invocation);
     powerd_debug("%s from %s: state %d brightness %d flags %#08x",
                  __func__, owner, state, brightness, flags);
@@ -312,10 +313,12 @@
                                        const gchar *ext_cookie, int state,
                                        int brightness, guint32 flags)
 {
-    struct powerd_display_request req = {0,};
+    struct powerd_display_request req;
     uuid_t cookie;
     int ret;
 
+    memset(&req, 0, sizeof(req));
+
     powerd_debug("%s from %s: cookie: %s state %d brightness %d flags %#08x",
                  __func__, g_dbus_method_invocation_get_sender(invocation),
                  ext_cookie, state, brightness, flags);
 
=== modified file 'src/display.c'
--- src/display.c	2013-07-02 13:52:40 +0000
+++ src/display.c	2013-07-10 21:26:38 +0000
@@ -32,6 +32,8 @@
 #include <glib.h>
 #include <glib-object.h>
 
+#include <hybris/surface_flinger/surface_flinger_compatibility_layer.h>
+
 #include "powerd.h"
 #include "powerd-internal.h"
 #include "log.h"
 
=== modified file 'src/log.c'
--- src/log.c	2013-06-10 19:41:44 +0000
+++ src/log.c	2013-07-10 21:26:38 +0000
@@ -39,7 +39,6 @@
 void powerd_log_init(void)
 {
     char *debug_str;
-    int debug_val;
 
     openlog("powerd", LOG_PID, LOG_DAEMON);
 
 
=== modified file 'src/power-request.c'
--- src/power-request.c	2013-07-02 14:50:36 +0000
+++ src/power-request.c	2013-07-10 21:26:38 +0000
@@ -478,6 +478,8 @@
         case STATE_TRANSITION_COMPLETE:
             cur_state_transition_state = process_state_complete(&delay);
             break;
+        default:
+            break;
         }
     } while (delay == 0 &&
              cur_state_transition_state != STATE_TRANSITION_IDLE);
 
=== modified file 'src/powerd-object.c'
--- src/powerd-object.c	2013-07-01 21:28:26 +0000
+++ src/powerd-object.c	2013-07-10 21:26:38 +0000
@@ -284,7 +284,6 @@
 powerd_dbus_name_watch_remove(const char *owner)
 {
     struct DbusNameWatch *dbnw = NULL;
-    char *hash_owner = NULL;
 
     if (strcmp(owner,"internal") == 0) {
         return;
 
=== modified file 'src/powerd.cpp'
--- src/powerd.cpp	2013-07-02 13:52:40 +0000
+++ src/powerd.cpp	2013-07-10 21:26:38 +0000
@@ -69,9 +69,6 @@
 static int lasttime;
 struct tm *tm;
 
-static gint saved_brightness = 255;
-static gchar *brightness_path;
-
 /* The real default for this is set in the gschema file, but set 60 here
  * as a sanity check */
 static int activity_timeout = 60;
@@ -135,12 +132,12 @@
         g_spawn_async(NULL, argv, NULL, G_SPAWN_SEARCH_PATH, NULL, NULL, NULL, NULL);
     }
 
+    return FALSE;
 }
 
 gboolean activity_monitor(gpointer data)
 {
     int new_state;
-    gboolean ret = FALSE;
 
     g_mutex_lock(&activity_timer_mutex);
 
@@ -212,7 +209,7 @@
 
 int update_screen_state_worker(gpointer data)
 {
-    unsigned long new_state = (unsigned long)data;
+    long new_state = (long)data;
     int ret;
 
     if (new_state == activity_timer_screen_state)
@@ -241,7 +238,7 @@
 
 void update_screen_state(int new_state)
 {
-    unsigned long data = (unsigned long)new_state;
+    long data = new_state;
     if (new_state < SCREEN_STATE_OFF || new_state > SCREEN_STATE_BRIGHT)
         return;
     powerd_run_mainloop_sync(update_screen_state_worker, (gpointer)data);
@@ -427,8 +424,6 @@
 
 int main(int argc, char** argv)
 {
-    int i, ret;
-
     powerd_log_init();
 
     name_id = g_bus_own_name(G_BUS_TYPE_SYSTEM, "com.canonical.powerd",
 
=== modified file 'src/util.c'
--- src/util.c	2013-06-07 15:38:51 +0000
+++ src/util.c	2013-07-10 21:26:38 +0000
@@ -16,9 +16,12 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <string.h>
 #include <uuid/uuid.h>
 #include <glib.h>
 
+#include "powerd-internal.h"
+
 struct sync_work_data {
     GCond cond;
     GMutex mutex;