Index: write.c =================================================================== --- write.c (revision 32114) +++ write.c (revision 32115) @@ -68,7 +68,7 @@ TODO(": need a subc dedup") /* elementlist_dedup_skip(ededup, element);*/ - fprintf(FP, "%s\n", unm_name(&group1, or_empty(rnd_attribute_get(&subc->Attributes, "footprint")), subc)); + fprintf(FP, "%s\n", unm_name(&group1, or_empty(pcb_attribute_get(&subc->Attributes, "footprint")), subc)); } unm_uninit(&group1); @@ -414,9 +414,9 @@ TODO(": do not hardwire coords") TODO(": figure how to turn off displaying these") - fprintf(FP, "T0 0 -4000 600 600 0 120 N V %d N \"%s\"\n", silkLayer, or_empty(rnd_attribute_get(&subc->Attributes, "refdes"))); - fprintf(FP, "T1 0 -5000 600 600 0 120 N V %d N \"%s\"\n", silkLayer, or_empty(rnd_attribute_get(&subc->Attributes, "value"))); - fprintf(FP, "T2 0 -6000 600 600 0 120 N V %d N \"%s\"\n", silkLayer, or_empty(rnd_attribute_get(&subc->Attributes, "footprint"))); + fprintf(FP, "T0 0 -4000 600 600 0 120 N V %d N \"%s\"\n", silkLayer, or_empty(pcb_attribute_get(&subc->Attributes, "refdes"))); + fprintf(FP, "T1 0 -5000 600 600 0 120 N V %d N \"%s\"\n", silkLayer, or_empty(pcb_attribute_get(&subc->Attributes, "value"))); + fprintf(FP, "T2 0 -6000 600 600 0 120 N V %d N \"%s\"\n", silkLayer, or_empty(pcb_attribute_get(&subc->Attributes, "footprint"))); /* export padstacks */ padstacklist_foreach(&subc->data->padstack, &it, ps) { @@ -621,7 +621,7 @@ unm_init(&group1); subclist_foreach(&Data->subc, &sit, subc) { - const char *uname = unm_name(&group1, or_empty(rnd_attribute_get(&subc->Attributes, "footprint")), subc); + const char *uname = unm_name(&group1, or_empty(pcb_attribute_get(&subc->Attributes, "footprint")), subc); TODO(": what did we need this for?") /* elementlist_dedup_skip(ededup, element); skip duplicate elements */ io_kicad_legacy_write_subc(FP, PCB, subc, xOffset, yOffset, uname); @@ -705,7 +705,7 @@ unm_init(&group1); for(n = 0; n < subcs->used; n++) { pcb_subc_t *subc = subcs->array[n]; - const char *uname = unm_name(&group1, or_empty(rnd_attribute_get(&subc->Attributes, "footprint")), subc); + const char *uname = unm_name(&group1, or_empty(pcb_attribute_get(&subc->Attributes, "footprint")), subc); io_kicad_legacy_write_subc(f, PCB, subc, 0, 0, uname); } unm_uninit(&group1);