Moved common code to gom_internal.h

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

diff --git a/gom/address.c b/gom/address.c
index f8972e616f73f7dc290a728bfaf496ba5fcc733f..1766d937164677dc659b34dcbddfd9a9b157e896 100644 (file)
--- a/gom/address.c
+++ b/gom/address.c
@@ -45,36 +45,27 @@ Gedcom_ctxt sub_addr_start(_ELT_PARAMS_)
     if (!addr)
       MEMORY_ERROR;
     else {
-      char *str = GEDCOM_STRING(parsed_value);
       memset (addr, 0, sizeof(struct address));
-      addr->full_label = strdup(str);
-      
-      if (! addr->full_label) {
-       MEMORY_ERROR;
-       free(addr);
-      }
-      else {
-       switch (ctxt->ctxt_type) {
-         case ELT_HEAD_SOUR_CORP:
-           header_add_address(ctxt, addr); break;
-         case ELT_SUB_FAM_EVT:
-         case ELT_SUB_FAM_EVT_EVEN:
-         case ELT_SUB_INDIV_ATTR:
-         case ELT_SUB_INDIV_RESI:
-         case ELT_SUB_INDIV_BIRT:
-         case ELT_SUB_INDIV_GEN:
-         case ELT_SUB_INDIV_ADOP:
-         case ELT_SUB_INDIV_EVEN:
-           event_add_address(ctxt, addr); break;
-         case REC_REPO:
-           repository_add_address(ctxt, addr); break;
-         case REC_SUBM:
-           submitter_add_address(ctxt, addr); break;
-         default:
-           UNEXPECTED_CONTEXT(ctxt->ctxt_type);
-       }
-       result = MAKE_GOM_CTXT(elt, address, addr);
+      switch (ctxt->ctxt_type) {
+       case ELT_HEAD_SOUR_CORP:
+         header_add_address(ctxt, addr); break;
+       case ELT_SUB_FAM_EVT:
+       case ELT_SUB_FAM_EVT_EVEN:
+       case ELT_SUB_INDIV_ATTR:
+       case ELT_SUB_INDIV_RESI:
+       case ELT_SUB_INDIV_BIRT:
+       case ELT_SUB_INDIV_GEN:
+       case ELT_SUB_INDIV_ADOP:
+       case ELT_SUB_INDIV_EVEN:
+         event_add_address(ctxt, addr); break;
+       case REC_REPO:
+         repository_add_address(ctxt, addr); break;
+       case REC_SUBM:
+         submitter_add_address(ctxt, addr); break;
+       default:
+         UNEXPECTED_CONTEXT(ctxt->ctxt_type);
       }
+      result = MAKE_GOM_CTXT(elt, address, addr);
     }
   }
   
@@ -88,21 +79,12 @@ Gedcom_ctxt sub_addr_cont_start(_ELT_PARAMS_)
   if (! ctxt)
     NO_CONTEXT;
   else {
-    struct address *addr = SAFE_CTXT_CAST(address, ctxt);
-    if (addr) {
-      char *str = GEDCOM_STRING(parsed_value);
-      char *newvalue = concat_strings (WITH_NL, addr->full_label, str);
-      if (! newvalue)
-       MEMORY_ERROR;
-      else {
-       addr->full_label = newvalue;
-       result = MAKE_GOM_CTXT(elt, address, addr);
-      }
-    }
+    result = make_gom_ctxt(elt, ctxt->ctxt_type, ctxt->ctxt_ptr);
   }
   return (Gedcom_ctxt)result;
 }
 
+STRING_END_CB(address, sub_addr_end, full_label)
 STRING_CB(address, sub_addr_adr1_start, line1)
 STRING_CB(address, sub_addr_adr2_start, line2)
 STRING_CB(address, sub_addr_city_start, city)
@@ -144,7 +126,7 @@ Gedcom_ctxt sub_phon_start(_ELT_PARAMS_)
 
 void address_subscribe()
 {
-  gedcom_subscribe_to_element(ELT_SUB_ADDR, sub_addr_start, def_elt_end);
+  gedcom_subscribe_to_element(ELT_SUB_ADDR, sub_addr_start, sub_addr_end);
   gedcom_subscribe_to_element(ELT_SUB_ADDR_CONT,
                              sub_addr_cont_start, def_elt_end);
   gedcom_subscribe_to_element(ELT_SUB_ADDR_ADR1,