[gnumeric] Memory: more xmlchar stuff.
- From: Morten Welinder <mortenw src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnumeric] Memory: more xmlchar stuff.
- Date: Tue, 24 Aug 2010 19:33:47 +0000 (UTC)
commit 6336053bd0e9b8be4f1cda86e4bc55c4a150f69a
Author: Morten Welinder <terra gnome org>
Date: Tue Aug 24 15:32:57 2010 -0400
Memory: more xmlchar stuff.
src/gnm-plugin.c | 20 ++++++--------------
1 files changed, 6 insertions(+), 14 deletions(-)
---
diff --git a/src/gnm-plugin.c b/src/gnm-plugin.c
index f35837f..f8d0b57 100644
--- a/src/gnm-plugin.c
+++ b/src/gnm-plugin.c
@@ -74,13 +74,10 @@ plugin_service_function_group_read_xml (GOPluginService *service, xmlNode *tree,
GO_INIT_RET_ERROR_INFO (ret_error);
category_node = go_xml_get_child_by_name_no_lang (tree, "category");
- if (category_node != NULL) {
- xmlChar *val = xmlNodeGetContent (category_node);
- category_name = g_strdup (CXML2C (val));
- xmlFree (val);
- } else {
- category_name = NULL;
- }
+ category_name = category_node
+ ? xml2c (xmlNodeGetContent (category_node))
+ : NULL;
+
translated_category_node = go_xml_get_child_by_name_by_lang (tree, "category");
if (translated_category_node != NULL) {
xmlChar *lang;
@@ -370,13 +367,8 @@ plugin_service_ui_read_xml (GOPluginService *service, xmlNode *tree, GOErrorInfo
lang = go_xml_node_get_cstr (label_node, "lang");
if (lang != NULL) {
- xmlChar *val;
-
- val = xmlNodeGetContent (label_node);
- g_free (label);
- label = g_strdup (CXML2C (val));
- xmlFree (val);
- g_free (lang);
+ label = xml2c (xmlNodeGetContent (label_node));
+ xmlFree (lang);
}
}
/*****************************************************************************************/
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]