[dia] [warningectomy] build object-alias w/o warning on gcc
- From: Hans Breuer <hans src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [dia] [warningectomy] build object-alias w/o warning on gcc
- Date: Sun, 19 Jun 2011 18:51:07 +0000 (UTC)
commit 88171cec9691b5f9cf70b639a7dda9c127456494
Author: Hans Breuer <hans breuer org>
Date: Sun Jun 19 12:24:27 2011 +0200
[warningectomy] build object-alias w/o warning on gcc
lib/object-alias.c | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
---
diff --git a/lib/object-alias.c b/lib/object-alias.c
index df49ffb..8d9f4c1 100644
--- a/lib/object-alias.c
+++ b/lib/object-alias.c
@@ -53,6 +53,8 @@
#include "dia_dirs.h"
#include "propinternals.h"
+#include "object-alias.h"
+
/* DiaObjectType _alias_type must be dynamically
*
* The hash table is mapping the alias name to the real type.
@@ -125,12 +127,11 @@ _alias_create (Point *startpoint,
static DiaObject *
_alias_load (ObjectNode obj_node, int version, const char *filename)
{
- DiaObject *obj;
+ DiaObject *obj = NULL;
xmlChar *str;
str = xmlGetProp(obj_node, (const xmlChar *)"type");
if (str) {
- DiaObjectType *alias_type = object_get_type ((char *)str);
DiaObjectType *real_type = _alias_lookup ((char *)str);
Point apoint = {0, 0};
Handle *h1, *h2;
@@ -142,7 +143,7 @@ _alias_load (ObjectNode obj_node, int version, const char *filename)
object_load_props (obj, obj_node);
#ifdef MODIFY_OBJECTS_TYPE
/* now modify the object for some behavior change */
- obj->type = alias_type; /* also changes the name */
+ obj->type = object_get_type ((char *)str); /* also changes the name */
#endif
xmlFree(str);
}
@@ -178,7 +179,7 @@ object_register_alias_type (DiaObjectType *type, ObjectNode alias_node)
if (!_alias_types_ht)
_alias_types_ht = g_hash_table_new (g_str_hash, g_str_equal);
- g_hash_table_insert (_alias_types_ht, g_strdup (name), type);
+ g_hash_table_insert (_alias_types_ht, g_strdup ((char *)name), type);
xmlFree (name);
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]