Index: footprint.c =================================================================== --- footprint.c (revision 30902) +++ footprint.c (revision 30903) @@ -51,9 +51,9 @@ #include "../src_plugins/lib_compat_help/subc_help.h" #include "../src_plugins/lib_compat_help/pstk_help.h" -static void print_sqpad_coords(FILE *f, pcb_any_line_t *Pad, pcb_coord_t cx, pcb_coord_t cy) +static void print_sqpad_coords(FILE *f, pcb_any_line_t *Pad, rnd_coord_t cx, rnd_coord_t cy) { - pcb_coord_t x[4], y[4]; + rnd_coord_t x[4], y[4]; pcb_sqline_to_rect((pcb_line_t *)Pad, x, y); pcb_fprintf(f, " %.9mm %.9mm", x[0] - cx, y[0] - cy); @@ -109,7 +109,7 @@ else if (lyt & PCB_LYT_PASTE) ltyp = "paste"; \ else { invalid; } -int tedax_pstk_fsave(pcb_pstk_t *padstack, pcb_coord_t ox, pcb_coord_t oy, FILE *f) +int tedax_pstk_fsave(pcb_pstk_t *padstack, rnd_coord_t ox, rnd_coord_t oy, FILE *f) { pcb_pstk_proto_t *proto = pcb_pstk_get_proto(padstack); pcb_pstk_tshape_t *tshp; @@ -117,7 +117,7 @@ int n, i; if (proto == NULL) { - pcb_message(PCB_MSG_ERROR, "tEDAx footprint export: omitting subc padstack with invalid prototype\n"); + rnd_message(PCB_MSG_ERROR, "tEDAx footprint export: omitting subc padstack with invalid prototype\n"); return 1; } if (proto->hdia > 0) @@ -126,7 +126,7 @@ tshp = pcb_pstk_get_tshape(padstack); for(n = 0, shp = tshp->shape; n < tshp->len; n++,shp++) { const char *lloc, *ltyp; - pcb_coord_t clr; + rnd_coord_t clr; get_layer_props(shp->layer_mask, lloc, ltyp, continue); clr = padstack->Clearance > 0 ? padstack->Clearance : shp->clearance; @@ -175,7 +175,7 @@ { htsp_t terms; htsp_entry_t *e; - pcb_coord_t ox = 0, oy = 0; + rnd_coord_t ox = 0, oy = 0; int l; htsp_init(&terms, strhash, strkeyeq); @@ -220,12 +220,12 @@ { int go; long numpt = 0; - pcb_coord_t x, y; + rnd_coord_t x, y; pcb_poly_it_t it; pcb_poly_iterate_polyarea(polygon->Clipped, &it); if (pcb_poly_contour(&it) == NULL) { - pcb_message(PCB_MSG_ERROR, "tEDAx footprint export: omitting subc polygon with no clipped contour\n"); + rnd_message(PCB_MSG_ERROR, "tEDAx footprint export: omitting subc polygon with no clipped contour\n"); continue; } @@ -234,10 +234,10 @@ numpt++; if (pcb_poly_hole_first(&it) != NULL) - pcb_message(PCB_MSG_ERROR, "tEDAx footprint export: omitting subc polygon holes\n"); + rnd_message(PCB_MSG_ERROR, "tEDAx footprint export: omitting subc polygon holes\n"); if (numpt == 0) { - pcb_message(PCB_MSG_ERROR, "tEDAx footprint export: omitting subc polygon with no points\n"); + rnd_message(PCB_MSG_ERROR, "tEDAx footprint export: omitting subc polygon with no points\n"); continue; } @@ -316,7 +316,7 @@ f = pcb_fopen_askovr(&PCB->hidlib, fn, "w", NULL); if (f == NULL) { - pcb_message(PCB_MSG_ERROR, "tedax_fp_save(): can't open %s for writing\n", fn); + rnd_message(PCB_MSG_ERROR, "tedax_fp_save(): can't open %s for writing\n", fn); return -1; } res = tedax_fp_fsave(data, f, subc_idx); @@ -357,7 +357,7 @@ char *end; \ dst = strtol(src, &end, 10); \ if (*end != '\0') { \ - pcb_message(PCB_MSG_ERROR, msg, src); \ + rnd_message(PCB_MSG_ERROR, msg, src); \ return -1; \ } \ } while(0) @@ -367,7 +367,7 @@ char *end; \ dst = strtod(src, &end); \ if (*end != '\0') { \ - pcb_message(PCB_MSG_ERROR, msg, src); \ + rnd_message(PCB_MSG_ERROR, msg, src); \ return -1; \ } \ } while(0) @@ -374,10 +374,10 @@ #define load_val(dst, src, msg) \ do { \ - pcb_bool succ; \ + rnd_bool succ; \ dst = pcb_get_value_ex(src, NULL, NULL, NULL, "mm", &succ); \ if (!succ) { \ - pcb_message(PCB_MSG_ERROR, msg, src); \ + rnd_message(PCB_MSG_ERROR, msg, src); \ return -1; \ } \ } while(0) @@ -390,7 +390,7 @@ load_int(termid, src, msg); \ term = htip_get(&terms, termid); \ if (term == NULL) { \ - pcb_message(PCB_MSG_ERROR, "undefined terminal %s - skipping footprint\n", src); \ + rnd_message(PCB_MSG_ERROR, "undefined terminal %s - skipping footprint\n", src); \ return -1; \ } \ pcb_attribute_put(&obj->Attributes, "term", term->name); \ @@ -404,13 +404,13 @@ else if (strcmp(src, "primary") == 0) \ dst = 0; \ else { \ - pcb_message(PCB_MSG_ERROR, msg, lloc); \ + rnd_message(PCB_MSG_ERROR, msg, lloc); \ return -1; \ } \ } while(0) -static int load_poly(pcb_coord_t *px, pcb_coord_t *py, int maxpt, int argc, char *argv[]) +static int load_poly(rnd_coord_t *px, rnd_coord_t *py, int maxpt, int argc, char *argv[]) { int max, n; load_int(max, argv[0], "invalid number of points '%s' in poly, skipping footprint\n"); @@ -417,7 +417,7 @@ argc--; argv++; if (max*2 != argc) { - pcb_message(PCB_MSG_ERROR, "invalid number of polygon points: expected %d coords got %d skipping footprint\n", max*2, argc); + rnd_message(PCB_MSG_ERROR, "invalid number of polygon points: expected %d coords got %d skipping footprint\n", max*2, argc); return -1; } for(n = 0; n < max; n++) { @@ -442,7 +442,7 @@ else if (strcmp(ltyp, "mask") == 0) lyt |= PCB_LYT_MASK; else if (strcmp(ltyp, "paste") == 0) lyt |= PCB_LYT_PASTE; else { - pcb_message(PCB_MSG_ERROR, "tEDAx footprint load: invalid layer type %s\n", ltyp); + rnd_message(PCB_MSG_ERROR, "tEDAx footprint load: invalid layer type %s\n", ltyp); return NULL; } @@ -462,7 +462,7 @@ else if (strcmp(lloc, "secondary") == 0) lyt |= PCB_LYT_BOTTOM; else if (strcmp(lloc, "inner") == 0) lyt |= PCB_LYT_INTERN; else { - pcb_message(PCB_MSG_ERROR, "tEDAx footprint load: invalid layer location %s\n", lloc); + rnd_message(PCB_MSG_ERROR, "tEDAx footprint load: invalid layer location %s\n", lloc); return NULL; } @@ -478,7 +478,7 @@ htip_entry_t *ei; htip_t terms; term_t *term; - pcb_coord_t px[256], py[256], clr; + rnd_coord_t px[256], py[256], clr; pcb_layer_t **ly; htip_init(&terms, longhash, longkeyeq); @@ -495,7 +495,7 @@ numpt = load_poly(px, py, (sizeof(px) / sizeof(px[0])), argc-5, argv+5); if (numpt < 0) { - pcb_message(PCB_MSG_ERROR, "tEDAx footprint load: failed to load polygon\n"); + rnd_message(PCB_MSG_ERROR, "tEDAx footprint load: failed to load polygon\n"); return -1; } load_val(clr, argv[4], "invalid clearance"); @@ -504,7 +504,7 @@ int n; p = pcb_poly_new(*ly, clr, pcb_no_flags()); if (p == NULL) { - pcb_message(PCB_MSG_ERROR, "tEDAx footprint load: failed to create poly, skipping footprint\n"); + rnd_message(PCB_MSG_ERROR, "tEDAx footprint load: failed to create poly, skipping footprint\n"); return -1; } for(n = 0; n < numpt; n++) @@ -516,7 +516,7 @@ } } else if ((argc == 10) && (strcmp(argv[0], "line") == 0)) { - pcb_coord_t x1, y1, x2, y2, w, clr; + rnd_coord_t x1, y1, x2, y2, w, clr; pcb_line_t *l; ly = subc_get_layer(subc, argv[1], argv[2]); @@ -534,7 +534,7 @@ } } else if ((argc == 11) && (strcmp(argv[0], "arc") == 0)) { - pcb_coord_t cx, cy, r, w; + rnd_coord_t cx, cy, r, w; double sa, da; pcb_arc_t *a; @@ -553,7 +553,7 @@ } } else if ((argc == 6) && (strcmp(argv[0], "hole") == 0)) { - pcb_coord_t cx, cy, d; + rnd_coord_t cx, cy, d; int plated; pcb_pstk_t *ps; @@ -566,7 +566,7 @@ load_term(ps, argv[1], "invalid term ID for hole: '%s', skipping footprint\n"); } else if ((argc == 8) && (strcmp(argv[0], "fillcircle") == 0)) { - pcb_coord_t cx, cy, r, clr; + rnd_coord_t cx, cy, r, clr; pcb_line_t *l; ly = subc_get_layer(subc, argv[1], argv[2]); @@ -647,7 +647,7 @@ f = pcb_fopen(&PCB->hidlib, fn, "r"); if (f == NULL) { - pcb_message(PCB_MSG_ERROR, "can't open file '%s' for read\n", fn); + rnd_message(PCB_MSG_ERROR, "can't open file '%s' for read\n", fn); return -1; } Index: footprint.h =================================================================== --- footprint.h (revision 30902) +++ footprint.h (revision 30903) @@ -13,7 +13,7 @@ /* Save a single subc, with footprint header */ int tedax_fp_fsave_subc_(pcb_subc_t *subc, const char *fpname, int lyrecipe, FILE *f); -int tedax_pstk_fsave(pcb_pstk_t *padstack, pcb_coord_t ox, pcb_coord_t oy, FILE *f); +int tedax_pstk_fsave(pcb_pstk_t *padstack, rnd_coord_t ox, rnd_coord_t oy, FILE *f); pcb_plug_fp_map_t *tedax_fp_map(pcb_plug_io_t *ctx, FILE *f, const char *fn, pcb_plug_fp_map_t *head, int need_tags); Index: parse.c =================================================================== --- parse.c (revision 30902) +++ parse.c (revision 30903) @@ -94,12 +94,12 @@ /* look for the header */ if ((argc = tedax_getline(f, buff, buff_size, argv, argv_size)) < 2) { - pcb_message(PCB_MSG_ERROR, "Can't find tEDAx header (no line)\n"); + rnd_message(PCB_MSG_ERROR, "Can't find tEDAx header (no line)\n"); return -1; } if ((argv[1] == NULL) || (pcb_strcasecmp(argv[0], "tEDAx") != 0) || (pcb_strcasecmp(argv[1], "v1") != 0)) { - pcb_message(PCB_MSG_ERROR, "Can't find tEDAx header (wrong line)\n"); + rnd_message(PCB_MSG_ERROR, "Can't find tEDAx header (wrong line)\n"); return -1; } @@ -118,7 +118,7 @@ if (argc < 2) { if (!silent) - pcb_message(PCB_MSG_ERROR, "Can't find %s %s block in tEDAx\n", blk_ver, blk_name); + rnd_message(PCB_MSG_ERROR, "Can't find %s %s block in tEDAx\n", blk_ver, blk_name); return -1; } Index: stackup.c =================================================================== --- stackup.c (revision 30902) +++ stackup.c (revision 30903) @@ -184,11 +184,11 @@ if (thick != NULL) { if (grp->ltype & (PCB_LYT_SUBSTRATE | PCB_LYT_COPPER)) { - pcb_bool succ; + rnd_bool succ; double th = pcb_get_value(thick, NULL, NULL, &succ); if (succ) { char tmp[64]; - pcb_sprintf(tmp, "%mu", (pcb_coord_t)th); + pcb_sprintf(tmp, "%mu", (rnd_coord_t)th); save_prop(pcb, f, name, "thickness", tmp); } else { @@ -257,7 +257,7 @@ else if (strcmp(lloc, "virtual") == 0) grp->ltype |= PCB_LYT_VIRTUAL; else if (strcmp(lloc, "all") == 0) {} else - pcb_message(PCB_MSG_ERROR, "invalid layer location: %s\n", lloc); + rnd_message(PCB_MSG_ERROR, "invalid layer location: %s\n", lloc); for(t = layertab; t->typename != NULL; t++) { if (strcmp(typename, t->typename) == 0) { @@ -269,7 +269,7 @@ } } - pcb_message(PCB_MSG_ERROR, "invalid layer type: %s\n", typename); + rnd_message(PCB_MSG_ERROR, "invalid layer type: %s\n", typename); return -1; } @@ -335,7 +335,7 @@ f = pcb_fopen_askovr(&PCB->hidlib, fn, "w", NULL); if (f == NULL) { - pcb_message(PCB_MSG_ERROR, "tedax_stackup_save(): can't open %s for writing\n", fn); + rnd_message(PCB_MSG_ERROR, "tedax_stackup_save(): can't open %s for writing\n", fn); return -1; } tedax_stackup_init(&ctx); @@ -418,7 +418,7 @@ f = pcb_fopen(&PCB->hidlib, fn, "r"); if (f == NULL) { - pcb_message(PCB_MSG_ERROR, "tedax_stackup_load(): can't open %s for reading\n", fn); + rnd_message(PCB_MSG_ERROR, "tedax_stackup_load(): can't open %s for reading\n", fn); return -1; } tedax_stackup_init(&ctx); Index: tboard.c =================================================================== --- tboard.c (revision 30902) +++ tboard.c (revision 30903) @@ -130,7 +130,7 @@ fputc('\n', f); if (tedax_stackup_fsave(&ctx, pcb, stackupid, f) != 0) { - pcb_message(PCB_MSG_ERROR, "internal error: failed to save the stackup\n"); + rnd_message(PCB_MSG_ERROR, "internal error: failed to save the stackup\n"); goto error; } @@ -258,7 +258,7 @@ f = pcb_fopen_askovr(&PCB->hidlib, fn, "w", NULL); if (f == NULL) { - pcb_message(PCB_MSG_ERROR, "tedax_board_save(): can't open %s for writing\n", fn); + rnd_message(PCB_MSG_ERROR, "tedax_board_save(): can't open %s for writing\n", fn); return -1; } fprintf(f, "tEDAx v1\n"); @@ -270,7 +270,7 @@ #define errexit(msg) \ do { \ if (!silent) \ - pcb_message(PCB_MSG_ERROR, msg); \ + rnd_message(PCB_MSG_ERROR, msg); \ res = -1; \ goto error; \ } while(0) @@ -309,7 +309,7 @@ struct tdx_plc_s { char *block; - pcb_coord_t ox, oy; + rnd_coord_t ox, oy; double rot; char swapside; char role; /* 'v' for via, 'c' for comp or 'm' for misc */ @@ -359,7 +359,7 @@ tedax_stackup_t ctx; tdx_plc_t *p; htsp_t plc; - pcb_bool succ; + rnd_bool succ; pcb_data_t *scdata = NULL; htsp_init(&plc, strhash, strkeyeq); @@ -366,7 +366,7 @@ tedax_stackup_init(&ctx); while((argc = tedax_getline(f, buff, buff_size, argv, argv_size)) >= 0) { if (strcmp(argv[0], "drawing_area") == 0) { - pcb_coord_t x1, y1, x2, y2; + rnd_coord_t x1, y1, x2, y2; reqarg("drawing_area", 5); x1 = pcb_get_value(argv[1], "mm", NULL, &succ); @@ -378,7 +378,7 @@ y2 = pcb_get_value(argv[4], "mm", NULL, &succ); if (!succ) errexit("Invalid y2 coord in drawing_area\n"); if ((x1 >= x2) || (y1 >= y2)) errexit("Invalid (unordered, negative box) drawing area\n"); - if ((x1 < 0) || (y1 < 0)) pcb_message(PCB_MSG_WARNING, "drawing_area starts at negative coords; some objects may not display;\nyou may want to run autocrop()\n"); + if ((x1 < 0) || (y1 < 0)) rnd_message(PCB_MSG_WARNING, "drawing_area starts at negative coords; some objects may not display;\nyou may want to run autocrop()\n"); PCB->hidlib.size_x = x2 - x1; PCB->hidlib.size_y = y2 - y1; } @@ -396,7 +396,7 @@ remember(drc); } else if (strcmp(argv[0], "place") == 0) { - pcb_coord_t ox, oy; + rnd_coord_t ox, oy; double rot; char *end; char swapside, role; @@ -435,7 +435,7 @@ p->attr = a; } else if (strcmp(argv[0], "place_text") == 0) { - pcb_coord_t x1, y1, x2, y2; + rnd_coord_t x1, y1, x2, y2; tdx_text_t *t; char *end; double rot; @@ -545,7 +545,7 @@ f = pcb_fopen(&PCB->hidlib, fn, "r"); if (f == NULL) { - pcb_message(PCB_MSG_ERROR, "tedax_board_load(): can't open %s for reading\n", fn); + rnd_message(PCB_MSG_ERROR, "tedax_board_load(): can't open %s for reading\n", fn); return -1; } res = tedax_board_fload(pcb, f, blk_id, silent); Index: tdrc.c =================================================================== --- tdrc.c (revision 30902) +++ tdrc.c (revision 30903) @@ -79,7 +79,7 @@ f = pcb_fopen_askovr(&PCB->hidlib, fn, "w", NULL); if (f == NULL) { - pcb_message(PCB_MSG_ERROR, "tedax_drc_save(): can't open %s for writing\n", fn); + rnd_message(PCB_MSG_ERROR, "tedax_drc_save(): can't open %s for writing\n", fn); return -1; } fprintf(f, "tEDAx v1\n"); @@ -93,7 +93,7 @@ const drc_rule_t *r; char line[520], *argv[16]; int argc, n; - pcb_coord_t val[NUM_RULES] = {0}; + rnd_coord_t val[NUM_RULES] = {0}; if (tedax_seek_hdr(f, line, sizeof(line), argv, sizeof(argv)/sizeof(argv[0])) < 0) return -1; @@ -105,7 +105,7 @@ if (strcmp(argv[0], "rule") == 0) { double d; for(n = 0, r = rules; n < NUM_RULES; r++,n++) { - pcb_bool succ; + rnd_bool succ; if ((strcmp(argv[2], r->ttype) != 0) || (strcmp(argv[3], r->tkind) != 0)) continue; d = pcb_get_value(argv[4], "mm", NULL, &succ); @@ -114,13 +114,13 @@ val[n] = d; } else - pcb_message(PCB_MSG_ERROR, "ignoring invalid numeric value '%s'\n", argv[4]); + rnd_message(PCB_MSG_ERROR, "ignoring invalid numeric value '%s'\n", argv[4]); } } else if ((argc == 2) && (strcmp(argv[0], "end") == 0) && (strcmp(argv[1], "drc") == 0)) break; else - pcb_message(PCB_MSG_ERROR, "ignoring invalid command in drc %s\n", argv[0]); + rnd_message(PCB_MSG_ERROR, "ignoring invalid command in drc %s\n", argv[0]); } for(n = 0, r = rules; n < NUM_RULES; r++,n++) @@ -135,7 +135,7 @@ f = pcb_fopen(&PCB->hidlib, fn, "r"); if (f == NULL) { - pcb_message(PCB_MSG_ERROR, "tedax_drc_load(): can't open %s for reading\n", fn); + rnd_message(PCB_MSG_ERROR, "tedax_drc_load(): can't open %s for reading\n", fn); return -1; } res = tedax_drc_fload(pcb, f, blk_id, silent); Index: tetest.c =================================================================== --- tetest.c (revision 30902) +++ tetest.c (revision 30903) @@ -65,7 +65,7 @@ pcb_pstk_tshape_t *ts; pcb_layer_type_t copper = 0, exposed = 0, side; pcb_pstk_shape_t *shp, *minshp = NULL; - pcb_coord_t shx, shy, dia, mindia; + rnd_coord_t shx, shy, dia, mindia; if (proto == NULL) return; @@ -161,7 +161,7 @@ f = pcb_fopen_askovr(&PCB->hidlib, fn, "w", NULL); if (f == NULL) { - pcb_message(PCB_MSG_ERROR, "tedax_etest_save(): can't open %s for writing\n", fn); + rnd_message(PCB_MSG_ERROR, "tedax_etest_save(): can't open %s for writing\n", fn); return -1; } fprintf(f, "tEDAx v1\n"); Index: tlayer.c =================================================================== --- tlayer.c (revision 30902) +++ tlayer.c (revision 30903) @@ -93,7 +93,7 @@ line->Thickness, PCB_FLAG_TEST(PCB_FLAG_CLEARLINE, line) ? pcb_round(line->Clearance/2) : 0); } PCB_END_LOOP; PCB_ARC_LOOP(ly) { - pcb_coord_t sx, sy, ex, ey, clr; + rnd_coord_t sx, sy, ex, ey, clr; if (arc->Width != arc->Height) pcb_io_incompat_save(pcb->Data, (pcb_any_obj_t *)arc, "arc", "Elliptical arc", "Saving as circular arc instead - geometry will differ"); @@ -131,7 +131,7 @@ f = pcb_fopen_askovr(&PCB->hidlib, fn, "w", NULL); if (f == NULL) { - pcb_message(PCB_MSG_ERROR, "tedax_layer_save(): can't open %s for writing\n", fn); + rnd_message(PCB_MSG_ERROR, "tedax_layer_save(): can't open %s for writing\n", fn); return -1; } fprintf(f, "tEDAx v1\n"); @@ -159,7 +159,7 @@ while((argc = tedax_seek_block(f, "polyline", "v1", NULL, 1, line, sizeof(line), argv, sizeof(argv)/sizeof(argv[0]))) > 1) { char *pname; if (htsp_has(&plines, argv[3])) { - pcb_message(PCB_MSG_ERROR, "duplicate polyline: %s\n", argv[3]); + rnd_message(PCB_MSG_ERROR, "duplicate polyline: %s\n", argv[3]); res = -1; goto error; } @@ -170,11 +170,11 @@ while((argc = tedax_getline(f, line, sizeof(line), argv, sizeof(argv)/sizeof(argv[0]))) >= 0) { if ((argc == 3) && (strcmp(argv[0], "v") == 0)) { - pcb_bool s1, s2; + rnd_bool s1, s2; vtc0_append(coords, pcb_get_value(argv[1], "mm", NULL, &s1)); vtc0_append(coords, pcb_get_value(argv[2], "mm", NULL, &s2)); if (!s1 || !s2) { - pcb_message(PCB_MSG_ERROR, "invalid coords in polyline %s: %s;%s\n", pname, argv[1], argv[2]); + rnd_message(PCB_MSG_ERROR, "invalid coords in polyline %s: %s;%s\n", pname, argv[1], argv[2]); res = -1; free(pname); goto error; @@ -184,7 +184,7 @@ break; } else { - pcb_message(PCB_MSG_ERROR, "invalid command in polyline %s: %s\n", pname, argv[0]); + rnd_message(PCB_MSG_ERROR, "invalid command in polyline %s: %s\n", pname, argv[0]); res = -1; free(pname); goto error; @@ -199,7 +199,7 @@ while((argc = tedax_seek_block(f, "layer", "v1", blk_id, silent, line, sizeof(line), argv, sizeof(argv)/sizeof(argv[0]))) > 1) { pcb_layer_t *ly; if (data->LayerN >= PCB_MAX_LAYER) { - pcb_message(PCB_MSG_ERROR, "too many layers\n"); + rnd_message(PCB_MSG_ERROR, "too many layers\n"); res = -1; goto error; } @@ -218,8 +218,8 @@ while((argc = tedax_getline(f, line, sizeof(line), argv, sizeof(argv)/sizeof(argv[0]))) >= 0) { if ((argc == 7) && (strcmp(argv[0], "line") == 0)) { - pcb_coord_t x1, y1, x2, y2, th, cl; - pcb_bool s1, s2, s3, s4; + rnd_coord_t x1, y1, x2, y2, th, cl; + rnd_bool s1, s2, s3, s4; x1 = pcb_get_value(argv[1], "mm", NULL, &s1); y1 = pcb_get_value(argv[2], "mm", NULL, &s2); @@ -226,7 +226,7 @@ x2 = pcb_get_value(argv[3], "mm", NULL, &s3); y2 = pcb_get_value(argv[4], "mm", NULL, &s4); if (!s1 || !s2 || !s3 || !s4) { - pcb_message(PCB_MSG_ERROR, "invalid line coords in line: %s;%s %s;%s\n", argv[1], argv[2], argv[3], argv[4]); + rnd_message(PCB_MSG_ERROR, "invalid line coords in line: %s;%s %s;%s\n", argv[1], argv[2], argv[3], argv[4]); res = -1; goto error; } @@ -233,7 +233,7 @@ th = pcb_get_value(argv[5], "mm", NULL, &s1); cl = pcb_get_value(argv[6], "mm", NULL, &s2); if (!s1 || !s2) { - pcb_message(PCB_MSG_ERROR, "invalid thickness or clearance in line: %s;%s\n", argv[5], argv[6]); + rnd_message(PCB_MSG_ERROR, "invalid thickness or clearance in line: %s;%s\n", argv[5], argv[6]); res = -1; goto error; } @@ -240,27 +240,27 @@ pcb_line_new_merge(ly, x1, y1, x2, y2, th, cl*2, pcb_flag_make(PCB_FLAG_CLEARLINE)); } else if ((argc == 12) && (strcmp(argv[0], "arc") == 0)) { - pcb_coord_t cx, cy, r, th, cl; + rnd_coord_t cx, cy, r, th, cl; double sa, da; - pcb_bool s1, s2, s3; + rnd_bool s1, s2, s3; cx = pcb_get_value(argv[1], "mm", NULL, &s1); cy = pcb_get_value(argv[2], "mm", NULL, &s2); r = pcb_get_value(argv[3], "mm", NULL, &s3); if (!s1 || !s2 || !s3) { - pcb_message(PCB_MSG_ERROR, "invalid arc coords or radius in line: %s;%s %s\n", argv[1], argv[2], argv[3]); + rnd_message(PCB_MSG_ERROR, "invalid arc coords or radius in line: %s;%s %s\n", argv[1], argv[2], argv[3]); res = -1; goto error; } sa = strtod(argv[4], &end); if ((*end != '\0') || (sa < 0) || (sa >= 360.0)) { - pcb_message(PCB_MSG_ERROR, "invalid arc start angle %s\n", argv[4]); + rnd_message(PCB_MSG_ERROR, "invalid arc start angle %s\n", argv[4]); res = -1; goto error; } da = strtod(argv[5], &end); if ((*end != '\0') || (da < -360.0) || (da > 360.0)) { - pcb_message(PCB_MSG_ERROR, "invalid arc delta angle %s\n", argv[5]); + rnd_message(PCB_MSG_ERROR, "invalid arc delta angle %s\n", argv[5]); res = -1; goto error; } @@ -267,7 +267,7 @@ th = pcb_get_value(argv[6], "mm", NULL, &s1); cl = pcb_get_value(argv[7], "mm", NULL, &s2); if (!s1 || !s2) { - pcb_message(PCB_MSG_ERROR, "invalid thickness or clearance in arc: %s;%s\n", argv[6], argv[7]); + rnd_message(PCB_MSG_ERROR, "invalid thickness or clearance in arc: %s;%s\n", argv[6], argv[7]); res = -1; goto error; } @@ -274,8 +274,8 @@ pcb_arc_new(ly, cx, cy, r, r, sa, da, th, cl*2, pcb_flag_make(PCB_FLAG_CLEARLINE), 1); } else if ((argc == 9) && (strcmp(argv[0], "text") == 0)) { - pcb_coord_t bx1, by1, bx2, by2, rw, rh, aw, ah; - pcb_bool s1, s2, s3, s4; + rnd_coord_t bx1, by1, bx2, by2, rw, rh, aw, ah; + rnd_bool s1, s2, s3, s4; double rot, zx, zy, z; pcb_text_t *text; @@ -284,13 +284,13 @@ bx2 = pcb_get_value(argv[3], "mm", NULL, &s3); by2 = pcb_get_value(argv[4], "mm", NULL, &s4); if (!s1 || !s2 || !s3 || !s4) { - pcb_message(PCB_MSG_ERROR, "invalid bbox coords in text %s;%s %s;%s \n", argv[1], argv[2], argv[3], argv[4]); + rnd_message(PCB_MSG_ERROR, "invalid bbox coords in text %s;%s %s;%s \n", argv[1], argv[2], argv[3], argv[4]); res = -1; goto error; } rot = strtod(argv[6], &end); if (*end != '\0') { - pcb_message(PCB_MSG_ERROR, "invalid text rotation %s \n", argv[6]); + rnd_message(PCB_MSG_ERROR, "invalid text rotation %s \n", argv[6]); res = -1; goto error; } @@ -316,20 +316,20 @@ } else if ((argc == 4) && (strcmp(argv[0], "poly") == 0)) { - pcb_bool s1, s2; - pcb_coord_t ox, oy; + rnd_bool s1, s2; + rnd_coord_t ox, oy; pcb_poly_t *poly; ox = pcb_get_value(argv[2], "mm", NULL, &s1); oy = pcb_get_value(argv[3], "mm", NULL, &s2); if (!s1 || !s2) { - pcb_message(PCB_MSG_ERROR, "invalid coords in poly %s;%s\n", argv[2], argv[3]); + rnd_message(PCB_MSG_ERROR, "invalid coords in poly %s;%s\n", argv[2], argv[3]); res = -1; goto error; } coords = htsp_get(&plines, argv[1]); if (coords == NULL) { - pcb_message(PCB_MSG_ERROR, "invalid polyline referecnce %s\n", argv[1]); + rnd_message(PCB_MSG_ERROR, "invalid polyline referecnce %s\n", argv[1]); res = -1; goto error; } @@ -342,7 +342,7 @@ else if ((argc == 2) && (strcmp(argv[0], "end") == 0) && (strcmp(argv[1], "layer") == 0)) break; else { - pcb_message(PCB_MSG_ERROR, "invalid layer object %s\n", argv[0]); + rnd_message(PCB_MSG_ERROR, "invalid layer object %s\n", argv[0]); res = -1; goto error; } @@ -367,7 +367,7 @@ f = pcb_fopen(&PCB->hidlib, fn, "r"); if (f == NULL) { - pcb_message(PCB_MSG_ERROR, "tedax_layers_load(): can't open %s for reading\n", fn); + rnd_message(PCB_MSG_ERROR, "tedax_layers_load(): can't open %s for reading\n", fn); return -1; } res = tedax_layers_fload(data, f, blk_id, silent); Index: tnetlist.c =================================================================== --- tnetlist.c (revision 30902) +++ tnetlist.c (revision 30903) @@ -120,7 +120,7 @@ /* pcb_trace("tedax fp: refdes=%s val=%s fp=%s\n", e->key, fp->value, fp->footprint);*/ if (fp->footprint == NULL) - pcb_message(PCB_MSG_ERROR, "tedax: not importing refdes=%s: no footprint specified\n", e->key); + rnd_message(PCB_MSG_ERROR, "tedax: not importing refdes=%s: no footprint specified\n", e->key); else rnd_actionva(&PCB->hidlib, "ElementList", "Need", null_empty(e->key), null_empty(fp->footprint), null_empty(fp->value), NULL); @@ -158,7 +158,7 @@ fn = pcb_fopen(&PCB->hidlib, fname_net, "r"); if (fn == NULL) { - pcb_message(PCB_MSG_ERROR, "can't open file '%s' for read\n", fname_net); + rnd_message(PCB_MSG_ERROR, "can't open file '%s' for read\n", fname_net); return -1; } @@ -234,7 +234,7 @@ f = pcb_fopen_askovr(&PCB->hidlib, fn, "w", NULL); if (f == NULL) { - pcb_message(PCB_MSG_ERROR, "tedax_net_save(): can't open %s for writing\n", fn); + rnd_message(PCB_MSG_ERROR, "tedax_net_save(): can't open %s for writing\n", fn); return -1; } fprintf(f, "tEDAx v1\n"); @@ -268,7 +268,7 @@ static int tedaxnet_import(pcb_plug_import_t *ctx, unsigned int aspects, const char **args, int numargs) { if (numargs != 1) { - pcb_message(PCB_MSG_ERROR, "import_tedaxnet: requires exactly 1 input file name\n"); + rnd_message(PCB_MSG_ERROR, "import_tedaxnet: requires exactly 1 input file name\n"); return -1; } return tedax_net_load(args[0], 1, NULL, 0);