X-Git-Url: https://git.dlugolecki.net.pl/?a=blobdiff_plain;f=gom%2Fgom.c;h=ed9d5e5f530011d73e5881280c4bb808ff68f053;hb=e5f86c3d527897be1f7e7135ffdfc023831aaebd;hp=a0aa9d68a152b24b58c30d9d392fd8ef368364e3;hpb=09b30ce415e2a2b126ea4d5ef899608d5b94e99b;p=gedcom-parse.git

diff --git a/gom/gom.c b/gom/gom.c
index a0aa9d6..ed9d5e5 100644
--- 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,34 @@ 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();
+}
+
+int gom_write_file(const char* file_name, int *total_conv_fails)
+{
+  Gedcom_write_hndl hndl;
+  int result = 1;
+
+  hndl = gedcom_write_open(file_name);
+  if (hndl) {
+    result = write_header(hndl);
+    result |= gedcom_write_close(hndl, total_conv_fails);
+  }
+
+  return result;
+}
+
 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 +142,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 +151,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,38 +160,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_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;
@@ -198,10 +231,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)