X-Git-Url: https://git.dlugolecki.net.pl/?a=blobdiff_plain;f=gom%2Fpersonal_name.c;h=686422fc3b88f2e8a228ee95e464fd2d9d72ca29;hb=3d1822cb295202993c11564f7dd64442d8b67d2f;hp=6345b29195aac6fd3bb30138d4632fe7fe5b36a6;hpb=082066d0c776403b70c366f9a7d1333c7a9fac15;p=gedcom-parse.git

diff --git a/gom/personal_name.c b/gom/personal_name.c
index 6345b29..686422f 100644
--- a/gom/personal_name.c
+++ b/gom/personal_name.c
@@ -38,12 +38,8 @@ Gedcom_ctxt sub_name_start(_ELT_PARAMS_)
   Gom_ctxt result = NULL;
 
   if (ctxt) {
-    struct personal_name *name
-      = (struct personal_name *)malloc(sizeof(struct personal_name));
-    if (! name)
-      MEMORY_ERROR;
-    else {
-      memset (name, 0, sizeof(struct personal_name));
+    struct personal_name *name = SUB_MAKEFUNC(personal_name)();
+    if (name) {
       name->name = strdup(GEDCOM_STRING(parsed_value));
 
       if (! name->name) {
@@ -53,7 +49,7 @@ Gedcom_ctxt sub_name_start(_ELT_PARAMS_)
       else {
 	switch (ctxt->ctxt_type) {
 	  case REC_INDI:
-	    individual_add_name(ctxt, name); break;
+	    ADDFUNC2(individual,personal_name)(ctxt, name); break;
 	  default:
 	    UNEXPECTED_CONTEXT(ctxt->ctxt_type);
 	}
@@ -65,33 +61,22 @@ Gedcom_ctxt sub_name_start(_ELT_PARAMS_)
   return (Gedcom_ctxt)result;
 }
 
-STRING_CB(personal_name, sub_name_npfx_start, prefix)
-STRING_CB(personal_name, sub_name_givn_start, given)
-STRING_CB(personal_name, sub_name_nick_start, nickname)
-STRING_CB(personal_name, sub_name_spfx_start, surname_prefix)
-STRING_CB(personal_name, sub_name_surn_start, surname)
-STRING_CB(personal_name, sub_name_nsfx_start, suffix)
-
-void name_add_citation(Gom_ctxt ctxt, struct source_citation* cit)
-{
-  struct personal_name *name = SAFE_CTXT_CAST(personal_name, ctxt);
-  if (name)
-    LINK_CHAIN_ELT(source_citation, name->citation, cit);  
-}
-
-void name_add_note(Gom_ctxt ctxt, struct note_sub* note)
-{
-  struct personal_name *name = SAFE_CTXT_CAST(personal_name, ctxt);
-  if (name)
-    LINK_CHAIN_ELT(note_sub, name->note, note);  
-}
-
-void name_add_user_data(Gom_ctxt ctxt, struct user_data* data)
-{
-  struct personal_name *obj = SAFE_CTXT_CAST(personal_name, ctxt);
-  if (obj)
-    LINK_CHAIN_ELT(user_data, obj->extra, data);
-}
+DEFINE_SUB_MAKEFUNC(personal_name)
+DEFINE_SUB_ADDFUNC(personal_name)
+DEFINE_SUB_FINDFUNC(personal_name)
+DEFINE_SUB_REMOVEFUNC(personal_name)
+DEFINE_SUB_MOVEFUNC(personal_name)
+     
+DEFINE_STRING_CB(personal_name, sub_name_npfx_start, prefix)
+DEFINE_STRING_CB(personal_name, sub_name_givn_start, given)
+DEFINE_STRING_CB(personal_name, sub_name_nick_start, nickname)
+DEFINE_STRING_CB(personal_name, sub_name_spfx_start, surname_prefix)
+DEFINE_STRING_CB(personal_name, sub_name_surn_start, surname)
+DEFINE_STRING_CB(personal_name, sub_name_nsfx_start, suffix)
+
+DEFINE_ADDFUNC2(personal_name, source_citation, citation)
+DEFINE_ADDFUNC2(personal_name, note_sub, note)
+DEFINE_ADDFUNC2(personal_name, user_data, extra)
 
 void name_subscribe()
 {
@@ -110,7 +95,19 @@ void name_subscribe()
 			      def_elt_end);
 }
 
-void name_cleanup(struct personal_name* name)
+void UNREFALLFUNC(personal_name)(struct personal_name* obj)
+{
+  if (obj) {
+    struct personal_name* runner;
+    for (runner = obj; runner; runner = runner->next) {
+      UNREFALLFUNC(source_citation)(runner->citation);
+      UNREFALLFUNC(note_sub)(runner->note);
+      UNREFALLFUNC(user_data)(runner->extra);
+    }
+  }
+}
+
+void CLEANFUNC(personal_name)(struct personal_name* name)
 {
   if (name) {
     SAFE_FREE(name->name);
@@ -120,9 +117,9 @@ void name_cleanup(struct personal_name* name)
     SAFE_FREE(name->surname_prefix);
     SAFE_FREE(name->surname);
     SAFE_FREE(name->suffix);
-    DESTROY_CHAIN_ELTS(source_citation, name->citation, citation_cleanup);
-    DESTROY_CHAIN_ELTS(note_sub, name->note, note_sub_cleanup);
-    DESTROY_CHAIN_ELTS(user_data, name->extra, user_data_cleanup);
+    DESTROY_CHAIN_ELTS(source_citation, name->citation);
+    DESTROY_CHAIN_ELTS(note_sub, name->note);
+    DESTROY_CHAIN_ELTS(user_data, name->extra);
   }
 }
 
@@ -139,22 +136,23 @@ int write_names(Gedcom_write_hndl hndl, int parent,
 				       parent, obj->name);
     if (obj->prefix)
       result |= gedcom_write_element_str(hndl, ELT_SUB_PERS_NAME_NPFX, 0,
-					 parent, obj->prefix);
+					 ELT_SUB_PERS_NAME, obj->prefix);
     if (obj->given)
       result |= gedcom_write_element_str(hndl, ELT_SUB_PERS_NAME_GIVN, 0,
-					 parent, obj->given);
+					 ELT_SUB_PERS_NAME, obj->given);
     if (obj->nickname)
       result |= gedcom_write_element_str(hndl, ELT_SUB_PERS_NAME_NICK, 0,
-					 parent, obj->nickname);
+					 ELT_SUB_PERS_NAME, obj->nickname);
     if (obj->surname_prefix)
       result |= gedcom_write_element_str(hndl, ELT_SUB_PERS_NAME_SPFX, 0,
-					 parent, obj->surname_prefix);
+					 ELT_SUB_PERS_NAME,
+					 obj->surname_prefix);
     if (obj->surname)
       result |= gedcom_write_element_str(hndl, ELT_SUB_PERS_NAME_SURN, 0,
-					 parent, obj->surname);
+					 ELT_SUB_PERS_NAME, obj->surname);
     if (obj->suffix)
       result |= gedcom_write_element_str(hndl, ELT_SUB_PERS_NAME_NSFX, 0,
-					 parent, obj->suffix);
+					 ELT_SUB_PERS_NAME, obj->suffix);
     if (obj->citation)
       result |= write_citations(hndl, ELT_SUB_PERS_NAME, obj->citation);
     if (obj->note)