From: Peter Verthez Date: Sat, 21 Dec 2002 15:40:22 +0000 (+0000) Subject: Removed dup_date and dup_age. X-Git-Url: https://git.dlugolecki.net.pl/?a=commitdiff_plain;h=39bb8d4c3317074cfa3e8e92cc12e6160675e246;p=gedcom-parse.git Removed dup_date and dup_age. --- diff --git a/gom/event.c b/gom/event.c index d61f6c8..7d5f92e 100644 --- a/gom/event.c +++ b/gom/event.c @@ -154,14 +154,14 @@ Gedcom_ctxt sub_fam_evt_age_start(_ELT_PARAMS_) struct age_value age = GEDCOM_AGE(parsed_value); switch (ctxt->ctxt_type) { case ELT_SUB_FAM_EVT_HUSB: - evt->husband_age = dup_age(age); + evt->husband_age = gedcom_new_age_value(&age); if (! evt->husband_age) { MEMORY_ERROR; err = 1; } break; case ELT_SUB_FAM_EVT_WIFE: - evt->wife_age = dup_age(age); + evt->wife_age = gedcom_new_age_value(&age); if (! evt->wife_age) { MEMORY_ERROR; err = 1; diff --git a/gom/gom.c b/gom/gom.c index a817778..302fc06 100644 --- a/gom/gom.c +++ b/gom/gom.c @@ -242,27 +242,3 @@ void set_xref_type(struct xref_value* xr, const char *str) else xr->type = XREF_ANY; } - -struct date_value* dup_date(struct date_value dv) -{ - struct date_value* dv_ptr; - dv_ptr = (struct date_value*) malloc(sizeof(struct date_value)); - if (! dv_ptr) - MEMORY_ERROR; - else { - memcpy(dv_ptr, &dv, sizeof(struct date_value)); - } - return dv_ptr; -} - -struct age_value* dup_age(struct age_value age) -{ - struct age_value* age_ptr; - age_ptr = (struct age_value*) malloc(sizeof(struct age_value)); - if (! age_ptr) - MEMORY_ERROR; - else { - memcpy(age_ptr, &age, sizeof(struct age_value)); - } - return age_ptr; -} diff --git a/gom/gom_internal.h b/gom/gom_internal.h index 01dde5c..46c42a1 100644 --- a/gom/gom_internal.h +++ b/gom/gom_internal.h @@ -109,9 +109,6 @@ void def_elt_end(Gedcom_elt elt, Gedcom_ctxt parent, Gedcom_ctxt self, Gedcom_val parsed_value); void set_xref_type(struct xref_value *xr, const char* str); -struct date_value* dup_date(struct date_value dv); -struct age_value* dup_age(struct age_value age); - /* Doubly-linked list, but last rec->next is NULL (doesn't go to first rec) */ #define LINK_CHAIN_ELT(STRUCTTYPE, FIRSTVAL, VAL) \ { \ @@ -267,7 +264,7 @@ void NULL_DESTROY(void* anything); = SAFE_CTXT_CAST(STRUCTTYPE, (Gom_ctxt)parent); \ if (obj) { \ struct date_value dv = GEDCOM_DATE(parsed_value); \ - obj->FIELD = dup_date(dv); \ + obj->FIELD = gedcom_new_date_value(&dv); \ if (! obj->FIELD) \ MEMORY_ERROR; \ else \ @@ -288,7 +285,7 @@ void NULL_DESTROY(void* anything); = SAFE_CTXT_CAST(STRUCTTYPE, (Gom_ctxt)parent); \ if (obj) { \ struct age_value age = GEDCOM_AGE(parsed_value); \ - obj->FIELD = dup_age(age); \ + obj->FIELD = gedcom_new_age_value(&age); \ if (! obj->FIELD) \ MEMORY_ERROR; \ else \