From 56ca8add1088385a874fdb371a6d490926109710 Mon Sep 17 00:00:00 2001 From: Ryan Lortie Date: Tue, 1 May 2012 15:40:15 -0400 Subject: [PATCH] contenttype test: don't pass -1 as length g_content_type_guess() takes a gsize, not a gssize, and -1 does not mean "I am passing a NULL terminated string". --- gio/tests/contenttype.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/gio/tests/contenttype.c b/gio/tests/contenttype.c index 7cdd6e7..7188894 100644 --- a/gio/tests/contenttype.c +++ b/gio/tests/contenttype.c @@ -1,4 +1,5 @@ #include +#include static void test_guess (void) @@ -6,7 +7,7 @@ test_guess (void) gchar *res; gchar *expected; gboolean uncertain; - guchar *data = (guchar*) + guchar data[] = "[Desktop Entry]\n" "Type=Application\n" "Name=appinfo-test\n" @@ -26,28 +27,28 @@ test_guess (void) g_free (res); g_free (expected); - res = g_content_type_guess ("foo.desktop", data, -1, &uncertain); + res = g_content_type_guess ("foo.desktop", data, sizeof (data) - 1, &uncertain); expected = g_content_type_from_mime_type ("application/x-desktop"); g_assert (g_content_type_equals (expected, res)); g_assert (!uncertain); g_free (res); g_free (expected); - res = g_content_type_guess ("foo.txt", data, -1, &uncertain); + res = g_content_type_guess ("foo.txt", data, sizeof (data) - 1, &uncertain); expected = g_content_type_from_mime_type ("text/plain"); g_assert (g_content_type_equals (expected, res)); g_assert (!uncertain); g_free (res); g_free (expected); - res = g_content_type_guess ("foo", data, -1, &uncertain); + res = g_content_type_guess ("foo", data, sizeof (data) - 1, &uncertain); expected = g_content_type_from_mime_type ("text/plain"); g_assert (g_content_type_equals (expected, res)); g_assert (!uncertain); g_free (res); g_free (expected); - res = g_content_type_guess (NULL, data, -1, &uncertain); + res = g_content_type_guess (NULL, data, sizeof (data) - 1, &uncertain); expected = g_content_type_from_mime_type ("application/x-desktop"); g_assert (g_content_type_equals (expected, res)); g_assert (!uncertain); -- 2.7.4