diff options
author | David King <amigadave@amigadave.com> | 2015-01-29 13:45:35 +0000 |
---|---|---|
committer | David King <amigadave@amigadave.com> | 2015-02-05 14:57:21 +0000 |
commit | c9f0723cf694fb92da444f9df51b96efde1c4786 (patch) | |
tree | 5c43591c1e5e013e5c4b90ffea606c74d7055d78 | |
parent | 4d5496f3cbbaea10f2aa78e01f78789156154739 (diff) | |
download | yelp-c9f0723cf694fb92da444f9df51b96efde1c4786.tar.gz |
Fix incompatible type warnings in tests
-rw-r--r-- | tests/test-transform.c | 16 | ||||
-rw-r--r-- | tests/test-uri.c | 3 | ||||
-rw-r--r-- | tests/test-view.c | 6 |
3 files changed, 13 insertions, 12 deletions
diff --git a/tests/test-transform.c b/tests/test-transform.c index 88de0fec..5d3304a1 100644 --- a/tests/test-transform.c +++ b/tests/test-transform.c @@ -114,7 +114,7 @@ main (gint argc, gchar **argv) xmlDocPtr doc; YelpTransform *transform; gchar **params; - gchar *stylesheet; + const gchar *stylesheet; gchar *file; context = g_option_context_new ("[STYLESHEET] FILE"); @@ -135,12 +135,12 @@ main (gint argc, gchar **argv) } params = g_new0 (gchar *, 7); - params[0] = "db.chunk.extension"; - params[1] = "\"\""; - params[2] = "db.chunk.info_basename"; - params[3] = "\"x-yelp-titlepage\""; - params[4] = "db.chunk.max_depth"; - params[5] = "2"; + params[0] = g_strdup ("db.chunk.extension"); + params[1] = g_strdup ("\"\""); + params[2] = g_strdup ("db.chunk.info_basename"); + params[3] = g_strdup ("\"x-yelp-titlepage\""); + params[4] = g_strdup ("db.chunk.max_depth"); + params[5] = g_strdup ("2"); params[6] = NULL; transform = yelp_transform_new (stylesheet); @@ -160,7 +160,7 @@ main (gint argc, gchar **argv) xmlXIncludeProcessFlags (doc, XML_PARSE_DTDLOAD | XML_PARSE_NOCDATA | XML_PARSE_NOENT | XML_PARSE_NONET ); - if (!yelp_transform_start (transform, doc, params, NULL)) + if (!yelp_transform_start (transform, doc, (xmlDocPtr)params, NULL)) return 1; if (random_timeout) { diff --git a/tests/test-uri.c b/tests/test-uri.c index 73106e31..624b68bb 100644 --- a/tests/test-uri.c +++ b/tests/test-uri.c @@ -33,7 +33,8 @@ static void print_uri (gchar *orig, YelpUri *uri, GOutputStream *stream) { GFile *file; - gchar *type = NULL, *tmp, **tmpv, *out; + const gchar *type = NULL; + gchar *tmp, **tmpv, *out; g_output_stream_write (stream, orig, strlen (orig), NULL, NULL); g_output_stream_write (stream, "\n", 1, NULL, NULL); diff --git a/tests/test-view.c b/tests/test-view.c index 5b9c27af..14622516 100644 --- a/tests/test-view.c +++ b/tests/test-view.c @@ -93,14 +93,14 @@ main (int argc, char **argv) gtk_container_add (GTK_CONTAINER (scroll), view); - g_signal_connect (entry, "activate", activate_cb, view); + g_signal_connect (entry, "activate", G_CALLBACK (activate_cb), view); if (argc >= 2) { /* I put in the double-load to test some race condition bugs. * I decided to leave it in. */ - yelp_view_load (view, argv[1]); - yelp_view_load (view, argv[1]); + yelp_view_load (YELP_VIEW (view), argv[1]); + yelp_view_load (YELP_VIEW (view), argv[1]); } gtk_widget_show_all (GTK_WIDGET (window)); |