Changeset View
Changeset View
Standalone View
Standalone View
cddl/contrib/opensolaris/tools/ctf/cvt/ctfmerge.c
| Show First 20 Lines • Show All 966 Lines • ▼ Show 20 Lines | if (uniqfile != NULL || withfile != NULL) { | ||||
| if (read_ctf(&reffile, 1, reflabel, read_ctf_save_cb, | if (read_ctf(&reffile, 1, reflabel, read_ctf_save_cb, | ||||
| &reftd, require_ctf) == 0) { | &reftd, require_ctf) == 0) { | ||||
| terminate("No CTF data found in reference file %s\n", | terminate("No CTF data found in reference file %s\n", | ||||
| reffile); | reffile); | ||||
| } | } | ||||
| savetd = tdata_new(); | savetd = tdata_new(); | ||||
| if (CTF_TYPE_ISCHILD(reftd->td_nextid)) | if (CTF_V3_TYPE_ISCHILD(reftd->td_nextid)) | ||||
| terminate("No room for additional types in master\n"); | terminate("No room for additional types in master\n"); | ||||
| savetd->td_nextid = withfile ? reftd->td_nextid : | savetd->td_nextid = withfile ? reftd->td_nextid : | ||||
| CTF_INDEX_TO_TYPE(1, TRUE); | CTF_V3_INDEX_TO_TYPE(1, TRUE); | ||||
| merge_into_master(mstrtd, reftd, savetd, 0); | merge_into_master(mstrtd, reftd, savetd, 0); | ||||
| tdata_label_add(savetd, label, CTF_LABEL_LASTIDX); | tdata_label_add(savetd, label, CTF_LABEL_LASTIDX); | ||||
| if (withfile) { | if (withfile) { | ||||
| /* | /* | ||||
| * savetd holds the new data to be added to the withfile | * savetd holds the new data to be added to the withfile | ||||
| */ | */ | ||||
| Show All 38 Lines | |||||