Little updates.

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

diff --git a/gom/gom.c b/gom/gom.c
index 2ddbb550d00778ae5f92ce63f273e8386f7b6d6c..cc388ee2be9dbd7484d4a5d55e9ed3b4a26eea72 100644 (file)
--- a/gom/gom.c
+++ b/gom/gom.c
@@ -52,8 +52,8 @@
 #include "gom.h"
 #include "gom_internal.h"
 
-void gom_default_callback (Gedcom_elt elt, Gedcom_ctxt parent, int level, char* tag,
-                          char* raw_value, int parsed_tag);
+void gom_default_callback (Gedcom_elt elt, Gedcom_ctxt parent, int level,
+                          char* tag, char* raw_value, int parsed_tag);
 
 void gom_cleanup()
 {
@@ -69,7 +69,7 @@ void gom_cleanup()
   user_recs_cleanup();
 }
 
-int gom_parse_file(char* file_name)
+void subscribe_all()
 {
   gedcom_set_default_callback(gom_default_callback);
   header_subscribe();
@@ -98,29 +98,47 @@ int gom_parse_file(char* file_name)
   source_event_subscribe();
   source_description_subscribe();
 
-  atexit(gom_cleanup);
+  if (atexit(gom_cleanup) != 0) {
+    gedcom_warning(_("Could not register gom cleanup function"));
+  }
+}
+
+int gom_parse_file(const char* file_name)
+{
+  subscribe_all();
   return gedcom_parse_file(file_name);
 }
 
+int gom_new_model()
+{
+  subscribe_all();
+  return gedcom_new_model();
+}
+
 Gom_ctxt make_gom_ctxt(int ctxt_type, OBJ_TYPE obj_type, void *ctxt_ptr)
 {
   Gom_ctxt ctxt   = (Gom_ctxt)malloc(sizeof(struct Gom_ctxt_struct));
-  ctxt->ctxt_type = ctxt_type;
-  ctxt->obj_type  = obj_type;
-  ctxt->ctxt_ptr  = ctxt_ptr;
+  if (! ctxt)
+    MEMORY_ERROR;
+  else {
+    ctxt->ctxt_type = ctxt_type;
+    ctxt->obj_type  = obj_type;
+    ctxt->ctxt_ptr  = ctxt_ptr;
+  }
   return ctxt;
 }
 
-void NULL_DESTROY(void* anything)
+void NULL_DESTROY(void* anything UNUSED)
 {
 }
 
 void destroy_gom_ctxt(Gom_ctxt ctxt)
 {
-  free(ctxt);
+  SAFE_FREE(ctxt);
 }
 
-void gom_cast_error(char* file, int line, OBJ_TYPE expected, OBJ_TYPE found)
+void gom_cast_error(const char* file, int line,
+                   OBJ_TYPE expected, OBJ_TYPE found)
 {
   fprintf(stderr,
          "Wrong gom ctxt cast at %s, line %d: expected %d, found %d\n",
@@ -128,33 +146,45 @@ void gom_cast_error(char* file, int line, OBJ_TYPE expected, OBJ_TYPE found)
   abort();
 }
 
-void gom_unexpected_context(char* file, int line, OBJ_TYPE found)
+void gom_mem_error(const char *filename, int line)
+{
+  gedcom_error(_("Could not allocate memory at %s, %d"), filename, line);
+}
+
+void gom_unexpected_context(const char* file, int line, OBJ_TYPE found)
 {
   gedcom_warning(_("Internal error: Unexpected context at %s, line %d: %d"),
                 file, line, found);
 }
 
-void gom_default_callback (Gedcom_elt elt, Gedcom_ctxt parent, int level, char* tag,
-                          char* raw_value, int parsed_tag)
+void gom_no_context(const char* file, int line)
+{
+  gedcom_warning(_("Internal error: No context at %s, line %d"),
+                file, line);
+}
+
+void gom_default_callback (Gedcom_elt elt UNUSED, Gedcom_ctxt parent UNUSED,
+                          int level, char* tag, char* raw_value,
+                          int parsed_tag UNUSED)
 {
   gedcom_warning(_("Data loss in import: \"%d %s %s\""),
                  level, tag, raw_value);
 }
 
-void def_rec_end(Gedcom_rec rec, Gedcom_ctxt self)
+void def_rec_end(Gedcom_rec rec UNUSED, Gedcom_ctxt self)
 {
   Gom_ctxt ctxt = (Gom_ctxt)self;
   destroy_gom_ctxt(ctxt);
 }
 
-void def_elt_end(Gedcom_elt elt, Gedcom_ctxt parent, Gedcom_ctxt self,
-                Gedcom_val parsed_value)
+void def_elt_end(Gedcom_elt elt UNUSED, Gedcom_ctxt parent UNUSED,
+                Gedcom_ctxt self, Gedcom_val parsed_value UNUSED)
 {
   Gom_ctxt ctxt = (Gom_ctxt)self;
   destroy_gom_ctxt(ctxt);
 }
 
-void set_xref_type(struct xref_value* xr, char *str)
+void set_xref_type(struct xref_value* xr, const char *str)
 {
   if (!strcasecmp(str, "FAM"))
     xr->type = XREF_FAM;
@@ -187,10 +217,8 @@ char* concat_strings(NL_TYPE type, char *str1, const char *str2)
     if (type == WITH_NL)
       len++;
     newp = (char*) realloc(str1, len);
-    if (newp == NULL) {
-      free (str1);
+    if (newp == NULL)
       return NULL;
-    }
     wp   = newp + len1;
     str1 = newp;
     if (type == WITH_NL)
@@ -207,7 +235,11 @@ struct date_value* dup_date(struct date_value dv)
 {
   struct date_value* dv_ptr;
   dv_ptr = (struct date_value*) malloc(sizeof(struct date_value));
-  memcpy(dv_ptr, &dv, sizeof(struct date_value));
+  if (! dv_ptr)
+    MEMORY_ERROR;
+  else {
+    memcpy(dv_ptr, &dv, sizeof(struct date_value));
+  }
   return dv_ptr;
 }
 
@@ -215,6 +247,10 @@ struct age_value* dup_age(struct age_value age)
 {
   struct age_value* age_ptr;
   age_ptr = (struct age_value*) malloc(sizeof(struct age_value));
-  memcpy(age_ptr, &age, sizeof(struct age_value));
+  if (! age_ptr)
+    MEMORY_ERROR;
+  else {
+    memcpy(age_ptr, &age, sizeof(struct age_value));
+  }
   return age_ptr;
 }