Use complete concatenated text instead of concatenating the texts itself.

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

diff --git a/gom/gom.c b/gom/gom.c
index 0203fc6ec49af4bb2f1f250b93c9e11a61642d01..1770efdbd3690f6c328b5e426c7730137aec1df0 100644 (file)
--- 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,34 @@ 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();
+}
+
+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)
 {
 }
 
@@ -152,21 +177,23 @@ 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,
+                Gedcom_val parsed_value UNUSED)
 {
   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);
@@ -194,31 +221,6 @@ void set_xref_type(struct xref_value* xr, const char *str)
     xr->type = XREF_ANY;
 }
 
-char* concat_strings(NL_TYPE type, char *str1, const char *str2)
-{
-  if (str1 != NULL && str2 != NULL) {
-    char *newp;
-    char *wp;
-    size_t len1 = strlen(str1);
-    size_t len2 = strlen(str2);
-    size_t len  = len1 + len2 + 1;
-    if (type == WITH_NL)
-      len++;
-    newp = (char*) realloc(str1, len);
-    if (newp == NULL)
-      return NULL;
-    wp   = newp + len1;
-    str1 = newp;
-    if (type == WITH_NL)
-      *wp++ = '\n';
-    wp = memcpy (wp, str2, len2);
-    wp += len2;
-    *wp++ = '\0';
-  }
-
-  return str1;
-}
-
 struct date_value* dup_date(struct date_value dv)
 {
   struct date_value* dv_ptr;
@@ -242,24 +244,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;
-}