[Spice-devel] [spice-common 1/2] pixman: Use g_error() rather than g_abort()

Christophe Fergeau cfergeau at redhat.com
Fri Jul 6 15:44:44 UTC 2018


g_abort() was only added in glib 2.50, which causes meson build failures
since this defines GLIB_VERSION_MIN_REQUIRED/GLIB_VERSION_MAX_ALLOWED

Signed-off-by: Christophe Fergeau <cfergeau at redhat.com>
---
 common/pixman_utils.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/common/pixman_utils.c b/common/pixman_utils.c
index b7cf25c..c573574 100644
--- a/common/pixman_utils.c
+++ b/common/pixman_utils.c
@@ -935,8 +935,7 @@ pixman_format_code_t spice_surface_format_to_pixman(uint32_t surface_format)
     case SPICE_SURFACE_FMT_32_ARGB:
         return PIXMAN_a8r8g8b8;
     default:
-        printf("Unknown surface format %d\n", surface_format);
-        g_abort();
+        g_error("Unknown surface format %d\n", surface_format);
         break;
     }
         return (pixman_format_code_t)0; /* Not reached */
@@ -974,8 +973,7 @@ pixman_format_code_t spice_bitmap_format_to_pixman(int bitmap_format,
 
     case SPICE_BITMAP_FMT_INVALID:
     default:
-        printf("Unknown bitmap format %d\n", bitmap_format);
-        g_abort();
+        g_error("Unknown bitmap format %d\n", bitmap_format);
         return PIXMAN_a8r8g8b8;
     }
 }
-- 
2.17.1



More information about the Spice-devel mailing list