summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRupert Swarbrick <rswarbrick@gmail.com>2010-12-22 12:04:30 +0000
committerShaun McCance <shaunm@gnome.org>2011-01-10 09:47:15 -0500
commit8df850b44a6cde52a327b001e73aef828af411c3 (patch)
treeeab0eeaddb44495f521ec7b1f7d2eb711534785c
parent9f573bb2f548934a3a50537a0cd025664637781a (diff)
downloadyelp-8df850b44a6cde52a327b001e73aef828af411c3.tar.gz
Lots of minor code tidyups.
The problems fixed here were found by running with CFLAGS='-Wall' and also using cppcheck.
-rw-r--r--libyelp/yelp-docbook-document.c2
-rw-r--r--libyelp/yelp-mallard-document.c2
-rw-r--r--libyelp/yelp-view.c3
3 files changed, 3 insertions, 4 deletions
diff --git a/libyelp/yelp-docbook-document.c b/libyelp/yelp-docbook-document.c
index 7dcf9170..a00e567a 100644
--- a/libyelp/yelp-docbook-document.c
+++ b/libyelp/yelp-docbook-document.c
@@ -354,7 +354,7 @@ docbook_process (YelpDocbookDocument *docbook)
id = xmlGetNsProp (priv->xmlcur, XML_XML_NAMESPACE, BAD_CAST "id");
if (id) {
- priv->root_id = g_strdup (id);
+ priv->root_id = g_strdup ((const gchar *) id);
yelp_document_set_page_id (document, NULL, (gchar *) id);
yelp_document_set_page_id (document, "//index", (gchar *) id);
}
diff --git a/libyelp/yelp-mallard-document.c b/libyelp/yelp-mallard-document.c
index 8f81e46f..6b64633b 100644
--- a/libyelp/yelp-mallard-document.c
+++ b/libyelp/yelp-mallard-document.c
@@ -574,7 +574,7 @@ mallard_page_data_walk (MallardPageData *page_data)
xmlXPathObjectPtr obj;
page_data->xpath->node = child;
obj = xmlXPathCompiledEval (priv->normalize, page_data->xpath);
- page_data->page_title = g_strdup (obj->stringval);
+ page_data->page_title = g_strdup ((const gchar *) obj->stringval);
xmlXPathFreeObject (obj);
}
}
diff --git a/libyelp/yelp-view.c b/libyelp/yelp-view.c
index 3462dfaa..0a59109f 100644
--- a/libyelp/yelp-view.c
+++ b/libyelp/yelp-view.c
@@ -1809,8 +1809,7 @@ uri_resolved (YelpUri *uri,
}
else {
error = g_error_new (YELP_ERROR, YELP_ERROR_NOT_FOUND,
- _("The URI does not point to a valid page."),
- struri);
+ _("The URI does not point to a valid page."));
}
break;
case YELP_URI_DOCUMENT_TYPE_ERROR: