Fixed memory leak.

[gedcom-parse.git] / gom / gom.c

diff --git a/gom/gom.c b/gom/gom.c
index a81777810990eb17b713ebf39fab7d4e9ddabbdf..6ca25d234ed2a5ebcef91c9e3b9b60ce38febe4d 100644 (file)
--- a/gom/gom.c
+++ b/gom/gom.c
@@ -103,15 +103,29 @@ void subscribe_all()
   }
 }
 
+int gom_active = 0;
+
 int gom_parse_file(const char* file_name)
 {
-  subscribe_all();
+  if (gom_active) {
+    gom_cleanup();
+  }
+  else {
+    subscribe_all();
+  }
+  gom_active = 1;
   return gedcom_parse_file(file_name);
 }
 
 int gom_new_model()
 {
-  subscribe_all();
+  if (gom_active) {
+    gom_cleanup();
+  }
+  else {
+    subscribe_all();
+  }
+  gom_active = 1;
   return gedcom_new_model();
 }
 
@@ -187,6 +201,11 @@ void gom_mem_error(const char *filename, int line)
   gedcom_error(_("Could not allocate memory at %s, %d"), filename, line);
 }
 
+void gom_xref_already_in_use(const char *xrefstr)
+{
+  gedcom_error(_("Cross-reference key '%s' is already in use"), xrefstr);
+}
+
 void gom_unexpected_context(const char* file, int line, OBJ_TYPE found)
 {
   gedcom_warning(_("Internal error: Unexpected context at %s, line %d: %d"),
@@ -199,6 +218,16 @@ void gom_no_context(const char* file, int line)
                 file, line);
 }
 
+void gom_move_error(const char* type)
+{
+  gedcom_warning(_("Could not move struct of type %s"), type);
+}
+
+void gom_find_error(const char* type)
+{
+  gedcom_warning(_("Could not find struct of type %s in chain"), type);
+}
+
 void gom_default_callback (Gedcom_elt elt UNUSED, Gedcom_ctxt parent UNUSED,
                           int level, char* tag, char* raw_value,
                           int parsed_tag UNUSED)
@@ -242,27 +271,3 @@ void set_xref_type(struct xref_value* xr, const char *str)
   else
     xr->type = XREF_ANY;
 }
-
-struct date_value* dup_date(struct date_value dv)
-{
-  struct date_value* dv_ptr;
-  dv_ptr = (struct date_value*) malloc(sizeof(struct date_value));
-  if (! dv_ptr)
-    MEMORY_ERROR;
-  else {
-    memcpy(dv_ptr, &dv, sizeof(struct date_value));
-  }
-  return dv_ptr;
-}
-
-struct age_value* dup_age(struct age_value age)
-{
-  struct age_value* age_ptr;
-  age_ptr = (struct age_value*) malloc(sizeof(struct age_value));
-  if (! age_ptr)
-    MEMORY_ERROR;
-  else {
-    memcpy(age_ptr, &age, sizeof(struct age_value));
-  }
-  return age_ptr;
-}