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
Change mandatory but empty values to "-".
[gedcom-parse.git]
/
gom
/
source_description.c
diff --git
a/gom/source_description.c
b/gom/source_description.c
index b03e3973541501fe176a7f0c9ee12644e6ad5f2e..71bd9e816db3a73c3357748ce8eb520f3345d2ca 100644
(file)
--- a/
gom/source_description.c
+++ b/
gom/source_description.c
@@
-38,12
+38,8
@@
Gedcom_ctxt sub_sour_caln_start(_ELT_PARAMS_)
if (! ctxt)
NO_CONTEXT;
else {
if (! ctxt)
NO_CONTEXT;
else {
- struct source_description *desc
- = (struct source_description *)malloc(sizeof(struct source_description));
- if (! desc)
- MEMORY_ERROR;
- else {
- memset (desc, 0, sizeof(struct source_description));
+ struct source_description *desc = SUB_MAKEFUNC(source_description)();
+ if (desc) {
desc->call_number = strdup(GEDCOM_STRING(parsed_value));
if (! desc->call_number) {
desc->call_number = strdup(GEDCOM_STRING(parsed_value));
if (! desc->call_number) {
@@
-53,7
+49,7
@@
Gedcom_ctxt sub_sour_caln_start(_ELT_PARAMS_)
else {
switch (ctxt->ctxt_type) {
case ELT_SUB_REPO:
else {
switch (ctxt->ctxt_type) {
case ELT_SUB_REPO:
-
source_add_description
(ctxt, desc); break;
+
ADDFUNC2(source,source_description)
(ctxt, desc); break;
default:
UNEXPECTED_CONTEXT(ctxt->ctxt_type);
}
default:
UNEXPECTED_CONTEXT(ctxt->ctxt_type);
}
@@
-65,7
+61,11
@@
Gedcom_ctxt sub_sour_caln_start(_ELT_PARAMS_)
return (Gedcom_ctxt)result;
}
return (Gedcom_ctxt)result;
}
-STRING_CB(source_description, sub_sour_caln_medi_start, media)
+DEFINE_SUB_MAKEFUNC(source_description)
+
+DEFINE_STRING_CB(source_description, sub_sour_caln_medi_start, media)
+
+DEFINE_ADDFUNC2(source_description, user_data, extra)
void source_description_subscribe()
{
void source_description_subscribe()
{
@@
-75,19
+75,22
@@
void source_description_subscribe()
sub_sour_caln_medi_start, def_elt_end);
}
sub_sour_caln_medi_start, def_elt_end);
}
-void
source_description_add_user_data(Gom_ctxt ctxt, struct user_data* data
)
+void
UNREFALLFUNC(source_description)(struct source_description* obj
)
{
{
- struct source_description *obj = SAFE_CTXT_CAST(source_description, ctxt);
- if (obj)
- LINK_CHAIN_ELT(user_data, obj->extra, data);
+ if (obj) {
+ struct source_description* runner;
+ for (runner = obj; runner; runner = runner->next) {
+ UNREFALLFUNC(user_data)(runner->extra);
+ }
+ }
}
}
-void
source_description_cleanup
(struct source_description* desc)
+void
CLEANFUNC(source_description)
(struct source_description* desc)
{
if (desc) {
SAFE_FREE(desc->call_number);
SAFE_FREE(desc->media);
{
if (desc) {
SAFE_FREE(desc->call_number);
SAFE_FREE(desc->media);
- DESTROY_CHAIN_ELTS(user_data, desc->extra
, user_data_cleanup
);
+ DESTROY_CHAIN_ELTS(user_data, desc->extra);
}
}
}
}