Fix miscellaneous compiler warnings

Fix all compiler warnings (and one type) except for the deprectation warnings
for the gdk_screen_get_monitor_* functions used in the x11 renderer.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>

diff --git a/src/libply-splash-core/ply-device-manager.c b/src/libply-splash-core/ply-device-manager.c
index b637fb8e0f29219abea71c50ce453a5f39071c5e..18612acde8b8c54f178aad8e5f4174f145c35417 100644 (file)
--- a/src/libply-splash-core/ply-device-manager.c
+++ b/src/libply-splash-core/ply-device-manager.c
@@ -134,13 +134,13 @@ static void
 free_devices_from_device_path (ply_device_manager_t *manager,
                                const char           *device_path)
 {
-        char *key = NULL;
-        ply_renderer_t *renderer = NULL;
+        void *key = NULL;
+        void *renderer = NULL;
 
         ply_hashtable_lookup_full (manager->renderers,
                                    (void *) device_path,
-                                   (void **) &key,
-                                   (void **) &renderer);
+                                   &key,
+                                   &renderer);
 
         if (renderer == NULL)
                 return;
@@ -696,12 +696,12 @@ create_devices_for_terminal_and_renderer_type (ply_device_manager_t *manager,
                                                              (void *) ply_renderer_get_device_name (renderer));
 
                         if (old_renderer != NULL) {
-                                ply_trace ("ignoring device %s since it's alerady managed",
+                                ply_trace ("ignoring device %s since it's already managed",
                                            ply_renderer_get_device_name (renderer));
                                 ply_renderer_free (renderer);
 
                                 renderer = NULL;
-                                return;
+                                return true;
                         }
                 }
         }

diff --git a/src/libply/ply-logger.c b/src/libply/ply-logger.c
index 1b56ea82a988c16f173b821829024d185b04f54b..e9b90de2c5ad5c51187dfd6cea7cc7ff5083d1a9 100644 (file)
--- a/src/libply/ply-logger.c
+++ b/src/libply/ply-logger.c
@@ -313,7 +313,6 @@ ply_logger_open_file (ply_logger_t *logger,
                       const char   *filename)
 {
         int fd;
-        mode_t mode;
 
         assert (logger != NULL);
         assert (filename != NULL);

diff --git a/src/libply/ply-rectangle.c b/src/libply/ply-rectangle.c
index a79a21d3e12d9113cf63f8963cb40de759ec92cb..84f3c6d2bc3cbda91e6b0e44816f4b55af39bd60 100644 (file)
--- a/src/libply/ply-rectangle.c
+++ b/src/libply/ply-rectangle.c
@@ -129,6 +129,7 @@ ply_rectangle_find_overlap (ply_rectangle_t *rectangle1,
                 case V_COLLISION_EXACT:
                         return PLY_RECTANGLE_OVERLAP_EXACT_LEFT_EDGE;
                 }
+                break;
         case H_COLLISION_RIGHT:
                 switch (v_collision) {
                 case V_COLLISION_NONE:
@@ -144,6 +145,7 @@ ply_rectangle_find_overlap (ply_rectangle_t *rectangle1,
                 case V_COLLISION_EXACT:
                         return PLY_RECTANGLE_OVERLAP_EXACT_RIGHT_EDGE;
                 }
+                break;
         case H_COLLISION_BOTH:
                 switch (v_collision) {
                 case V_COLLISION_NONE:
@@ -159,6 +161,7 @@ ply_rectangle_find_overlap (ply_rectangle_t *rectangle1,
                 case V_COLLISION_EXACT:
                         return PLY_RECTANGLE_OVERLAP_ALL_EDGES;
                 }
+                break;
         case H_COLLISION_CONTAINED:
                 switch (v_collision) {
                 case V_COLLISION_NONE:
@@ -174,6 +177,7 @@ ply_rectangle_find_overlap (ply_rectangle_t *rectangle1,
                 case V_COLLISION_EXACT:
                         return PLY_RECTANGLE_OVERLAP_NO_EDGES;
                 }
+                break;
         case H_COLLISION_EXACT:
                 switch (v_collision) {
                 case V_COLLISION_NONE:
@@ -189,6 +193,7 @@ ply_rectangle_find_overlap (ply_rectangle_t *rectangle1,
                 case V_COLLISION_EXACT:
                         return PLY_RECTANGLE_OVERLAP_NO_EDGES;
                 }
+                break;
         }
         return PLY_RECTANGLE_OVERLAP_NONE;
 }

diff --git a/src/main.c b/src/main.c
index 634a38ed5d263ae1f41db1d739d1302b72c4d267..5555f0bbd8299e4d2d93c53c6361599cee5bea04 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -909,7 +909,7 @@ plymouth_should_show_default_splash (state_t *state)
 {
         ply_trace ("checking if plymouth should show default splash");
 
-        const char const *strings[] = {
+        const char * const strings[] = {
                 "single", "1", "s", "S", "-S", NULL
         };
         int i;

diff --git a/src/plugins/renderers/frame-buffer/plugin.c b/src/plugins/renderers/frame-buffer/plugin.c
index 41ad6cdce122d53766907f9a339fd275a366e9ac..b4050c5cc3cd333856d9590b679e6b19d85eb7b7 100644 (file)
--- a/src/plugins/renderers/frame-buffer/plugin.c
+++ b/src/plugins/renderers/frame-buffer/plugin.c
@@ -392,9 +392,9 @@ close_device (ply_renderer_backend_t *backend)
         backend->head.area.height = 0;
 }
 
-static const char const *get_visual_name (int visual)
+static const char *get_visual_name (int visual)
 {
-        static const char const *visuals[] =
+        static const char * const visuals[] =
         {
                 [FB_VISUAL_MONO01] = "FB_VISUAL_MONO01",
                 [FB_VISUAL_MONO10] = "FB_VISUAL_MONO10",

diff --git a/src/plugins/splash/script/script-lib-sprite.c b/src/plugins/splash/script/script-lib-sprite.c
index c49297d0db84bbd52ef7f377097f7ac28337d2eb..206252b6fa073ebcc6e3591a42da52f69f83e748 100644 (file)
--- a/src/plugins/splash/script/script-lib-sprite.c
+++ b/src/plugins/splash/script/script-lib-sprite.c
@@ -462,8 +462,8 @@ static void script_lib_sprite_draw_area (script_lib_display_t *display,
                 /* In that case only draw the background if the sprite doesn't
                  * cover the complete area */
                 if (position_x > x || position_y > y ||
-                    (ply_pixel_buffer_get_width (sprite->image) + position_x) < (x + width) ||
-                    (ply_pixel_buffer_get_height (sprite->image) + position_y) < (y + height))
+                    ((int)ply_pixel_buffer_get_width (sprite->image) + position_x) < (x + width) ||
+                    ((int)ply_pixel_buffer_get_height (sprite->image) + position_y) < (y + height))
                         script_lib_draw_brackground (pixel_buffer, &clip_area, data);
         } else {
                 script_lib_draw_brackground (pixel_buffer, &clip_area, data);

diff --git a/src/plugins/splash/two-step/plugin.c b/src/plugins/splash/two-step/plugin.c
index 070741d61d0a236d495822cdd2033cf02d67624e..31256b7e61a7131fb7a08571b401ab4b9fd920fb 100644 (file)
--- a/src/plugins/splash/two-step/plugin.c
+++ b/src/plugins/splash/two-step/plugin.c
@@ -205,6 +205,9 @@ view_load_end_animation (view_t *view)
         case PLY_BOOT_SPLASH_MODE_SHUTDOWN:
                 animation_prefix = "shutdown-animation-";
                 break;
+        default:
+                ply_trace ("unexpected splash mode 0x%x\n", plugin->mode);
+                return;
         }
 
         ply_trace ("trying prefix: %s", animation_prefix);