Index: vendor.c =================================================================== --- vendor.c (revision 30954) +++ vendor.c (revision 30955) @@ -168,7 +168,7 @@ /* load the resource file */ doc = pcb_hid_cfg_load_lht(&PCB->hidlib, fname); if (doc == NULL) { - rnd_message(PCB_MSG_ERROR, "Could not load vendor resource file \"%s\"\n", fname); + rnd_message(RND_MSG_ERROR, "Could not load vendor resource file \"%s\"\n", fname); RND_ACT_IRES(1); return 0; } @@ -191,7 +191,7 @@ sf = PCB_MM_TO_COORD(1); } else { - rnd_message(PCB_MSG_ERROR, "\"%s\" is not a supported units. Defaulting to inch\n", sval); + rnd_message(RND_MSG_ERROR, "\"%s\" is not a supported units. Defaulting to inch\n", sval); sf = PCB_INCH_TO_COORD(1); } @@ -206,7 +206,7 @@ rounding_method = CLOSEST; } else { - rnd_message(PCB_MSG_ERROR, "\"%s\" is not a valid rounding type. Defaulting to up\n", sval); + rnd_message(RND_MSG_ERROR, "\"%s\" is not a valid rounding type. Defaulting to up\n", sval); rounding_method = ROUND_UP; } } @@ -226,49 +226,49 @@ } } else - rnd_message(PCB_MSG_ERROR, "Broken drillmap: /drillmap should be a list\n"); + rnd_message(RND_MSG_ERROR, "Broken drillmap: /drillmap should be a list\n"); } else - rnd_message(PCB_MSG_ERROR, "No drillmap resource found\n"); + rnd_message(RND_MSG_ERROR, "No drillmap resource found\n"); sval = pcb_hid_cfg_text_value(doc, "/drc/copper_space"); if (sval != NULL) { load_meta_coord("design/bloat", floor(sf * atof(sval) + 0.5)); - rnd_message(PCB_MSG_INFO, "Set DRC minimum copper spacing to %ml mils\n", conf_core.design.bloat); + rnd_message(RND_MSG_INFO, "Set DRC minimum copper spacing to %ml mils\n", conf_core.design.bloat); } sval = pcb_hid_cfg_text_value(doc, "/drc/copper_overlap"); if (sval != NULL) { load_meta_coord("design/shrink", floor(sf * atof(sval) + 0.5)); - rnd_message(PCB_MSG_INFO, "Set DRC minimum copper overlap to %ml mils\n", conf_core.design.shrink); + rnd_message(RND_MSG_INFO, "Set DRC minimum copper overlap to %ml mils\n", conf_core.design.shrink); } sval = pcb_hid_cfg_text_value(doc, "/drc/copper_width"); if (sval != NULL) { load_meta_coord("design/min_wid", floor(sf * atof(sval) + 0.5)); - rnd_message(PCB_MSG_INFO, "Set DRC minimum copper spacing to %ml mils\n", conf_core.design.min_wid); + rnd_message(RND_MSG_INFO, "Set DRC minimum copper spacing to %ml mils\n", conf_core.design.min_wid); } sval = pcb_hid_cfg_text_value(doc, "/drc/silk_width"); if (sval != NULL) { load_meta_coord("design/min_slk", floor(sf * atof(sval) + 0.5)); - rnd_message(PCB_MSG_INFO, "Set DRC minimum silk width to %ml mils\n", conf_core.design.min_slk); + rnd_message(RND_MSG_INFO, "Set DRC minimum silk width to %ml mils\n", conf_core.design.min_slk); } sval = pcb_hid_cfg_text_value(doc, "/drc/min_drill"); if (sval != NULL) { load_meta_coord("design/min_drill", floor(sf * atof(sval) + 0.5)); - rnd_message(PCB_MSG_INFO, "Set DRC minimum drill diameter to %ml mils\n", conf_core.design.min_drill); + rnd_message(RND_MSG_INFO, "Set DRC minimum drill diameter to %ml mils\n", conf_core.design.min_drill); } sval = pcb_hid_cfg_text_value(doc, "/drc/min_ring"); if (sval != NULL) { load_meta_coord("design/min_ring", floor(sf * atof(sval) + 0.5)); - rnd_message(PCB_MSG_INFO, "Set DRC minimum annular ring to %ml mils\n", conf_core.design.min_ring); + rnd_message(RND_MSG_INFO, "Set DRC minimum annular ring to %ml mils\n", conf_core.design.min_ring); } - rnd_message(PCB_MSG_INFO, "Loaded %d vendor drills from %s\n", n_vendor_drills, fname); - rnd_message(PCB_MSG_INFO, "Loaded %d RefDes skips, %d Value skips, %d Descr skips\n", n_refdes, n_value, n_descr); + rnd_message(RND_MSG_INFO, "Loaded %d vendor drills from %s\n", n_vendor_drills, fname); + rnd_message(RND_MSG_INFO, "Loaded %d RefDes skips, %d Value skips, %d Descr skips\n", n_refdes, n_value, n_descr); rnd_conf_set(RND_CFR_DESIGN, "plugins/vendor/enable", -1, "0", RND_POL_OVERWRITE); @@ -295,7 +295,7 @@ if (pcb_chg_obj_2nd_size(PCB_OBJ_PSTK, pstk, pstk, pstk, target, pcb_true, pcb_false)) res = 1; else { - rnd_message(PCB_MSG_WARNING, + rnd_message(RND_MSG_WARNING, "Padstack at %ml, %ml not changed. Possible reasons:\n" "\t- pad size too small\n" "\t- new size would be too large or too small\n", pstk->x, pstk->y); @@ -340,13 +340,13 @@ } PCB_END_LOOP; - rnd_message(PCB_MSG_INFO, "Updated %ld drill sizes out of %ld total\n", (long)changed, (long)tot); + rnd_message(RND_MSG_INFO, "Updated %ld drill sizes out of %ld total\n", (long)changed, (long)tot); /* Update the current Via */ if (conf_core.design.via_drilling_hole != vendorDrillMap(conf_core.design.via_drilling_hole)) { changed++; rnd_conf_setf(RND_CFR_DESIGN, "design/via_drilling_hole", -1, "%$mm", vendorDrillMap(conf_core.design.via_drilling_hole)); - rnd_message(PCB_MSG_INFO, "Adjusted active via hole size to be %ml mils\n", conf_core.design.via_drilling_hole); + rnd_message(RND_MSG_INFO, "Adjusted active via hole size to be %ml mils\n", conf_core.design.via_drilling_hole); } /* and update the vias for the various routing styles */ @@ -354,12 +354,12 @@ if (PCB->RouteStyle.array[i].Hole != vendorDrillMap(PCB->RouteStyle.array[i].Hole)) { changed++; PCB->RouteStyle.array[i].Hole = vendorDrillMap(PCB->RouteStyle.array[i].Hole); - rnd_message(PCB_MSG_INFO, + rnd_message(RND_MSG_INFO, "Adjusted %s routing style hole size to be %ml mils\n", PCB->RouteStyle.array[i].name, PCB->RouteStyle.array[i].Hole); if (PCB->RouteStyle.array[i].Diameter < PCB->RouteStyle.array[i].Hole + PCB_MIN_PINORVIACOPPER) { PCB->RouteStyle.array[i].Diameter = PCB->RouteStyle.array[i].Hole + PCB_MIN_PINORVIACOPPER; - rnd_message(PCB_MSG_INFO, + rnd_message(RND_MSG_INFO, "Increased %s routing style via diameter to %ml mils\n", PCB->RouteStyle.array[i].name, PCB->RouteStyle.array[i].Diameter); } @@ -405,7 +405,7 @@ /* are we larger than the largest drill? */ if (in > vendor_drills[n_vendor_drills - 1]) { - rnd_message(PCB_MSG_ERROR, "Vendor drill list does not contain a drill >= %ml mil\n" + rnd_message(RND_MSG_ERROR, "Vendor drill list does not contain a drill >= %ml mil\n" "Using %ml mil instead.\n", in, vendor_drills[n_vendor_drills - 1]); cached_map = vendor_drills[n_vendor_drills - 1]; return vendor_drills[n_vendor_drills - 1]; @@ -544,7 +544,7 @@ for (i = 0; i < n_refdes; i++) { if ((PCB_NSTRCMP(PCB_UNKNOWN(subc->refdes), ignore_refdes[i]) == 0) || rematch(ignore_refdes[i], PCB_UNKNOWN(subc->refdes))) { - rnd_message(PCB_MSG_INFO, "Vendor mapping skipped because refdes = %s matches %s\n", PCB_UNKNOWN(subc->refdes), ignore_refdes[i]); + rnd_message(RND_MSG_INFO, "Vendor mapping skipped because refdes = %s matches %s\n", PCB_UNKNOWN(subc->refdes), ignore_refdes[i]); noskip = 0; } } @@ -553,7 +553,7 @@ for (i = 0; i < n_value; i++) { if ((PCB_NSTRCMP(PCB_UNKNOWN(vl), ignore_value[i]) == 0) || rematch(ignore_value[i], PCB_UNKNOWN(vl))) { - rnd_message(PCB_MSG_INFO, "Vendor mapping skipped because value = %s matches %s\n", PCB_UNKNOWN(vl), ignore_value[i]); + rnd_message(RND_MSG_INFO, "Vendor mapping skipped because value = %s matches %s\n", PCB_UNKNOWN(vl), ignore_value[i]); noskip = 0; } } @@ -564,7 +564,7 @@ for (i = 0; i < n_descr; i++) { if ((PCB_NSTRCMP(PCB_UNKNOWN(fp), ignore_descr[i]) == 0) || rematch(ignore_descr[i], PCB_UNKNOWN(fp))) { - rnd_message(PCB_MSG_INFO, + rnd_message(RND_MSG_INFO, "Vendor mapping skipped because descr = %s matches %s\n", PCB_UNKNOWN(fp), ignore_descr[i]); noskip = 0; @@ -573,7 +573,7 @@ } if (noskip && PCB_FLAG_TEST(PCB_FLAG_LOCK, subc)) { - rnd_message(PCB_MSG_INFO, "Vendor mapping skipped because element %s is locked\n", PCB_UNKNOWN(subc->refdes)); + rnd_message(RND_MSG_INFO, "Vendor mapping skipped because element %s is locked\n", PCB_UNKNOWN(subc->refdes)); noskip = 0; } @@ -591,7 +591,7 @@ /* compile the regular expression */ regex = re_sei_comp(re); if (re_sei_errno(regex) != 0) { - rnd_message(PCB_MSG_ERROR, "regexp error: %s\n", re_error_str(re_sei_errno(regex))); + rnd_message(RND_MSG_ERROR, "regexp error: %s\n", re_error_str(re_sei_errno(regex))); re_sei_free(regex); return pcb_false; }