Index: footprint.c =================================================================== --- footprint.c (revision 30941) +++ footprint.c (revision 30942) @@ -79,7 +79,7 @@ #define print_term(pnum, obj) \ do { \ if (htsp_get(&terms, pnum) == NULL) { \ - htsp_set(&terms, pcb_strdup(pnum), obj); \ + htsp_set(&terms, rnd_strdup(pnum), obj); \ fprintf(f, " term %s %s - %s\n", pnum, pnum, obj->Name); \ } \ } while(0) @@ -87,7 +87,7 @@ #define print_terma(terms, pnum, obj) \ do { \ if (htsp_get(terms, pnum) == NULL) { \ - htsp_set(terms, pcb_strdup(pnum), obj); \ + htsp_set(terms, rnd_strdup(pnum), obj); \ fprintf(f, " term %s %s - %s\n", pnum, pnum, pnum); \ } \ } while(0) @@ -339,8 +339,8 @@ static term_t *term_new(const char *pinid, const char *name) { term_t *t = calloc(sizeof(term_t), 1); - t->pinid = pcb_strdup(pinid); - t->name = pcb_strdup(name); + t->pinid = rnd_strdup(pinid); + t->name = rnd_strdup(name); return t; } Index: io_tedax.c =================================================================== --- io_tedax.c (revision 30941) +++ io_tedax.c (revision 30942) @@ -57,7 +57,7 @@ if (strcmp(ctx->description, fmt) == 0) return 200; - if ((pcb_strcasecmp(fmt, "tedax") != 0) || + if ((rnd_strcasecmp(fmt, "tedax") != 0) || ((typ & (~(PCB_IOT_PCB | PCB_IOT_FOOTPRINT | PCB_IOT_BUFFER))) != 0)) return 0; @@ -74,37 +74,37 @@ RND_PCB_ACT_CONVARG(1, FGW_STR, Savetedax, type = argv[1].val.str); rnd_PCB_ACT_MAY_CONVARG(2, FGW_STR, Savetedax, fname = argv[2].val.str); - if (pcb_strcasecmp(type, "netlist") == 0) { + if (rnd_strcasecmp(type, "netlist") == 0) { RND_ACT_IRES(tedax_net_save(PCB, NULL, fname)); return 0; } - if (pcb_strcasecmp(type, "board-footprints") == 0) { + if (rnd_strcasecmp(type, "board-footprints") == 0) { RND_ACT_IRES(tedax_fp_save(PCB->Data, fname, -1)); return 0; } - if (pcb_strcasecmp(type, "stackup") == 0) { + if (rnd_strcasecmp(type, "stackup") == 0) { RND_ACT_IRES(tedax_stackup_save(PCB, PCB->hidlib.name, fname)); return 0; } - if (pcb_strcasecmp(type, "layer") == 0) { + if (rnd_strcasecmp(type, "layer") == 0) { RND_ACT_IRES(tedax_layer_save(PCB, pcb_layer_get_group_(PCB_CURRLAYER(PCB)), NULL, fname)); return 0; } - if (pcb_strcasecmp(type, "board") == 0) { + if (rnd_strcasecmp(type, "board") == 0) { RND_ACT_IRES(tedax_board_save(PCB, fname)); return 0; } - if (pcb_strcasecmp(type, "drc") == 0) { + if (rnd_strcasecmp(type, "drc") == 0) { RND_ACT_IRES(tedax_drc_save(PCB, NULL, fname)); return 0; } - if (pcb_strcasecmp(type, "etest") == 0) { + if (rnd_strcasecmp(type, "etest") == 0) { RND_ACT_IRES(tedax_etest_save(PCB, NULL, fname)); return 0; } @@ -142,34 +142,34 @@ rnd_PCB_ACT_MAY_CONVARG(3, FGW_STR, LoadtedaxFrom, id = argv[3].val.str); rnd_PCB_ACT_MAY_CONVARG(4, FGW_STR, LoadtedaxFrom, silents = argv[4].val.str); - silent = (silents != NULL) && (pcb_strcasecmp(silents, "silent") == 0); + silent = (silents != NULL) && (rnd_strcasecmp(silents, "silent") == 0); - if (pcb_strcasecmp(type, "netlist") == 0) { + if (rnd_strcasecmp(type, "netlist") == 0) { gen_load(netlist, fname); RND_ACT_IRES(tedax_net_load(fname, 1, id, silent)); return 0; } - if (pcb_strcasecmp(type, "board") == 0) { + if (rnd_strcasecmp(type, "board") == 0) { gen_load(board, fname); RND_ACT_IRES(tedax_board_load(PCB, fname, id, silent)); return 0; } - if (pcb_strcasecmp(type, "footprint") == 0) { + if (rnd_strcasecmp(type, "footprint") == 0) { gen_load(footprint, fname); RND_ACT_IRES(tedax_fp_load(PCB_PASTEBUFFER->Data, fname, 0, id, silent)); return 0; } - if (pcb_strcasecmp(type, "stackup") == 0) { + if (rnd_strcasecmp(type, "stackup") == 0) { gen_load(stackup, fname); RND_ACT_IRES(tedax_stackup_load(PCB, fname, id, silent)); return 0; } - if (pcb_strcasecmp(type, "layer") == 0) { + if (rnd_strcasecmp(type, "layer") == 0) { gen_load(layer, fname); RND_ACT_IRES(tedax_layers_load(PCB_PASTEBUFFER->Data, fname, id, silent)); return 0; } - if (pcb_strcasecmp(type, "drc") == 0) { + if (rnd_strcasecmp(type, "drc") == 0) { gen_load(drc, fname); RND_ACT_IRES(tedax_drc_load(PCB, fname, id, silent)); return 0; Index: parse.c =================================================================== --- parse.c (revision 30941) +++ parse.c (revision 30942) @@ -98,7 +98,7 @@ return -1; } - if ((argv[1] == NULL) || (pcb_strcasecmp(argv[0], "tEDAx") != 0) || (pcb_strcasecmp(argv[1], "v1") != 0)) { + if ((argv[1] == NULL) || (rnd_strcasecmp(argv[0], "tEDAx") != 0) || (rnd_strcasecmp(argv[1], "v1") != 0)) { rnd_message(PCB_MSG_ERROR, "Can't find tEDAx header (wrong line)\n"); return -1; } Index: stackup.c =================================================================== --- stackup.c (revision 30941) +++ stackup.c (revision 30942) @@ -310,7 +310,7 @@ } - tn = pcb_strdup(tname); + tn = rnd_strdup(tname); htsp_set(&ctx->n2g, tn, grp); vtp0_set(&ctx->g2n, gid, tn); @@ -354,8 +354,8 @@ char *nn; grp = pcb_get_grp_new_raw(pcb); - grp->name = pcb_strdup(name); - nn = pcb_strdup(name); + grp->name = rnd_strdup(name); + nn = rnd_strdup(name); htsp_set(&ctx->n2g, nn, grp); vtp0_set(&ctx->g2n, (grp - pcb->LayerGroups.grp), nn); } @@ -373,7 +373,7 @@ grp = get_grp_by_name(ctx, pcb, argv[1]); tedax_layer_set_by_str(pcb, grp, argv[2], argv[3]); if (!(grp->ltype & PCB_LYT_SUBSTRATE)) - pcb_layer_create(pcb, grp - pcb->LayerGroups.grp, pcb_strdup(argv[1]), 0); + pcb_layer_create(pcb, grp - pcb->LayerGroups.grp, rnd_strdup(argv[1]), 0); } else if (strcmp(argv[0], "lprop") == 0) { Index: tboard.c =================================================================== --- tboard.c (revision 30941) +++ tboard.c (revision 30942) @@ -72,7 +72,7 @@ if (padstack->term != NULL) fprintf(f, " term %s %s - -\n", padstack->term, padstack->term); tedax_pstk_fsave(padstack, padstack->x, padstack->y, f); - htsp_set(&seen, pcb_strdup(fpname), padstack); + htsp_set(&seen, rnd_strdup(fpname), padstack); fprintf(f, "end footprint\n"); } } @@ -189,7 +189,7 @@ fake_refdes:; sprintf(refdes, "ANON%ld", subc->ID); } - htsi_insert(&urefdes, pcb_strdup(refdes), 1); + htsi_insert(&urefdes, rnd_strdup(refdes), 1); subc2fpname(fpname, proto); pcb_subc_get_host_trans(subc, &tr, 0); @@ -286,7 +286,7 @@ if (what != NULL) \ errexit("tEDAx board load: multiple instances of " #what " reference\n"); \ reqarg(what, 2); \ - what = pcb_strdup(argv[1]); \ + what = rnd_strdup(argv[1]); \ } while(0) typedef struct tdx_plc_s tdx_plc_t; @@ -348,7 +348,7 @@ if (p != NULL) return p; p = calloc(sizeof(tdx_plc_t), 1); - htsp_set(plc, pcb_strdup(id), p); + htsp_set(plc, rnd_strdup(id), p); return p; } @@ -417,7 +417,7 @@ else errexit("Invalid role value in place\n"); p = get_place(&plc, argv[1]); - p->block = pcb_strdup(argv[2]); + p->block = rnd_strdup(argv[2]); p->ox = ox; p->oy = oy; p->rot = rot; @@ -429,8 +429,8 @@ reqarg(argv[0], 4); p = get_place(&plc, argv[1]); a = malloc(sizeof(tdx_attr_t)); - a->key = pcb_strdup(argv[2]); - a->val = pcb_strdup(argv[3]); + a->key = rnd_strdup(argv[2]); + a->val = rnd_strdup(argv[3]); a->next = p->attr; p->attr = a; } @@ -455,8 +455,8 @@ p = get_place(&plc, argv[1]); t = malloc(sizeof(tdx_text_t)); - t->layer = pcb_strdup(argv[2]); - t->val = pcb_strdup(argv[9]); + t->layer = rnd_strdup(argv[2]); + t->val = rnd_strdup(argv[9]); t->bbox.X1 = x1; t->bbox.Y1 = y1; t->bbox.X2 = x2; Index: tlayer.c =================================================================== --- tlayer.c (revision 30941) +++ tlayer.c (revision 30942) @@ -90,7 +90,7 @@ PCB_LINE_LOOP(ly) { pcb_fprintf(f, " line %.06mm %.06mm %.06mm %.06mm %.06mm %.06mm\n", line->Point1.X, line->Point1.Y, line->Point2.X, line->Point2.Y, - line->Thickness, PCB_FLAG_TEST(PCB_FLAG_CLEARLINE, line) ? pcb_round(line->Clearance/2) : 0); + line->Thickness, PCB_FLAG_TEST(PCB_FLAG_CLEARLINE, line) ? rnd_round(line->Clearance/2) : 0); } PCB_END_LOOP; PCB_ARC_LOOP(ly) { rnd_coord_t sx, sy, ex, ey, clr; @@ -100,7 +100,7 @@ pcb_arc_get_end(arc, 0, &sx, &sy); pcb_arc_get_end(arc, 1, &ex, &ey); - clr = PCB_FLAG_TEST(PCB_FLAG_CLEARLINE, arc) ? pcb_round(arc->Clearance/2) : 0; + clr = PCB_FLAG_TEST(PCB_FLAG_CLEARLINE, arc) ? rnd_round(arc->Clearance/2) : 0; pcb_fprintf(f, " arc %.06mm %.06mm %.06mm %f %f %.06mm %.06mm ", arc->X, arc->Y, arc->Width, arc->StartAngle, arc->Delta, arc->Thickness, clr); @@ -163,7 +163,7 @@ res = -1; goto error; } - pname = pcb_strdup(argv[3]); + pname = rnd_strdup(argv[3]); coords = malloc(sizeof(vtc0_t)); vtc0_init(coords); @@ -205,7 +205,7 @@ } ly = &data->Layer[data->LayerN++]; free((char *)ly->name); - ly->name = pcb_strdup(argv[3]); + ly->name = rnd_strdup(argv[3]); ly->is_bound = data->parent_type != PCB_PARENT_BOARD; if (!ly->is_bound) { /* real layer */ @@ -306,7 +306,7 @@ z = zx < zy ? zx : zy; if ((z > 0.999) && (z < 1.001)) break; - text->Scale = pcb_round(text->Scale*z); + text->Scale = rnd_round(text->Scale*z); } pcb_text_bbox(pcb_font(PCB, 0, 1), text); aw = text->bbox_naked.X2 - text->bbox_naked.X1; ah = text->bbox_naked.Y2 - text->bbox_naked.Y1; Index: tnetlist.c =================================================================== --- tnetlist.c (revision 30941) +++ tnetlist.c (revision 30942) @@ -57,7 +57,7 @@ void *res = htsp_get(ht, key); if (res == NULL) { res = calloc(size, 1); - htsp_set(ht, pcb_strdup(key), res); + htsp_set(ht, rnd_strdup(key), res); } return res; } @@ -85,11 +85,11 @@ while((argc = tedax_getline(fn, line, sizeof(line), argv, sizeof(argv)/sizeof(argv[0]))) >= 0) { if ((argc == 3) && (strcmp(argv[0], "footprint") == 0)) { fp_t *fp = htsp_get2(&fps, argv[1], sizeof(fp_t)); - fp->footprint = pcb_strdup(argv[2]); + fp->footprint = rnd_strdup(argv[2]); } else if ((argc == 3) && (strcmp(argv[0], "value") == 0)) { fp_t *fp = htsp_get2(&fps, argv[1], sizeof(fp_t)); - fp->value = pcb_strdup(argv[2]); + fp->value = rnd_strdup(argv[2]); } else if ((argc == 4) && (strcmp(argv[0], "conn") == 0)) { char id[512]; @@ -104,7 +104,7 @@ free(e->key); free(e->value); } - htsp_set(&pinnames, pcb_strdup(id), pcb_strdup(argv[3])); + htsp_set(&pinnames, rnd_strdup(id), rnd_strdup(argv[3])); } else if ((argc == 2) && (strcmp(argv[0], "end") == 0) && (strcmp(argv[1], "netlist") == 0)) break;