Little updates.

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

diff --git a/gom/gom.c b/gom/gom.c
index 025541d5389ae0a8cef9437b30deb46bab6608ec..cc388ee2be9dbd7484d4a5d55e9ed3b4a26eea72 100644 (file)
--- a/gom/gom.c
+++ b/gom/gom.c
@@ -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();
@@ -101,9 +101,20 @@ int gom_parse_file(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)
 {
 }
 
@@ -126,7 +137,8 @@ void destroy_gom_ctxt(Gom_ctxt 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",
@@ -134,44 +146,45 @@ void gom_cast_error(char* file, int line, OBJ_TYPE expected, OBJ_TYPE found)
   abort();
 }
 
-void gom_mem_error(char *filename, int line)
+void gom_mem_error(const char *filename, int line)
 {
   gedcom_error(_("Could not allocate memory at %s, %d"), filename, line);
 }
 
-void gom_unexpected_context(char* file, int line, OBJ_TYPE found)
+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_no_context(char* file, int line)
+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, 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);
 }
 
-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;