external/bluetooth/glib
Révision | ddd7f7475a3ddffa04bdbac1e34569660bb9a0f8 (tree) |
---|---|
l'heure | 2012-07-15 05:50:35 |
Auteur | Matthias Clasen <mclasen@redh...> |
Commiter | Matthias Clasen |
Fix contenttype tests
@@ -1,4 +1,5 @@ | ||
1 | 1 | #include <gio/gio.h> |
2 | +#include <string.h> | |
2 | 3 | |
3 | 4 | static void |
4 | 5 | test_guess (void) |
@@ -6,7 +7,7 @@ test_guess (void) | ||
6 | 7 | gchar *res; |
7 | 8 | gchar *expected; |
8 | 9 | gboolean uncertain; |
9 | - guchar *data = (guchar*) | |
10 | + guchar data[] = | |
10 | 11 | "[Desktop Entry]\n" |
11 | 12 | "Type=Application\n" |
12 | 13 | "Name=appinfo-test\n" |
@@ -26,28 +27,28 @@ test_guess (void) | ||
26 | 27 | g_free (res); |
27 | 28 | g_free (expected); |
28 | 29 | |
29 | - res = g_content_type_guess ("foo.desktop", data, -1, &uncertain); | |
30 | + res = g_content_type_guess ("foo.desktop", data, sizeof (data) - 1, &uncertain); | |
30 | 31 | expected = g_content_type_from_mime_type ("application/x-desktop"); |
31 | 32 | g_assert (g_content_type_equals (expected, res)); |
32 | 33 | g_assert (!uncertain); |
33 | 34 | g_free (res); |
34 | 35 | g_free (expected); |
35 | 36 | |
36 | - res = g_content_type_guess ("foo.txt", data, -1, &uncertain); | |
37 | + res = g_content_type_guess ("foo.txt", data, sizeof (data) - 1, &uncertain); | |
37 | 38 | expected = g_content_type_from_mime_type ("text/plain"); |
38 | 39 | g_assert (g_content_type_equals (expected, res)); |
39 | 40 | g_assert (!uncertain); |
40 | 41 | g_free (res); |
41 | 42 | g_free (expected); |
42 | 43 | |
43 | - res = g_content_type_guess ("foo", data, -1, &uncertain); | |
44 | + res = g_content_type_guess ("foo", data, sizeof (data) - 1, &uncertain); | |
44 | 45 | expected = g_content_type_from_mime_type ("text/plain"); |
45 | 46 | g_assert (g_content_type_equals (expected, res)); |
46 | 47 | g_assert (!uncertain); |
47 | 48 | g_free (res); |
48 | 49 | g_free (expected); |
49 | 50 | |
50 | - res = g_content_type_guess (NULL, data, -1, &uncertain); | |
51 | + res = g_content_type_guess (NULL, data, sizeof (data) - 1, &uncertain); | |
51 | 52 | expected = g_content_type_from_mime_type ("application/x-desktop"); |
52 | 53 | g_assert (g_content_type_equals (expected, res)); |
53 | 54 | g_assert (!uncertain); |