Moved common code to gom_internal.h

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

diff --git a/gom/multimedia.c b/gom/multimedia.c
index 43dd6b7e52788a44b91c7f21e9117d93ce9fe0cd..8ae88023e65c72ddf748d0f47a4ddc4be10b0b14 100644 (file)
--- a/gom/multimedia.c
+++ b/gom/multimedia.c
@@ -38,19 +38,21 @@ REC_CB(multimedia, obje_start, make_multimedia_record)
 GET_REC_BY_XREF(multimedia, XREF_OBJE, gom_get_multimedia_by_xref)
 STRING_CB(multimedia, obje_form_start, form)
 STRING_CB(multimedia, obje_titl_start, title)     
-NULL_CB(multimedia, obje_blob_start)     
+NULL_CB(multimedia, obje_blob_start)
+STRING_END_CB(multimedia, obje_blob_end, data)
 XREF_CB(multimedia, obje_obje_start, continued, make_multimedia_record)
 
 Gedcom_ctxt obje_blob_cont_start(_ELT_PARAMS_)
 {
   Gom_ctxt ctxt = (Gom_ctxt)parent;
-  struct multimedia *obj = SAFE_CTXT_CAST(multimedia, ctxt);
-  char *str = GEDCOM_STRING(parsed_value);
-  if (obj->data)
-    obj->data = concat_strings (WITHOUT_NL, obj->data, str);
+  Gom_ctxt result = NULL;
+
+  if (! ctxt)
+    NO_CONTEXT;
   else
-    obj->data = strdup(str);
-  return (Gedcom_ctxt) make_gom_ctxt(elt, ctxt->obj_type, ctxt->ctxt_ptr);
+    result = make_gom_ctxt(elt, ctxt->obj_type, ctxt->ctxt_ptr);
+  
+  return (Gedcom_ctxt)result;
 }
 
 void multimedia_subscribe()
@@ -58,7 +60,7 @@ void multimedia_subscribe()
   gedcom_subscribe_to_record(REC_OBJE, obje_start, def_rec_end);
   gedcom_subscribe_to_element(ELT_OBJE_FORM, obje_form_start, def_elt_end);
   gedcom_subscribe_to_element(ELT_OBJE_TITL, obje_titl_start, def_elt_end);
-  gedcom_subscribe_to_element(ELT_OBJE_BLOB, obje_blob_start, def_elt_end);
+  gedcom_subscribe_to_element(ELT_OBJE_BLOB, obje_blob_start, obje_blob_end);
   gedcom_subscribe_to_element(ELT_OBJE_BLOB_CONT, obje_blob_cont_start,
                              def_elt_end);
   gedcom_subscribe_to_element(ELT_OBJE_OBJE, obje_obje_start, def_elt_end);
@@ -67,44 +69,53 @@ void multimedia_subscribe()
 void multimedia_add_note(Gom_ctxt ctxt, struct note_sub* note)
 {
   struct multimedia* obj = SAFE_CTXT_CAST(multimedia, ctxt);
-  LINK_CHAIN_ELT(note_sub, obj->note, note)
+  if (obj)
+    LINK_CHAIN_ELT(note_sub, obj->note, note);
 }
 
 void multimedia_add_user_ref(Gom_ctxt ctxt, struct user_ref_number* ref)
 {
   struct multimedia *obj = SAFE_CTXT_CAST(multimedia, ctxt);
-  LINK_CHAIN_ELT(user_ref_number, obj->ref, ref)
+  if (obj)
+    LINK_CHAIN_ELT(user_ref_number, obj->ref, ref);
 }
 
-void multimedia_set_record_id(Gom_ctxt ctxt, char *rin)
+void multimedia_set_record_id(Gom_ctxt ctxt, const char *rin)
 {
   struct multimedia *obj = SAFE_CTXT_CAST(multimedia, ctxt);
-  obj->record_id = strdup(rin);
+  if (obj) {
+    obj->record_id = strdup(rin);
+    if (! obj->record_id) MEMORY_ERROR;
+  }
 }
 
 void multimedia_set_change_date(Gom_ctxt ctxt, struct change_date* chan)
 {
   struct multimedia *obj = SAFE_CTXT_CAST(multimedia, ctxt);
-  obj->change_date = chan;
+  if (obj)
+    obj->change_date = chan;
 }
 
 void multimedia_add_user_data(Gom_ctxt ctxt, struct user_data* data)
 {
   struct multimedia *obj = SAFE_CTXT_CAST(multimedia, ctxt);
-  LINK_CHAIN_ELT(user_data, obj->extra, data)
+  if (obj)
+    LINK_CHAIN_ELT(user_data, obj->extra, data);
 }
 
 void multimedia_cleanup(struct multimedia* obj)
 {
-  SAFE_FREE(obj->xrefstr);
-  SAFE_FREE(obj->form);
-  SAFE_FREE(obj->title);
-  DESTROY_CHAIN_ELTS(note_sub, obj->note, note_sub_cleanup)
-  SAFE_FREE(obj->data);
-  DESTROY_CHAIN_ELTS(user_ref_number, obj->ref, user_ref_cleanup)
-  SAFE_FREE(obj->record_id);
-  change_date_cleanup(obj->change_date);
-  DESTROY_CHAIN_ELTS(user_data, obj->extra, user_data_cleanup)
+  if (obj) {
+    SAFE_FREE(obj->xrefstr);
+    SAFE_FREE(obj->form);
+    SAFE_FREE(obj->title);
+    DESTROY_CHAIN_ELTS(note_sub, obj->note, note_sub_cleanup);
+    SAFE_FREE(obj->data);
+    DESTROY_CHAIN_ELTS(user_ref_number, obj->ref, user_ref_cleanup);
+    SAFE_FREE(obj->record_id);
+    change_date_cleanup(obj->change_date);
+    DESTROY_CHAIN_ELTS(user_data, obj->extra, user_data_cleanup);
+  }
 }
 
 void multimedias_cleanup()
@@ -117,10 +128,13 @@ struct multimedia* gom_get_first_multimedia()
   return gom_first_multimedia;
 }
 
-struct multimedia* make_multimedia_record(char* xrefstr)
+struct multimedia* make_multimedia_record(const char* xrefstr)
 {
-  struct multimedia* multi;
+  struct multimedia* multi = NULL;
   MAKE_CHAIN_ELT(multimedia, gom_first_multimedia, multi);
-  multi->xrefstr = strdup(xrefstr);
+  if (multi) {
+    multi->xrefstr = strdup(xrefstr);
+    if (! multi->xrefstr) MEMORY_ERROR;
+  }
   return multi;
 }