X-Git-Url: https://git.dlugolecki.net.pl/?a=blobdiff_plain;f=gom%2Fgom.c;h=cc388ee2be9dbd7484d4a5d55e9ed3b4a26eea72;hb=d7e1e0c33172af1165d3059f67d51ec099fa4e02;hp=0203fc6ec49af4bb2f1f250b93c9e11a61642d01;hpb=4c445928c8f7d30731a66522ffb9747fe13a3243;p=gedcom-parse.git

diff --git a/gom/gom.c b/gom/gom.c
index 0203fc6..cc388ee 100644
--- a/gom/gom.c
+++ b/gom/gom.c
@@ -69,7 +69,7 @@ void gom_cleanup()
   user_recs_cleanup();
 }
 
-int gom_parse_file(const char* file_name)
+void subscribe_all()
 {
   gedcom_set_default_callback(gom_default_callback);
   header_subscribe();
@@ -101,9 +101,20 @@ int gom_parse_file(const char* file_name)
   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));
@@ -117,7 +128,7 @@ Gom_ctxt make_gom_ctxt(int ctxt_type, OBJ_TYPE obj_type, void *ctxt_ptr)
   return ctxt;
 }
 
-void NULL_DESTROY(void* anything)
+void NULL_DESTROY(void* anything UNUSED)
 {
 }
 
@@ -152,21 +163,22 @@ void gom_no_context(const char* file, int line)
 		 file, line);
 }
 
-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 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);
@@ -242,24 +254,3 @@ struct age_value* dup_age(struct age_value age)
   }
   return age_ptr;
 }
-
-char* gom_get_string(char** data)
-{
-  return *data;
-}
-
-char* gom_set_string(char** data, char* newvalue)
-{
-  char* result = NULL;
-  char* newptr = strdup(newvalue);
-  
-  if (!newptr)
-    MEMORY_ERROR;
-  else {
-    if (*data) free(*data);
-    *data = newptr;
-    result = *data;
-  }
-  
-  return result;
-}