Add more RAPTOR_GOOD_CAST and RAPTOR_BAD_CAST and fix some.

1 files changed, 2 insertions, 2 deletions

diff --git a/src/raptor_nfc_test.c b/src/raptor_nfc_test.c
index 81508586..3c9b024a 100644
--- a/src/raptor_nfc_test.c
+++ b/src/raptor_nfc_test.c
@@ -96,7 +96,7 @@ decode_to_utf8(unsigned char *utf8_string, size_t utf8_string_length,
     
     u += raptor_unicode_utf8_string_put_char(c, u, (end-p));
     
-    if((u-utf8_string) > (int)utf8_string_length) {
+    if((u-utf8_string) > RAPTOR_GOOD_CAST(int, utf8_string_length)) {
       fprintf(stderr,
               "decode_to_utf8 overwote utf8_string buffer at byte %d\n",
               (u-utf8_string));
@@ -125,7 +125,7 @@ utf8_print(const unsigned char *input, int length, FILE *stream)
       return;
     if(i)
       fputc(' ', stream);
-    fprintf(stream, "U+%04X", (int)c);
+    fprintf(stream, "U+%04X", RAPTOR_GOOD_CAST(int, c));
     input += size;
     i += size;
   }