From cc3e97aa0141410eb8b05cab34aecf65f44a164c Mon Sep 17 00:00:00 2001 From: Flavio Cruz Date: Tue, 29 Dec 2015 17:35:00 +0100 Subject: fix compiler warnings in hurd/console-client console-client: Fix several compiler warnings. * console-client/bdf.c: Use size_t instead of int. * console-client/driver.c: Remove unused variable errstring. * console-client/pc-kbd.c: Cast sc to scancode_x1 before comparing with enum values. * console-client/vga-dynacolor.h: Use an explicit if in reference counting. * console-client/vga-dynafont.c: Use usigned char for bitmaps. * console-client/vga-support.c: Use unsigned char instead of char. * console-client/vga-support.h: Likewise. * console-client/vga.c: Use conchar_attr_equal instead of casting structures to integers. * hurd/console.h: Add conchar_attr_equal to compare conchar_attr_t structures. --- console-client/vga-dynacolor.h | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'console-client/vga-dynacolor.h') diff --git a/console-client/vga-dynacolor.h b/console-client/vga-dynacolor.h index 304bcc1b..0526e0d8 100644 --- a/console-client/vga-dynacolor.h +++ b/console-client/vga-dynacolor.h @@ -77,11 +77,17 @@ signed char dynacolor_allocate (dynacolor_t *dc, unsigned char col); /* Add a reference to palette entry P in the dynamic font DC. */ #define dynacolor_add_ref(dc,p) \ - ((dc).ref[0] >= 0 && (dc).ref[p]++) + do { \ + if ((dc).ref[0] >= 0) \ + (dc).ref[p]++; \ + } while (0) /* Deallocate a reference for palette entry P in the dynamic font DC. */ #define dynacolor_release(dc,p) \ - ((dc).ref[0] >= 0 && (dc).ref[p]--) + do { \ + if ((dc).ref[0] >= 0) \ + (dc).ref[p]--; \ + } while (0) /* This is a convenience function that looks up a replacement color pair if the original colors are not available. The function always -- cgit v1.2.3