- struct place *place = NULL;
-
- if (ctxt) {
- place = (struct place *)malloc(sizeof(struct place));
- memset (place, 0, sizeof(struct place));
- place->value = strdup(GEDCOM_STRING(parsed_value));
-
- switch (ctxt->ctxt_type) {
- 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_place(ctxt, place); break;
- default:
- UNEXPECTED_CONTEXT(ctxt->ctxt_type);
+ Gom_ctxt result = NULL;
+
+ if (! ctxt)
+ NO_CONTEXT;
+ else {
+ struct place *place = (struct place *)malloc(sizeof(struct place));
+ if (! place)
+ MEMORY_ERROR;
+ else {
+ memset (place, 0, sizeof(struct place));
+ place->value = strdup(GEDCOM_STRING(parsed_value));
+
+ if (!place->value) {
+ MEMORY_ERROR;
+ free(place);
+ }
+ else {
+ switch (ctxt->ctxt_type) {
+ 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_place(ctxt, place); break;
+ default:
+ UNEXPECTED_CONTEXT(ctxt->ctxt_type);
+ }
+ result = MAKE_GOM_CTXT(elt, place, place);
+ }