From fcd9878a3b35b86851fa589f909c4cad2332de31 Mon Sep 17 00:00:00 2001
From: Dave Davenport <qball@gmpclient.org>
Date: Tue, 27 Jun 2017 09:28:33 +0200
Subject: [Config] Remove stray printf, add compiler hints.

---
 source/helper.c     | 11 +++++------
 source/xrmoptions.c |  1 -
 2 files changed, 5 insertions(+), 7 deletions(-)

(limited to 'source')

diff --git a/source/helper.c b/source/helper.c
index 8208b1f6..ec4c2397 100644
--- a/source/helper.c
+++ b/source/helper.c
@@ -1080,8 +1080,7 @@ cairo_surface_t* cairo_image_surface_create_from_svg ( const gchar* file, int he
     RsvgHandle      * handle;
 
     handle = rsvg_handle_new_from_file ( file, &error );
-    if ( handle != NULL ) {
-        cairo_t           *cr;
+    if ( G_LIKELY ( handle != NULL ) ) {
         RsvgDimensionData dimensions;
         // Update DPI.
         rsvg_handle_set_dpi ( handle, config.dpi );
@@ -1093,8 +1092,8 @@ cairo_surface_t* cairo_image_surface_create_from_svg ( const gchar* file, int he
                                                (double) dimensions.width * scale,
                                                (double) dimensions.height * scale );
         gboolean failed = cairo_surface_status ( surface ) != CAIRO_STATUS_SUCCESS;
-        if ( !failed ) {
-            cr = cairo_create ( surface );
+        if ( G_LIKELY ( failed == FALSE ) ) {
+            cairo_t *cr = cairo_create ( surface );
             cairo_scale ( cr, scale, scale );
             failed = rsvg_handle_render_cairo ( handle, cr ) == FALSE;
             cairo_destroy ( cr );
@@ -1104,13 +1103,13 @@ cairo_surface_t* cairo_image_surface_create_from_svg ( const gchar* file, int he
         g_object_unref ( handle );
 
         /** Rendering fails */
-        if ( failed ) {
+        if ( G_UNLIKELY ( failed ) ){
             g_warning ( "Failed to render file: '%s'", file );
             cairo_surface_destroy ( surface );
             surface = NULL;
         }
     }
-    if ( error != NULL ) {
+    if ( G_UNLIKELY ( error != NULL ) ) {
         g_warning ( "Failed to render SVG file: '%s': %s", file, error->message );
         g_error_free ( error );
     }
diff --git a/source/xrmoptions.c b/source/xrmoptions.c
index 840cf37c..0b3d138f 100644
--- a/source/xrmoptions.c
+++ b/source/xrmoptions.c
@@ -393,7 +393,6 @@ static gboolean __config_parser_set_property ( XrmOption *option, const Property
         else {
             value = g_strdup ( p->value.s );
         }
-        printf ( "set: %s\n", value );
         if ( ( option )->mem != NULL ) {
             g_free ( option->mem );
             option->mem = NULL;
-- 
cgit v1.2.3