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

[Seth Forshee]

Fix build warnings

Fix build warnings

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

98. By Seth Forshee on 2013-10-01

powerd-object: Fix tabs/space indentation in previous commit

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[Matt Fischer (mfisch)]

Looks good. Not sure I understand why the last change was needed but it works the same either way.

[Seth Forshee (sforshee)]

I don't understand why gcc complains about it, but that last change does eliminate a warning. I'm also pretty sure gcc wasn't complaining about it originally, and I don't know what changed to make it start.

Unmerged revisions

98. By Seth Forshee on 2013-10-01

powerd-object: Fix tabs/space indentation in previous commit

97. By Seth Forshee on 2013-10-01

powerd-object: Fix warning about format string

Something changed recently to cause gcc to start warning about
some code that it had no problem with previously:

 src/powerd-object.c: In function 'handle_ack_state_change':
 src/powerd-object.c:131:47: warning: format not a string literal and no format arguments [-Wformat-security]
                                                G_DBUS_ERROR_INVALID_ARGS, msg);
                                                ^

This is probably just gcc being pedantic. Change it to something
which is completely equivalent but does not generate warnings.

96. By Seth Forshee on 2013-10-01

display: Make power_mode argument to display_set_power_mode() const

This fixes a warning:

 powerd.cpp: In function 'gboolean {anonymous}::call_shutdown(gpointer)':
 powerd.cpp:127:40: warning: deprecated conversion from string constant to 'char*' [-Wwrite-strings]

The argument is read-only, so it really ought to be const anyway.

=== modified file 'src/display.c'
--- src/display.c	2013-09-25 21:29:09 +0000
+++ src/display.c	2013-10-01 14:32:46 +0000
@@ -107,7 +107,7 @@
     return (flags & AB_ENABLED_MASK) == AB_ENABLED;
 }
 
-void display_set_power_mode(int display, char *power_mode)
+void display_set_power_mode(int display, const char *power_mode)
 {
     GError *error = NULL;
     GDBusProxy *unity_proxy = NULL;

=== modified file 'src/powerd-internal.h'
--- src/powerd-internal.h	2013-09-24 13:15:40 +0000
+++ src/powerd-internal.h	2013-10-01 14:32:46 +0000
@@ -74,7 +74,7 @@
 /* Display functions */
 void powerd_brightness_set_value(gint value);
 gboolean powerd_display_enabled(void);
-void display_set_power_mode(int display, char *powerd_mode);
+void display_set_power_mode(int display, const char *powerd_mode);
 void powerd_set_display_state(struct powerd_display_request *req);
 int powerd_display_init(void);
 void powerd_proximity_event(gboolean near);

=== modified file 'src/powerd-object.c'
--- src/powerd-object.c	2013-08-12 02:46:09 +0000
+++ src/powerd-object.c	2013-10-01 14:32:46 +0000
@@ -125,10 +125,11 @@
     owner = g_dbus_method_invocation_get_sender(invocation);
     ret = powerd_client_ack(owner, state);
     if (ret) {
-        const char *msg = (ret == -EINVAL) ? "Invalid state" :
-                                             "Client not registered";
         g_dbus_method_invocation_return_error(invocation, G_DBUS_ERROR,
-                                              G_DBUS_ERROR_INVALID_ARGS, msg);
+                                              G_DBUS_ERROR_INVALID_ARGS,
+                                              ret == -EINVAL ?
+                                              "Invalid state" :
+                                              "Client not registered");
     } else {
         g_dbus_method_invocation_return_value(invocation, NULL);
     }