dlugolecki.net.pl
Dziennik
Polecane
Software
projects
/
gedcom-parse.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Moved encoding state to separate source file.
[gedcom-parse.git]
/
gom
/
note_sub.c
diff --git
a/gom/note_sub.c
b/gom/note_sub.c
index 63ef644150a4348dacc569cfbb20d502da1a11bb..2ff76db751e6eca2b62c999a446037e6e877d837 100644
(file)
--- a/
gom/note_sub.c
+++ b/
gom/note_sub.c
@@
-52,17
+52,14
@@
Gedcom_ctxt sub_note_start(_ELT_PARAMS_)
if (! ctxt)
NO_CONTEXT;
else {
if (! ctxt)
NO_CONTEXT;
else {
- struct note_sub *note = (struct note_sub *)malloc(sizeof(struct note_sub));
- if (! note)
- MEMORY_ERROR;
- else {
- memset (note, 0, sizeof(struct note_sub));
+ struct note_sub *note = SUB_MAKEFUNC(note_sub)();
+ if (note) {
if (GEDCOM_IS_XREF_PTR(parsed_value))
note->reference = GEDCOM_XREF_PTR(parsed_value);
switch (ctxt->ctxt_type) {
case ELT_SUB_PLAC:
if (GEDCOM_IS_XREF_PTR(parsed_value))
note->reference = GEDCOM_XREF_PTR(parsed_value);
switch (ctxt->ctxt_type) {
case ELT_SUB_PLAC:
-
place_add_note
(ctxt, note); break;
+
ADDFUNC2(place,note_sub)
(ctxt, note); break;
case ELT_SUB_FAM_EVT:
case ELT_SUB_FAM_EVT_EVEN:
case ELT_SUB_INDIV_ATTR:
case ELT_SUB_FAM_EVT:
case ELT_SUB_FAM_EVT_EVEN:
case ELT_SUB_INDIV_ATTR:
@@
-71,38
+68,38
@@
Gedcom_ctxt sub_note_start(_ELT_PARAMS_)
case ELT_SUB_INDIV_GEN:
case ELT_SUB_INDIV_ADOP:
case ELT_SUB_INDIV_EVEN:
case ELT_SUB_INDIV_GEN:
case ELT_SUB_INDIV_ADOP:
case ELT_SUB_INDIV_EVEN:
-
event_add_note
(ctxt, note); break;
+
ADDFUNC2(event,note_sub)
(ctxt, note); break;
case ELT_SUB_SOUR:
case ELT_SUB_SOUR:
-
citation_add_note
(ctxt, note); break;
+
ADDFUNC2(source_citation,note_sub)
(ctxt, note); break;
case ELT_SUB_MULTIM_OBJE:
case ELT_SUB_MULTIM_OBJE:
-
multimedia_link_add_note
(ctxt, note); break;
+
ADDFUNC2(multimedia_link,note_sub)
(ctxt, note); break;
case ELT_SUB_LSS_SLGS:
case ELT_SUB_LIO_BAPL:
case ELT_SUB_LIO_SLGC:
case ELT_SUB_LSS_SLGS:
case ELT_SUB_LIO_BAPL:
case ELT_SUB_LIO_SLGC:
-
lds_event_add_note
(ctxt, note); break;
+
ADDFUNC2(lds_event,note_sub)
(ctxt, note); break;
case REC_FAM:
case REC_FAM:
-
family_add_note
(ctxt, note); break;
+
ADDFUNC2(family,note_sub)
(ctxt, note); break;
case ELT_SUB_CHAN:
case ELT_SUB_CHAN:
-
change_date_add_note
(ctxt, note); break;
+
ADDFUNC2(change_date,note_sub)
(ctxt, note); break;
case ELT_SUB_PERS_NAME:
case ELT_SUB_PERS_NAME:
-
name_add_note
(ctxt, note); break;
+
ADDFUNC2(personal_name,note_sub)
(ctxt, note); break;
case ELT_SUB_FAMC:
case ELT_SUB_FAMS:
case ELT_SUB_FAMC:
case ELT_SUB_FAMS:
-
family_link_add_note
(ctxt, note); break;
+
ADDFUNC2(family_link,note_sub)
(ctxt, note); break;
case ELT_SUB_ASSO:
case ELT_SUB_ASSO:
-
association_add_note
(ctxt, note); break;
+
ADDFUNC2(association,note_sub)
(ctxt, note); break;
case REC_INDI:
case REC_INDI:
-
individual_add_note
(ctxt, note); break;
+
ADDFUNC2(individual,note_sub)
(ctxt, note); break;
case REC_OBJE:
case REC_OBJE:
-
multimedia_add_note
(ctxt, note); break;
+
ADDFUNC2(multimedia,note_sub)
(ctxt, note); break;
case REC_REPO:
case REC_REPO:
-
repository_add_note
(ctxt, note); break;
+
ADDFUNC2(repository,note_sub)
(ctxt, note); break;
case ELT_SOUR_DATA:
source_add_note_to_data(ctxt, note); break;
case ELT_SUB_REPO:
source_add_note_to_repo(ctxt, note); break;
case REC_SOUR:
case ELT_SOUR_DATA:
source_add_note_to_data(ctxt, note); break;
case ELT_SUB_REPO:
source_add_note_to_repo(ctxt, note); break;
case REC_SOUR:
-
source_add_note
(ctxt, note); break;
+
ADDFUNC2(source,note_sub)
(ctxt, note); break;
default:
UNEXPECTED_CONTEXT(ctxt->ctxt_type);
}
default:
UNEXPECTED_CONTEXT(ctxt->ctxt_type);
}
@@
-113,33
+110,36
@@
Gedcom_ctxt sub_note_start(_ELT_PARAMS_)
return (Gedcom_ctxt)result;
}
return (Gedcom_ctxt)result;
}
-STRING_END_CB(note_sub, sub_note_end, text)
+DEFINE_SUB_MAKEFUNC(note_sub)
+
+DEFINE_STRING_END_CB(note_sub, sub_note_end, text)
+
+DEFINE_ADDFUNC2(note_sub, source_citation, citation)
+DEFINE_ADDFUNC2(note_sub, user_data, extra)
void note_sub_subscribe()
{
gedcom_subscribe_to_element(ELT_SUB_NOTE, sub_note_start, sub_note_end);
}
void note_sub_subscribe()
{
gedcom_subscribe_to_element(ELT_SUB_NOTE, sub_note_start, sub_note_end);
}
-void note_sub_add_citation(Gom_ctxt ctxt, struct source_citation* cit)
-{
- struct note_sub *note = SAFE_CTXT_CAST(note_sub, ctxt);
- if (note)
- LINK_CHAIN_ELT(source_citation, note->citation, cit);
-}
-
-void note_sub_add_user_data(Gom_ctxt ctxt, struct user_data* data)
+void UNREFALLFUNC(note_sub)(struct note_sub* obj)
{
{
- struct note_sub *obj = SAFE_CTXT_CAST(note_sub, ctxt);
- if (obj)
- LINK_CHAIN_ELT(user_data, obj->extra, data);;
+ if (obj) {
+ struct note_sub* runner;
+ for (runner = obj; runner; runner = runner->next) {
+ unref_xref_value(runner->reference);
+ UNREFALLFUNC(source_citation)(runner->citation);
+ UNREFALLFUNC(user_data)(runner->extra);
+ }
+ }
}
}
-void
note_sub_cleanup
(struct note_sub* note)
+void
CLEANFUNC(note_sub)
(struct note_sub* note)
{
if (note) {
SAFE_FREE(note->text);
{
if (note) {
SAFE_FREE(note->text);
- DESTROY_CHAIN_ELTS(source_citation, note->citation
, citation_cleanup
);
- DESTROY_CHAIN_ELTS(user_data, note->extra
, user_data_cleanup
);
+ DESTROY_CHAIN_ELTS(source_citation, note->citation);
+ DESTROY_CHAIN_ELTS(user_data, note->extra);
}
}
}
}