diff options
author | David King <amigadave@amigadave.com> | 2015-02-09 15:55:56 +0000 |
---|---|---|
committer | David King <amigadave@amigadave.com> | 2015-02-09 22:35:45 +0000 |
commit | b76568699b0b79cabc3a54e939c3c3f886379e81 (patch) | |
tree | d79dc28d33b317fec5776f91c4d63a266e4e18b6 | |
parent | b997c542786e5a4c52cc206224f6f64119bb901d (diff) | |
download | yelp-b76568699b0b79cabc3a54e939c3c3f886379e81.tar.gz |
Fix pointer sign warnings
-rw-r--r-- | libyelp/yelp-docbook-document.c | 6 | ||||
-rw-r--r-- | libyelp/yelp-help-list.c | 12 | ||||
-rw-r--r-- | libyelp/yelp-mallard-document.c | 30 | ||||
-rw-r--r-- | libyelp/yelp-sqlite-storage.c | 2 |
4 files changed, 25 insertions, 25 deletions
diff --git a/libyelp/yelp-docbook-document.c b/libyelp/yelp-docbook-document.c index 57d96dbe..83eebc81 100644 --- a/libyelp/yelp-docbook-document.c +++ b/libyelp/yelp-docbook-document.c @@ -790,7 +790,7 @@ docbook_walk_get_title (YelpDocbookDocument *docbook, if (title) { xmlChar *title_s = xmlNodeGetContent (title); - gchar *ret = g_strdup (title_s); + gchar *ret = g_strdup ((const gchar *) title_s); xmlFree (title_s); return ret; } @@ -929,11 +929,11 @@ docbook_index_node (DocbookIndexData *index) g_string_append_c (index->str, ' '); } if (index->cur->type == XML_TEXT_NODE) { - g_string_append (index->str, index->cur->content); + g_string_append (index->str, (const gchar *) index->cur->content); return; } if (index->cur->type != XML_ELEMENT_NODE || - g_str_has_suffix (index->cur->name, "info") || + g_str_has_suffix ((const gchar *) index->cur->name, "info") || g_str_equal (index->cur->name, "remark")) return; oldcur = index->cur; diff --git a/libyelp/yelp-help-list.c b/libyelp/yelp-help-list.c index dc3774c0..6724e979 100644 --- a/libyelp/yelp-help-list.c +++ b/libyelp/yelp-help-list.c @@ -128,15 +128,15 @@ yelp_help_list_init (YelpHelpList *list) g_free, (GDestroyNotify) help_list_entry_free); - priv->get_docbook_title = xmlXPathCompile ("normalize-space(" + priv->get_docbook_title = xmlXPathCompile (BAD_CAST "normalize-space(" "( /*/title | /*/db:title" "| /*/articleinfo/title" "| /*/bookinfo/title" "| /*/db:info/db:title" ")[1])"); - priv->get_mallard_title = xmlXPathCompile ("normalize-space((/mal:page/mal:info/mal:title[@type='text'] |" + priv->get_mallard_title = xmlXPathCompile (BAD_CAST "normalize-space((/mal:page/mal:info/mal:title[@type='text'] |" " /mal:page/mal:title)[1])"); - priv->get_mallard_desc = xmlXPathCompile ("normalize-space(/mal:page/mal:info/mal:desc[1])"); + priv->get_mallard_desc = xmlXPathCompile (BAD_CAST "normalize-space(/mal:page/mal:info/mal:desc[1])"); yelp_document_set_page_id ((YelpDocument *) list, NULL, "index"); yelp_document_set_page_id ((YelpDocument *) list, "index", "index"); @@ -628,7 +628,7 @@ help_list_process_docbook (YelpHelpList *list, obj = xmlXPathCompiledEval (priv->get_docbook_title, xpath); if (obj) { if (obj->stringval) - entry->title = g_strdup (obj->stringval); + entry->title = g_strdup ((const gchar *) obj->stringval); xmlXPathFreeObject (obj); } @@ -668,14 +668,14 @@ help_list_process_mallard (YelpHelpList *list, obj = xmlXPathCompiledEval (priv->get_mallard_title, xpath); if (obj) { if (obj->stringval) - entry->title = g_strdup (obj->stringval); + entry->title = g_strdup ((const gchar *) obj->stringval); xmlXPathFreeObject (obj); } obj = xmlXPathCompiledEval (priv->get_mallard_desc, xpath); if (obj) { if (obj->stringval) - entry->desc = g_strdup (obj->stringval); + entry->desc = g_strdup ((const gchar *) obj->stringval); xmlXPathFreeObject (obj); } diff --git a/libyelp/yelp-mallard-document.c b/libyelp/yelp-mallard-document.c index 00a77463..49871062 100644 --- a/libyelp/yelp-mallard-document.c +++ b/libyelp/yelp-mallard-document.c @@ -38,7 +38,7 @@ #include "yelp-debug.h" #define STYLESHEET DATADIR"/yelp/xslt/mal2html.xsl" -#define MALLARD_NS "http://projectmallard.org/1.0/" +#define MALLARD_NS BAD_CAST "http://projectmallard.org/1.0/" typedef enum { MALLARD_STATE_BLANK, @@ -165,7 +165,7 @@ yelp_mallard_document_init (YelpMallardDocument *mallard) priv->index_running = FALSE; priv->cache = xmlNewDoc (BAD_CAST "1.0"); - priv->cache_ns = xmlNewNs (NULL, BAD_CAST MALLARD_NS, BAD_CAST "mal"); + priv->cache_ns = xmlNewNs (NULL, MALLARD_NS, BAD_CAST "mal"); cur = xmlNewDocNode (priv->cache, priv->cache_ns, BAD_CAST "cache", NULL); xmlDocSetRootElement (priv->cache, cur); priv->cache_ns->next = cur->nsDef; @@ -173,7 +173,7 @@ yelp_mallard_document_init (YelpMallardDocument *mallard) priv->pages_hash = g_hash_table_new_full (g_str_hash, g_str_equal, NULL, (GDestroyNotify) mallard_page_data_free); - priv->normalize = xmlXPathCompile ("normalize-space(.)"); + priv->normalize = xmlXPathCompile (BAD_CAST "normalize-space(.)"); } static void @@ -646,7 +646,7 @@ mallard_page_data_info (MallardPageData *page_data, page_data->xpath->node = child; obj = xmlXPathCompiledEval (priv->normalize, page_data->xpath); g_free (page_data->page_title); - page_data->page_title = g_strdup (obj->stringval); + page_data->page_title = g_strdup ((const gchar *) obj->stringval); xmlXPathFreeObject (obj); } if (role != NULL) @@ -659,7 +659,7 @@ mallard_page_data_info (MallardPageData *page_data, xmlXPathObjectPtr obj; page_data->xpath->node = child; obj = xmlXPathCompiledEval (priv->normalize, page_data->xpath); - page_data->page_desc = g_strdup (obj->stringval); + page_data->page_desc = g_strdup ((const gchar *) obj->stringval); xmlXPathFreeObject (obj); xmlAddChild (cache_node, xmlCopyNode (child, 1)); @@ -671,12 +671,12 @@ mallard_page_data_info (MallardPageData *page_data, type = xmlGetProp (child, BAD_CAST "type"); if (type != NULL) { - if (xmlStrEqual (type, "next")) { + if (xmlStrEqual (type, BAD_CAST "next")) { next = xmlGetProp (child, BAD_CAST "xref"); if (next != NULL) { if (page_data->next_page != NULL) g_free (page_data->next_page); - page_data->next_page = g_strdup (next); + page_data->next_page = g_strdup ((const gchar *) next); xmlFree (next); } } @@ -844,7 +844,7 @@ xml_node_get_icon (xmlNodePtr node) style = xmlGetProp (node, BAD_CAST "style"); if (style) { gint i; - styles = g_strsplit (style, " ", -1); + styles = g_strsplit ((const gchar *)style, " ", -1); for (i = 0; styles[i] != NULL; i++) { if (g_str_equal (styles[i], "video")) { icon = "yelp-page-video-symbolic"; @@ -912,7 +912,7 @@ mallard_index_node (MallardIndexData *index) g_string_append_c (index->str, ' '); } if (child->type == XML_TEXT_NODE) { - g_string_append (index->str, child->content); + g_string_append (index->str, (const gchar *) child->content); continue; } } @@ -1016,23 +1016,23 @@ mallard_index_threaded (YelpMallardDocument *mallard) if (g_hash_table_lookup (ids, id)) goto done; /* We never use the value. Just need something non-NULL. */ - g_hash_table_insert (ids, g_strdup (id), id); + g_hash_table_insert (ids, g_strdup ((const gchar *) id), id); xpath = xmlXPathNewContext (index->doc); - xmlXPathRegisterNs (xpath, BAD_CAST "mal", BAD_CAST MALLARD_NS); + xmlXPathRegisterNs (xpath, BAD_CAST "mal", MALLARD_NS); obj = xmlXPathEvalExpression (BAD_CAST "normalize-space((/mal:page/mal:info/mal:title[@type='text'] |" "/mal:page/mal:title)[1])", xpath); - title = g_strdup (obj->stringval); + title = g_strdup ((const gchar *) obj->stringval); xmlXPathFreeObject (obj); obj = xmlXPathEvalExpression (BAD_CAST "normalize-space(/mal:page/mal:info/mal:desc[1])", xpath); - desc = g_strdup (obj->stringval); + desc = g_strdup ((const gchar *) obj->stringval); xmlXPathFreeObject (obj); - index->str = g_string_new (desc); + index->str = g_string_new ((const gchar *) desc); g_string_append_c (index->str, ' '); mallard_index_node (index); @@ -1133,7 +1133,7 @@ mallard_monitor_changed (GFileMonitor *monitor, xmlFreeDoc (priv->cache); priv->cache = xmlNewDoc (BAD_CAST "1.0"); - priv->cache_ns = xmlNewNs (NULL, BAD_CAST MALLARD_NS, BAD_CAST "mal"); + priv->cache_ns = xmlNewNs (NULL, MALLARD_NS, BAD_CAST "mal"); cur = xmlNewDocNode (priv->cache, priv->cache_ns, BAD_CAST "cache", NULL); xmlDocSetRootElement (priv->cache, cur); priv->cache_ns->next = cur->nsDef; diff --git a/libyelp/yelp-sqlite-storage.c b/libyelp/yelp-sqlite-storage.c index 74f88845..eeeb4045 100644 --- a/libyelp/yelp-sqlite-storage.c +++ b/libyelp/yelp-sqlite-storage.c @@ -300,7 +300,7 @@ yelp_sqlite_storage_get_root_title (YelpStorage *storage, sqlite3_bind_text (stmt, 1, doc_uri, -1, SQLITE_TRANSIENT); sqlite3_bind_text (stmt, 2, g_get_language_names()[0], -1, SQLITE_STATIC); if (sqlite3_step (stmt) == SQLITE_ROW) - ret = g_strdup (sqlite3_column_text (stmt, 0)); + ret = g_strdup ((const gchar *) sqlite3_column_text (stmt, 0)); sqlite3_finalize (stmt); g_mutex_unlock (&priv->mutex); |