Index: trunk/src/actions_pcb.c =================================================================== --- trunk/src/actions_pcb.c (revision 30941) +++ trunk/src/actions_pcb.c (revision 30942) @@ -245,7 +245,7 @@ if (name != NULL) { if (name == buf) { - arg->val.str = pcb_strdup(name); + arg->val.str = rnd_strdup(name); arg->type = FGW_STR | FGW_DYN; } else { /* static string */ Index: trunk/src/brave.c =================================================================== --- trunk/src/brave.c (revision 30941) +++ trunk/src/brave.c (revision 30942) @@ -62,7 +62,7 @@ { desc_t *d; for(d = desc; d->name != NULL; d++) - if (pcb_strcasecmp(name, d->name) == 0) + if (rnd_strcasecmp(name, d->name) == 0) return d; return NULL; } @@ -268,7 +268,7 @@ RND_ACT_IRES(-1); return 0; } - brave_set(d->bit, (pcb_strcasecmp(op, "on") == 0)); + brave_set(d->bit, (rnd_strcasecmp(op, "on") == 0)); rnd_message(PCB_MSG_INFO, "Brave setting: %s in %s\n", name, (pcb_brave & d->bit) ? "on" : "off"); Index: trunk/src/buffer.c =================================================================== --- trunk/src/buffer.c (revision 30941) +++ trunk/src/buffer.c (revision 30942) @@ -306,7 +306,7 @@ pcb_board_free(newPCB); free(newPCB); Buffer->from_outside = 0; /* always place matching top-to-top, don't swap sides only because the user is viewing the board from the bottom */ - free(Buffer->source_path); Buffer->source_path = pcb_strdup(Filename); + free(Buffer->source_path); Buffer->source_path = rnd_strdup(Filename); PCB = orig; pcb_layergrp_inhibit_dec(); return pcb_true; @@ -452,7 +452,7 @@ char *angle_s = NULL; double ang; - rnd_PCB_ACT_MAY_CONVARG(1, FGW_STR, FreeRotateBuffer, angle_s = pcb_strdup(argv[1].val.str)); + rnd_PCB_ACT_MAY_CONVARG(1, FGW_STR, FreeRotateBuffer, angle_s = rnd_strdup(argv[1].val.str)); RND_ACT_IRES(0); if (angle_s == NULL) @@ -646,8 +646,8 @@ void pcb_buffer_scale(pcb_buffer_t *Buffer, double sx, double sy, double sth, int recurse) { pcb_data_scale(Buffer->Data, sx, sy, sth, recurse); - Buffer->X = pcb_round((double)Buffer->X * sx); - Buffer->Y = pcb_round((double)Buffer->Y * sy); + Buffer->X = rnd_round((double)Buffer->X * sx); + Buffer->Y = rnd_round((double)Buffer->Y * sy); pcb_set_buffer_bbox(Buffer); } @@ -937,7 +937,7 @@ Buffer->X = 0; Buffer->Y = 0; Buffer->from_outside = 1; - free(Buffer->source_path); Buffer->source_path = pcb_strdup(Name); + free(Buffer->source_path); Buffer->source_path = rnd_strdup(Name); if (pcb_subclist_length(&Buffer->Data->subc)) { pcb_subc_t *subc = pcb_subclist_first(&Buffer->Data->subc); @@ -1067,7 +1067,7 @@ default_file = NULL; } if (name && *name) - default_file = pcb_strdup(name); + default_file = rnd_strdup(name); free_name = pcb_true; } else @@ -1101,7 +1101,7 @@ default_file = NULL; } if (name && *name) - default_file = pcb_strdup(name); + default_file = rnd_strdup(name); free_name = pcb_true; } else @@ -1156,8 +1156,8 @@ case F_Normalize: pcb_set_buffer_bbox(PCB_PASTEBUFFER); - PCB_PASTEBUFFER->X = pcb_round(((double)PCB_PASTEBUFFER->BoundingBox.X1 + (double)PCB_PASTEBUFFER->BoundingBox.X2) / 2.0); - PCB_PASTEBUFFER->Y = pcb_round(((double)PCB_PASTEBUFFER->BoundingBox.Y1 + (double)PCB_PASTEBUFFER->BoundingBox.Y2) / 2.0); + PCB_PASTEBUFFER->X = rnd_round(((double)PCB_PASTEBUFFER->BoundingBox.X1 + (double)PCB_PASTEBUFFER->BoundingBox.X2) / 2.0); + PCB_PASTEBUFFER->Y = rnd_round(((double)PCB_PASTEBUFFER->BoundingBox.Y1 + (double)PCB_PASTEBUFFER->BoundingBox.Y2) / 2.0); break; case F_GetSource: Index: trunk/src/build_run.c =================================================================== --- trunk/src/build_run.c (revision 30941) +++ trunk/src/build_run.c (revision 30942) @@ -217,7 +217,7 @@ if (conf_core.design.fab_author && conf_core.design.fab_author[0]) return conf_core.design.fab_author; else - return pcb_get_user_name(); + return rnd_get_user_name(); } /* Catches signals which abort the program. */ Index: trunk/src/change.c =================================================================== --- trunk/src/change.c (revision 30941) +++ trunk/src/change.c (revision 30942) @@ -983,7 +983,7 @@ ca->delete = 1; } else { - ca->value = pcb_strdup(new_value); + ca->value = rnd_strdup(new_value); ca->delete = 0; } undo_chg_attr_swap(ca); Index: trunk/src/change_act.c =================================================================== --- trunk/src/change_act.c (revision 30941) +++ trunk/src/change_act.c (revision 30942) @@ -781,7 +781,7 @@ case F_Text: case F_TextScale: - value = pcb_round(value / (double)PCB_FONT_CAPHEIGHT * 100.0); + value = rnd_round(value / (double)PCB_FONT_CAPHEIGHT * 100.0); pcb_board_set_text_scale(absolute ? value : (value + conf_core.design.text_scale)); break; default: @@ -817,9 +817,9 @@ RND_PCB_ACT_CONVARG(3, FGW_STR, ChangeAngle, delta = argv[3].val.str); - if (pcb_strcasecmp(prim, "start") == 0) which = 0; - else if (pcb_strcasecmp(prim, "delta") == 0) which = 1; - else if (pcb_strcasecmp(prim, "both") == 0) which = 2; + if (rnd_strcasecmp(prim, "start") == 0) which = 0; + else if (rnd_strcasecmp(prim, "delta") == 0) which = 1; + else if (rnd_strcasecmp(prim, "both") == 0) which = 2; else { rnd_message(PCB_MSG_ERROR, "Second argument of ChangeAngle must be start, delta or both\n"); return -1; @@ -895,9 +895,9 @@ RND_PCB_ACT_CONVARG(3, FGW_STR, ChangeRadius, delta = argv[3].val.str); rnd_PCB_ACT_MAY_CONVARG(4, FGW_STR, ChangeRadius, units = argv[4].val.str); - if ((pcb_strcasecmp(prim, "width") == 0) || (pcb_strcasecmp(prim, "x") == 0)) which = 0; - else if ((pcb_strcasecmp(prim, "height") == 0) || (pcb_strcasecmp(prim, "y") == 0)) which = 1; - else if (pcb_strcasecmp(prim, "both") == 0) which = 2; + if ((rnd_strcasecmp(prim, "width") == 0) || (rnd_strcasecmp(prim, "x") == 0)) which = 0; + else if ((rnd_strcasecmp(prim, "height") == 0) || (rnd_strcasecmp(prim, "y") == 0)) which = 1; + else if (rnd_strcasecmp(prim, "both") == 0) which = 2; else { rnd_message(PCB_MSG_ERROR, "Second argument of ChangeRadius must be width, x, height, y or both\n"); return -1; Index: trunk/src/data.c =================================================================== --- trunk/src/data.c (revision 30941) +++ trunk/src/data.c (revision 30942) @@ -492,8 +492,8 @@ { rnd_coord_t ox, oy, nx, ny; if (pcb_subc_get_origin(subc, &ox, &oy) == 0) { - nx = pcb_round((double)ox * sx); - ny = pcb_round((double)oy * sy); + nx = rnd_round((double)ox * sx); + ny = rnd_round((double)oy * sy); pcb_subc_move(subc, nx - ox, ny - oy, pcb_true); } } @@ -979,7 +979,7 @@ if (name == NULL) return NULL; - if (pcb_strncasecmp(*name, "pcb", 3) == 0) { + if (rnd_strncasecmp(*name, "pcb", 3) == 0) { (*name) += 3; if (**name == '/') (*name)++; @@ -986,7 +986,7 @@ *addr = 1; return pcb->Data; } - else if (pcb_strncasecmp(*name, "buffer#", 7) == 0) { + else if (rnd_strncasecmp(*name, "buffer#", 7) == 0) { char *end; long idx = strtol((*name)+7, &end, 10); if ((*end == '\0') && (idx >= 0) && (idx < PCB_MAX_BUFFER)) { @@ -997,7 +997,7 @@ return pcb_buffers[idx].Data; } } - else if (pcb_strncasecmp(*name, "buffer", 6) == 0) { + else if (rnd_strncasecmp(*name, "buffer", 6) == 0) { (*name) += 6; if (**name == '/') (*name)++; Index: trunk/src/drc.c =================================================================== --- trunk/src/drc.c (revision 30941) +++ trunk/src/drc.c (revision 30942) @@ -70,7 +70,7 @@ args[1].type = FGW_STR; - if (pcb_strcasecmp(dlg_type, "list") == 0) { + if (rnd_strcasecmp(dlg_type, "list") == 0) { if (PCB_HAVE_GUI_ATTR_DLG) { args[1].val.str = "list"; return rnd_actionv_bin(RND_ACT_HIDLIB, dlgact, res, 2, args); @@ -78,7 +78,7 @@ dlg_type = "print"; } - if (pcb_strcasecmp(dlg_type, "simple") == 0) { + if (rnd_strcasecmp(dlg_type, "simple") == 0) { if (PCB_HAVE_GUI_ATTR_DLG) { args[1].val.str = "simple"; return rnd_actionv_bin(RND_ACT_HIDLIB, dlgact, res, 2, args); @@ -91,7 +91,7 @@ if (refresh != NULL) refresh(); - if (pcb_strcasecmp(dlg_type, "print") == 0) { + if (rnd_strcasecmp(dlg_type, "print") == 0) { pcb_view_t *v; for(v = pcb_view_list_first(lst); v != NULL; v = pcb_view_list_next(v)) { printf("%ld: %s: %s\n", v->uid, v->type, v->title); @@ -105,7 +105,7 @@ printf("%s\n\n", v->description); } } - else if (pcb_strcasecmp(dlg_type, "log") == 0) { + else if (rnd_strcasecmp(dlg_type, "log") == 0) { pcb_view_t *v; for(v = pcb_view_list_first(lst); v != NULL; v = pcb_view_list_next(v)) { rnd_message(PCB_MSG_INFO, "%ld: %s: %s\n", v->uid, v->type, v->title); @@ -119,7 +119,7 @@ rnd_message(PCB_MSG_INFO, "%s\n\n", v->description); } } - if (pcb_strcasecmp(dlg_type, "dump") == 0) { + if (rnd_strcasecmp(dlg_type, "dump") == 0) { pcb_view_t *v; char *s; for(v = pcb_view_list_first(lst); v != NULL; v = pcb_view_list_next(v)) { @@ -139,7 +139,7 @@ printf("E%s\n\n", v->description); } } - else if (pcb_strcasecmp(dlg_type, "count") == 0) + else if (rnd_strcasecmp(dlg_type, "count") == 0) RND_ACT_IRES(pcb_view_list_length(lst)); Index: trunk/src/extobj_helper.h =================================================================== --- trunk/src/extobj_helper.h (revision 30941) +++ trunk/src/extobj_helper.h (revision 30942) @@ -211,7 +211,7 @@ int wid; \ const char *currval = rnd_attribute_get(&subc->Attributes, attr_name); \ if (currval == NULL) currval = ""; \ - currval = pcb_strdup(currval); \ + currval = rnd_strdup(currval); \ PCB_DAD_LABEL(dlg, vis_name); \ if (help != NULL) PCB_DAD_HELP(dlg, help); \ PCB_DAD_STRING(dlg); \ Index: trunk/src/file_act.c =================================================================== --- trunk/src/file_act.c (revision 30941) +++ trunk/src/file_act.c (revision 30942) @@ -138,7 +138,7 @@ if (!PCB->Changed || (pcb_hid_message_box(RND_ACT_HIDLIB, "warning", "New pcb", "OK to clear layout data?", "cancel", 0, "yes", 1, NULL) == 1)) { if (argument_name) - name = pcb_strdup(argument_name); + name = rnd_strdup(argument_name); else name = pcb_hid_prompt_for(RND_ACT_HIDLIB, "Enter the layout name:", "", "Layout name"); @@ -263,7 +263,7 @@ if (pcb_save_pcb(name, fmt) == 0) { pcb_board_set_changed_flag(pcb_false); free(RND_ACT_HIDLIB->filename); - RND_ACT_HIDLIB->filename = pcb_strdup(name); + RND_ACT_HIDLIB->filename = rnd_strdup(name); pcb_event(RND_ACT_HIDLIB, PCB_EVENT_BOARD_FN_CHANGED, NULL); } return 0; @@ -342,7 +342,7 @@ if (*default_file != NULL) free(*default_file); - *default_file = pcb_strdup(name); + *default_file = rnd_strdup(name); } return 0; } @@ -361,12 +361,12 @@ rnd_PCB_ACT_MAY_CONVARG(3, FGW_STR, SaveLib, fn = argv[3].val.str); rnd_PCB_ACT_MAY_CONVARG(4, FGW_STR, SaveLib, fmt = argv[4].val.str); - if (pcb_strcasecmp(source, "board") == 0) src = PCB->Data; - else if (pcb_strcasecmp(source, "buffer") == 0) src = PCB_PASTEBUFFER->Data; + if (rnd_strcasecmp(source, "board") == 0) src = PCB->Data; + else if (rnd_strcasecmp(source, "buffer") == 0) src = PCB_PASTEBUFFER->Data; else RND_ACT_FAIL(SaveLib); - if (pcb_strcasecmp(method, "file") == 0) { + if (rnd_strcasecmp(method, "file") == 0) { char *name; FILE *f; static char *default_file; @@ -380,7 +380,7 @@ } } else - name = pcb_strdup(fn); + name = rnd_strdup(fn); f = pcb_fopen(RND_ACT_HIDLIB, name, "w"); if (f == NULL) { @@ -392,7 +392,7 @@ free(name); RND_ACT_IRES(pcb_write_footprint_data(f, src, fmt, -1)); } - else if (pcb_strcasecmp(method, "dir") == 0) { + else if (rnd_strcasecmp(method, "dir") == 0) { unsigned int ares = 0; void *udata; gdl_iterator_t sit; @@ -412,7 +412,7 @@ } } else - name = pcb_strdup(fn); + name = rnd_strdup(fn); p = pcb_io_find_writer(PCB_IOT_FOOTPRINT, fmt); if (p == NULL) { @@ -470,7 +470,7 @@ const char *force = NULL; rnd_PCB_ACT_MAY_CONVARG(1, FGW_STR, Quit, force = argv[1].val.str); - if ((force != NULL) && (pcb_strcasecmp(force, "force") == 0)) + if ((force != NULL) && (rnd_strcasecmp(force, "force") == 0)) exit(0); if (!PCB->Changed || (pcb_hid_message_box(RND_ACT_HIDLIB, "warning", "Close: lose data", "OK to lose data?", "cancel", 0, "ok", 1, NULL) == 1)) pcb_quit_app(); Index: trunk/src/flag_str.c =================================================================== --- trunk/src/flag_str.c (revision 30941) +++ trunk/src/flag_str.c (revision 30942) @@ -399,7 +399,7 @@ error(msg); u = malloc(sizeof(pcb_unknown_flag_t)); - u->str = pcb_strndup(fp, flen); + u->str = rnd_strndup(fp, flen); u->next = NULL; /* need to append, to keep order of flags */ if (rv.Flags.unknowns != NULL) { Index: trunk/src/font.c =================================================================== --- trunk/src/font.c (revision 30941) +++ trunk/src/font.c (revision 30942) @@ -325,7 +325,7 @@ f = calloc(sizeof(pcb_font_t), 1); htip_set(&fk->fonts, id, f); if (name != NULL) - f->name = pcb_strdup(name); + f->name = rnd_strdup(name); f->id = id; if (f->id > fk->last_id) @@ -438,7 +438,7 @@ } } if (src->name != NULL) - dst->name = pcb_strdup(src->name); + dst->name = rnd_strdup(src->name); } int pcb_move_font(pcb_fontkit_t *fk, pcb_font_id_t src, pcb_font_id_t dst) Index: trunk/src/gui_act.c =================================================================== --- trunk/src/gui_act.c (revision 30941) +++ trunk/src/gui_act.c (revision 30942) @@ -533,7 +533,7 @@ number = -1; for(n = 0; n < vtroutestyle_len(&PCB->RouteStyle); n++) { rts = &PCB->RouteStyle.array[n]; - if (pcb_strcasecmp(rts->name, str) == 0) { + if (rnd_strcasecmp(rts->name, str) == 0) { number = n + 1; break; } @@ -646,7 +646,7 @@ } else if (strncmp(arg, "name=", 5) == 0) { interactive = 0; - ret |= pcb_layer_rename_(ly, pcb_strdup(arg+5), 1); + ret |= pcb_layer_rename_(ly, rnd_strdup(arg+5), 1); pcb_board_set_changed_flag(pcb_true); } else if (strncmp(arg, "auto=", 5) == 0) { @@ -673,7 +673,7 @@ rnd_message(PCB_MSG_ERROR, "Need an attribute name=value\n", arg+1); return 1; } - key = pcb_strdup(arg); + key = rnd_strdup(arg); val = strchr(key, '='); if (val != NULL) { *val = '\0'; @@ -752,7 +752,7 @@ } else if (strncmp(arg, "name=", 5) == 0) { interactive = 0; - ret |= pcb_layergrp_rename_(g, pcb_strdup(arg+5), 1); + ret |= pcb_layergrp_rename_(g, rnd_strdup(arg+5), 1); pcb_board_set_changed_flag(pcb_true); } else if (strncmp(arg, "type=", 5) == 0) { @@ -783,7 +783,7 @@ RND_ACT_IRES(1); return 0; } - key = pcb_strdup(arg); + key = rnd_strdup(arg); val = strchr(key, '='); if (val != NULL) { *val = '\0'; @@ -906,11 +906,11 @@ pcb_layer_id_t lid; if (spurp != NULL) - pcb_layergrp_set_purpose__(g, pcb_strdup(spurp), 1); + pcb_layergrp_set_purpose__(g, rnd_strdup(spurp), 1); free(g->name); if (name != NULL) - g->name = pcb_strdup(name); + g->name = rnd_strdup(name); else g->name = pcb_strdup_printf("%s%s%s", sloc == NULL ? "" : sloc, sloc == NULL ? "" : "-", stype); g->ltype = ltype | lloc; @@ -921,7 +921,7 @@ pcb_layergrp_undoable_created(g); if (attr != NULL) { - char *attrs = pcb_strdup(attr), *curr, *next, *val; + char *attrs = rnd_strdup(attr), *curr, *next, *val; for(curr = attrs; curr != NULL; curr = next) { next = strchr(curr, ';'); if (next != NULL) { @@ -955,7 +955,7 @@ } if (name != NULL) { free((char *)ly->name); - ly->name = pcb_strdup(name); + ly->name = rnd_strdup(name); } } else @@ -1040,7 +1040,7 @@ RND_ACT_IRES(0); RND_PCB_ACT_CONVARG(1, FGW_STR, selectlayer, name = argv[1].val.str); - if (pcb_strcasecmp(name, "silk") == 0) { + if (rnd_strcasecmp(name, "silk") == 0) { PCB->RatDraw = 0; if (pcb_layer_list(PCB, PCB_LYT_VISIBLE_SIDE() | PCB_LYT_SILK, &lid, 1) > 0) { pcb_layervis_change_group_vis(RND_ACT_HIDLIB, lid, 1, 1); @@ -1133,7 +1133,7 @@ RND_PCB_ACT_CONVARG(1, FGW_STR, toggleview, name = argv[1].val.str); RND_ACT_IRES(0); - if (pcb_strcasecmp(name, "all") == 0) { + if (rnd_strcasecmp(name, "all") == 0) { pcb_bool_op_t open = PCB_BOOL_PRESERVE, vis = PCB_BOOL_PRESERVE, user = PCB_BOOL_PRESERVE; const char *cmd, *suser; RND_PCB_ACT_CONVARG(2, FGW_STR, toggleview, cmd = argv[2].val.str); @@ -1142,9 +1142,9 @@ user = pcb_str2boolop(suser); if (user == PCB_BOOL_INVALID) RND_ACT_FAIL(toggleview); - if (pcb_strcasecmp(cmd, "open") == 0) + if (rnd_strcasecmp(cmd, "open") == 0) open = user; - else if (pcb_strcasecmp(cmd, "vis") == 0) + else if (rnd_strcasecmp(cmd, "vis") == 0) vis = user; else RND_ACT_FAIL(toggleview); @@ -1153,18 +1153,18 @@ pcb_event(RND_ACT_HIDLIB, PCB_EVENT_LAYERVIS_CHANGED, NULL); return 0; } - else if (pcb_strcasecmp(name, "silk") == 0) { + else if (rnd_strcasecmp(name, "silk") == 0) { if (pcb_layer_list(PCB, PCB_LYT_VISIBLE_SIDE() | PCB_LYT_SILK, &lid, 1) > 0) pcb_layervis_change_group_vis(RND_ACT_HIDLIB, lid, -1, 0); else rnd_message(PCB_MSG_ERROR, "Can't find this-side silk layer\n"); } - else if ((pcb_strcasecmp(name, "padstacks") == 0) || (pcb_strcasecmp(name, "vias") == 0) || (pcb_strcasecmp(name, "pins") == 0) || (pcb_strcasecmp(name, "pads") == 0)) { + else if ((rnd_strcasecmp(name, "padstacks") == 0) || (rnd_strcasecmp(name, "vias") == 0) || (rnd_strcasecmp(name, "pins") == 0) || (rnd_strcasecmp(name, "pads") == 0)) { PCB->pstk_on = !PCB->pstk_on; pcb_gui->invalidate_all(pcb_gui); pcb_event(RND_ACT_HIDLIB, PCB_EVENT_LAYERVIS_CHANGED, NULL); } - else if (pcb_strcasecmp(name, "BackSide") == 0) { + else if (rnd_strcasecmp(name, "BackSide") == 0) { PCB->InvisibleObjectsOn = !PCB->InvisibleObjectsOn; pcb_gui->invalidate_all(pcb_gui); pcb_event(RND_ACT_HIDLIB, PCB_EVENT_LAYERVIS_CHANGED, NULL); Index: trunk/src/hid_cam.c =================================================================== --- trunk/src/hid_cam.c (revision 30941) +++ trunk/src/hid_cam.c (revision 30942) @@ -270,7 +270,7 @@ return 0; dst->pcb = pcb; - dst->inst = pcb_strdup(src); + dst->inst = rnd_strdup(src); layervis_save_and_reset(dst); @@ -382,7 +382,7 @@ int spc = sizeof(spk) / sizeof(spk[0]); pcb_xform_t *dummy; - tmp = pcb_strdup(start); + tmp = rnd_strdup(start); end = pcb_parse_layergrp_address(start, spk, spv, &spc); if ((end != NULL) && (*end != '\0')) rnd_message(PCB_MSG_ERROR, "global exporter --cam takes only one set of global supplements\n"); @@ -394,7 +394,7 @@ } - dst->fn_template = pcb_strdup(src); + dst->fn_template = rnd_strdup(src); eq = strchr(dst->fn_template, '='); if (eq != NULL) *eq = '\0'; @@ -502,7 +502,7 @@ if ((cam->fn_last == NULL) || (strcmp(cam->fn, cam->fn_last) != 0)) { cam->fn_changed = 1; free(cam->fn_last); - cam->fn_last = pcb_strdup(cam->fn); + cam->fn_last = rnd_strdup(cam->fn); } else cam->fn_changed = 0; Index: trunk/src/layer.c =================================================================== --- trunk/src/layer.c (revision 30941) +++ trunk/src/layer.c (revision 30942) @@ -495,7 +495,7 @@ for(n = 0; n < PCB_MAX_LAYER; n++) { if (pcb->Data->Layer[n].name != NULL) free((char *)pcb->Data->Layer[n].name); - pcb->Data->Layer[n].name = pcb_strdup(""); + pcb->Data->Layer[n].name = rnd_strdup(""); pcb->Data->Layer[n].meta.real.grp = -1; pcb->Data->Layer[n].Attributes.post_change = layer_post_change; } @@ -533,7 +533,7 @@ } layer_clear(&pcb->Data->Layer[id]); - pcb->Data->Layer[id].name = pcb_strdup(lname); + pcb->Data->Layer[id].name = rnd_strdup(lname); /* add layer to group */ if (grp >= 0) { @@ -626,7 +626,7 @@ int pcb_layer_rename(pcb_data_t *data, pcb_layer_id_t layer, const char *lname, rnd_bool undoable) { - return pcb_layer_rename_(&data->Layer[layer], pcb_strdup(lname), undoable); + return pcb_layer_rename_(&data->Layer[layer], rnd_strdup(lname), undoable); } /*** undoable layer recolor ***/ @@ -773,7 +773,7 @@ memset(lp, 0, sizeof(pcb_layer_t)); lp->meta.real.grp = gid; lp->meta.real.vis = 1; - lp->name = pcb_strdup("New Layer"); + lp->name = rnd_strdup("New Layer"); lp->meta.real.color = *pcb_layer_default_color(idx, (gid >= 0) ? pcb->LayerGroups.grp[gid].ltype : 0); if ((gid >= 0) && (pcb->LayerGroups.grp[gid].len == 0)) { /*When adding the first layer in a group, set up comb flags automatically */ switch((pcb->LayerGroups.grp[gid].ltype) & PCB_LYT_ANYTHING) { @@ -1171,12 +1171,12 @@ dst->meta.bound.type = pcb_layergrp_flags(pcb, src->meta.real.grp); if (src->name != NULL) - dst->name = pcb_strdup(src->name); + dst->name = rnd_strdup(src->name); else dst->name = NULL; if ((grp != NULL) && (grp->purpose != NULL)) - dst->meta.bound.purpose = pcb_strdup(grp->purpose); + dst->meta.bound.purpose = rnd_strdup(grp->purpose); else dst->meta.bound.purpose = NULL; @@ -1199,7 +1199,7 @@ if ((s1 != NULL) && (s2 != NULL)) { if (strcmp(s1, s2) == 0) score += 4; - else if (pcb_strcasecmp(s1, s2) == 0) + else if (rnd_strcasecmp(s1, s2) == 0) score += 2; } @@ -1269,12 +1269,12 @@ memset(lay, 0, sizeof(pcb_layer_t)); lay->is_bound = 1; - lay->name = pcb_strdup(name); + lay->name = rnd_strdup(name); lay->meta.bound.type = type; if (purpose == NULL) lay->meta.bound.purpose = NULL; else - lay->meta.bound.purpose = pcb_strdup(purpose); + lay->meta.bound.purpose = rnd_strdup(purpose); lay->parent.data = data; lay->parent_type = PCB_PARENT_DATA; lay->type = PCB_OBJ_LAYER; @@ -1402,7 +1402,7 @@ for(nt = pcb_layer_type_names; nt->name != NULL; nt++) { - if (pcb_strncasecmp(nt->name, curr, len) == 0) { + if (rnd_strncasecmp(nt->name, curr, len) == 0) { *lyt |= nt->type; goto done; } @@ -1409,7 +1409,7 @@ } for(nc = pcb_layer_comb_names; nc->name != NULL; nc++) { - if (pcb_strncasecmp(nc->name, curr, len) == 0) { + if (rnd_strncasecmp(nc->name, curr, len) == 0) { got_lyc = 1; *lyc |= nc->type; goto done; @@ -1416,7 +1416,7 @@ } } - if ((pcb_strncasecmp("pos", curr, len) == 0) || (pcb_strncasecmp("add", curr, len) == 0)) { + if ((rnd_strncasecmp("pos", curr, len) == 0) || (rnd_strncasecmp("add", curr, len) == 0)) { got_lyc = 1; *lyc &= ~PCB_LYC_SUB; goto done; @@ -1497,11 +1497,11 @@ const pcb_menu_layers_t *ml; for(ml = pcb_menu_layers; ml->name != NULL; ml++) - if (pcb_strcasecmp(name_or_abbrev, ml->abbrev) == 0) + if (rnd_strcasecmp(name_or_abbrev, ml->abbrev) == 0) return ml; for(ml = pcb_menu_layers; ml->name != NULL; ml++) - if (pcb_strcasecmp(name_or_abbrev, ml->name) == 0) + if (rnd_strcasecmp(name_or_abbrev, ml->name) == 0) return ml; return NULL; Index: trunk/src/layer_addr.c =================================================================== --- trunk/src/layer_addr.c (revision 30941) +++ trunk/src/layer_addr.c (revision 30942) @@ -307,7 +307,7 @@ } if (*str == '&') { str++; - if (pcb_strcasecmp(str, "current") == 0) + if (rnd_strcasecmp(str, "current") == 0) return PCB_CURRLID(pcb); } return -1; @@ -389,7 +389,7 @@ pcb_layergrp_id_t gids[PCB_MAX_LAYERGRP]; if (strchr(str, '(') != NULL) { - curr = tmp = pcb_strdup(str); + curr = tmp = rnd_strdup(str); spc = sizeof(spk) / sizeof(spk[0]); end = pcb_parse_layergrp_address(tmp, spk, spv, &spc); if (end != NULL) { Index: trunk/src/layer_grp.c =================================================================== --- trunk/src/layer_grp.c (revision 30941) +++ trunk/src/layer_grp.c (revision 30942) @@ -174,10 +174,10 @@ ng = pcb_layergrp_insert_after(pcb, after); if (og->name != NULL) - ng->name = pcb_strdup(og->name); + ng->name = rnd_strdup(og->name); ng->ltype = og->ltype; if (og->purpose != NULL) - ng->purpose = pcb_strdup(og->purpose); + ng->purpose = rnd_strdup(og->purpose); ng->purpi = og->purpi; ng->valid = ng->open = ng->vis = 1; pcb_layergrp_setup(ng, pcb); @@ -351,8 +351,8 @@ int newv; if ((value == NULL) || (*value == '\0')) return; - if ((pcb_strcasecmp(value, "true") == 0) || (pcb_strcasecmp(value, "yes") == 0) || (pcb_strcasecmp(value, "on") == 0) || (strcmp(value, "1") == 0)) newv = 1; - else if ((pcb_strcasecmp(value, "false") == 0) || (pcb_strcasecmp(value, "no") == 0) || (pcb_strcasecmp(value, "off") == 0) || (strcmp(value, "0") == 0)) newv = 0; + if ((rnd_strcasecmp(value, "true") == 0) || (rnd_strcasecmp(value, "yes") == 0) || (rnd_strcasecmp(value, "on") == 0) || (strcmp(value, "1") == 0)) newv = 1; + else if ((rnd_strcasecmp(value, "false") == 0) || (rnd_strcasecmp(value, "no") == 0) || (rnd_strcasecmp(value, "off") == 0) || (strcmp(value, "0") == 0)) newv = 0; else { rnd_message(PCB_MSG_ERROR, "unrecognized value '%s' of layer group %s's init-invis attribute", value, g->name == NULL ? "" : g->name); return; @@ -377,7 +377,7 @@ stack->len += room; - stack->grp[bl].name = pcb_strdup("Intern"); + stack->grp[bl].name = rnd_strdup("Intern"); stack->grp[bl].ltype = PCB_LYT_INTERN | PCB_LYT_COPPER; pcb_layergrp_setup(&stack->grp[bl], pcb); bl++; @@ -762,12 +762,12 @@ g->ltype &= ~PCB_LYT_COPPER; g->ltype &= ~(PCB_LYT_ANYWHERE); free(g->name); - g->name = pcb_strdup("global_outline"); - pcb_layergrp_set_purpose__(g, pcb_strdup("uroute"), 0); + g->name = rnd_strdup("global_outline"); + pcb_layergrp_set_purpose__(g, rnd_strdup("uroute"), 0); } -#define LAYER_IS_OUTLINE(idx) ((pcb->Data->Layer[idx].name != NULL) && ((strcmp(pcb->Data->Layer[idx].name, "route") == 0 || pcb_strcasecmp(pcb->Data->Layer[(idx)].name, "outline") == 0))) +#define LAYER_IS_OUTLINE(idx) ((pcb->Data->Layer[idx].name != NULL) && ((strcmp(pcb->Data->Layer[idx].name, "route") == 0 || rnd_strcasecmp(pcb->Data->Layer[(idx)].name, "outline") == 0))) void pcb_layergrp_fix_old_outline_detect(pcb_board_t *pcb, pcb_layergrp_t *g) { @@ -959,7 +959,7 @@ g = &(newg->grp[newg->len]); \ pcb_layergrp_setup(g, pcb); \ if (gname != NULL) \ - g->name = pcb_strdup(gname); \ + g->name = rnd_strdup(gname); \ else \ g->name = NULL; \ g->ltype = flags; \ @@ -1062,7 +1062,7 @@ { pcb_layergrp_t *grp = pcb_get_layergrp(pcb, gid); if (grp == NULL) return -1; - return pcb_layergrp_rename_(grp, pcb_strdup(name), undoable); + return pcb_layergrp_rename_(grp, rnd_strdup(name), undoable); } /*** undoable set-purpose ***/ @@ -1149,7 +1149,7 @@ int pcb_layergrp_set_purpose(pcb_layergrp_t *lg, const char *purpose, rnd_bool undoable) { - return pcb_layergrp_set_purpose_(lg, pcb_strdup(purpose), undoable); + return pcb_layergrp_set_purpose_(lg, rnd_strdup(purpose), undoable); } /*** undoable flags/type set ***/ @@ -1275,7 +1275,7 @@ if ((g0->ltype & PCB_LYT_COPPER) && (g1->ltype & PCB_LYT_COPPER)) { pcb_layergrp_t *ng = pcb_layergrp_insert_after(pcb, g); ng->ltype = PCB_LYT_INTERN | PCB_LYT_SUBSTRATE; - ng->name = pcb_strdup("implicit_subst"); + ng->name = rnd_strdup("implicit_subst"); pcb_layergrp_setup(ng, pcb); } } @@ -1313,9 +1313,9 @@ pcb_layer_id_t nlid; pcb_layer_t *nly; grp->ltype = PCB_LYT_BOUNDARY; - grp->name = pcb_strdup("outline"); + grp->name = rnd_strdup("outline"); if (ly->meta.bound.purpose != NULL) - pcb_layergrp_set_purpose__(grp, pcb_strdup(ly->meta.bound.purpose), 0); + pcb_layergrp_set_purpose__(grp, rnd_strdup(ly->meta.bound.purpose), 0); nlid = pcb_layer_create(pcb, pcb_layergrp_id(pcb, grp), ly->name, 0); nly = pcb_get_layer(pcb->Data, nlid); if (nly != NULL) @@ -1366,13 +1366,13 @@ if (offs < 0) offs = existing_intern + offs + 1; if ((offs == int_ofs) && (ly->name != NULL)) { - pcb->LayerGroups.grp[n].name = pcb_strdup("internal"); + pcb->LayerGroups.grp[n].name = rnd_strdup("internal"); pcb_layer_create(pcb, n, ly->name, 0); goto found; } } } - pcb->LayerGroups.grp[n].name = pcb_strdup("anon-recipe"); + pcb->LayerGroups.grp[n].name = rnd_strdup("anon-recipe"); found:; } } @@ -1386,7 +1386,7 @@ pcb_layergrp_t *grp = pcb_get_grp_new_misc(pcb); if (grp != NULL) { grp->ltype = ly->meta.bound.type; - grp->name = pcb_strdup(ly->name); + grp->name = rnd_strdup(ly->name); pcb_layer_create(pcb, pcb_layergrp_id(pcb, grp), ly->name, 0); pcb_layer_resolve_binding(pcb, ly); } @@ -1481,13 +1481,13 @@ if (lyname == NULL) lyname = src->name; - grp->name = pcb_strdup(grname); + grp->name = rnd_strdup(grname); grp->ltype = src->lyt; free(grp->purpose); grp->purpose = NULL; if (src->purpose != NULL) - pcb_layergrp_set_purpose__(grp, pcb_strdup(src->purpose), 1); + pcb_layergrp_set_purpose__(grp, rnd_strdup(src->purpose), 1); if (grp->len == 0) { pcb_layer_id_t lid = pcb_layer_create(pcb, gid, lyname, 0); Index: trunk/src/layer_ui.c =================================================================== --- trunk/src/layer_ui.c (revision 30941) +++ trunk/src/layer_ui.c (revision 30942) @@ -64,7 +64,7 @@ found:; l->meta.real.cookie = cookie; l->meta.real.color = *color; - l->name = pcb_strdup(name); + l->name = rnd_strdup(name); l->meta.real.vis = 1; l->parent_type = PCB_PARENT_UI; l->parent.any = NULL; Index: trunk/src/librnd/core/actions.c =================================================================== --- trunk/src/librnd/core/actions.c (revision 30941) +++ trunk/src/librnd/core/actions.c (revision 30942) @@ -558,7 +558,7 @@ { if (val == NULL) val = ""; - vtp0_append(&cli_stack, pcb_strdup(val)); + vtp0_append(&cli_stack, rnd_strdup(val)); } static char *cli_pop(void) @@ -703,12 +703,12 @@ if (end == NULL) { /* optimization: string doesn't contain newline - pass it as is to save an strdup */ args[1].type = FGW_STR; - args[1].val.str = pcb_strdup(str_); + args[1].val.str = rnd_strdup(str_); } else { /* string contains a newline; need to cut there, which needs a dup; let fungw free it as dynamic string, cleaning up args after the fungw call */ args[1].type = FGW_STR | FGW_DYN; - args[1].val.str = pcb_strdup(str_); + args[1].val.str = rnd_strdup(str_); args[1].val.str[end - str_] = '\0'; } Index: trunk/src/librnd/core/attrib.c =================================================================== --- trunk/src/librnd/core/attrib.c (revision 30941) +++ trunk/src/librnd/core/attrib.c (revision 30942) @@ -95,7 +95,7 @@ for (i = 0; i < list->Number; i++) { if (strcmp(name, list->List[i].name) == 0) { char *old_value = list->List[i].value; - list->List[i].value = pcb_strdup_null(value); + list->List[i].value = rnd_strdup_null(value); NOTIFY(list, list->List[i].name, list->List[i].value); free(old_value); return 1; @@ -111,8 +111,8 @@ /* Now add the new attribute. */ i = list->Number; - list->List[i].name = pcb_strdup_null(name); - list->List[i].value = pcb_strdup_null(value); + list->List[i].name = rnd_strdup_null(name); + list->List[i].value = rnd_strdup_null(value); list->List[i].cpb_written = 1; NOTIFY(list, list->List[i].name, list->List[i].value); list->Number++; @@ -187,7 +187,7 @@ dst->List[i].cpb_written = 1; if (strcmp(value, dst->List[i].value) != 0) { char *old_value = dst->List[i].value; - dst->List[i].value = pcb_strdup(value); + dst->List[i].value = rnd_strdup(value); NOTIFY(dst, dst->List[i].name, dst->List[i].value); free(old_value); } Index: trunk/src/librnd/core/box.c =================================================================== --- trunk/src/librnd/core/box.c (revision 30941) +++ trunk/src/librnd/core/box.c (revision 30942) @@ -50,8 +50,8 @@ double w = (double)(box->X2 - box->X1) * xfactor / 2.0; double h = (double)(box->Y2 - box->Y1) * yfactor / 2.0; - box->X1 = pcb_round(box->X1 - w); - box->Y1 = pcb_round(box->Y1 - h); - box->X2 = pcb_round(box->X2 + w); - box->Y2 = pcb_round(box->Y2 + h); + box->X1 = rnd_round(box->X1 - w); + box->Y1 = rnd_round(box->Y1 - h); + box->X2 = rnd_round(box->X2 + w); + box->Y2 = rnd_round(box->Y2 + h); } Index: trunk/src/librnd/core/compat_fs.c =================================================================== --- trunk/src/librnd/core/compat_fs.c (revision 30941) +++ trunk/src/librnd/core/compat_fs.c (revision 30942) @@ -225,10 +225,10 @@ #undef TEMPLATE #else /* - * tmpnam() uses a static buffer so pcb_strdup() the result right away + * tmpnam() uses a static buffer so rnd_strdup() the result right away * in case someone decides to create multiple temp names. */ - tmpfile = pcb_strdup(tmpnam(NULL)); + tmpfile = rnd_strdup(tmpnam(NULL)); #endif return tmpfile; #endif @@ -257,7 +257,7 @@ e--; } - dname = pcb_strdup(name); + dname = rnd_strdup(name); dname[e] = '\0'; /* Index: trunk/src/librnd/core/compat_lrealpath.c =================================================================== --- trunk/src/librnd/core/compat_lrealpath.c (revision 30941) +++ trunk/src/librnd/core/compat_lrealpath.c (revision 30942) @@ -78,7 +78,7 @@ const char *rp = realpath(filename, buf); if (rp == NULL) rp = filename; - return pcb_strdup(rp); + return rnd_strdup(rp); } /* REALPATH_LIMIT */ @@ -89,7 +89,7 @@ { char *rp = canonicalize_file_name(filename); if (rp == NULL) - return pcb_strdup(filename); + return rnd_strdup(filename); else return rp; } @@ -120,7 +120,7 @@ if (buf == NULL) return NULL; rp = realpath(filename, buf); - ret = pcb_strdup(rp ? rp : filename); + ret = rnd_strdup(rp ? rp : filename); free(buf); return ret; } @@ -140,18 +140,18 @@ char *basename; DWORD len = GetFullPathName(filename, MAX_PATH, buf, &basename); if (len == 0 || len > MAX_PATH - 1) - return pcb_strdup(filename); + return rnd_strdup(filename); else { /* The file system is case-preserving but case-insensitive, Canonicalize to lowercase, using the codepage associated with the process locale. */ CharLowerBuff(buf, len); - return pcb_strdup(buf); + return rnd_strdup(buf); } } #else /* This system is a lost cause, just duplicate the filename. */ - return pcb_strdup(filename); + return rnd_strdup(filename); #endif } Index: trunk/src/librnd/core/compat_misc.c =================================================================== --- trunk/src/librnd/core/compat_misc.c (revision 30941) +++ trunk/src/librnd/core/compat_misc.c (revision 30942) @@ -41,18 +41,18 @@ use rand(). Later on: scconfig should detect and enable random() if we find a system where it really breaks. */ #ifdef HAVE_RANDOM -long pcb_rand(void) +long rnd_rand(void) { return (long) random(); } #else -long pcb_rand(void) +long rnd_rand(void) { return (long) rand(); } #endif -const char *pcb_get_user_name(void) +const char *rnd_get_user_name(void) { #ifdef RND_HAVE_GETPWUID static struct passwd *pwentry; @@ -81,12 +81,12 @@ #endif } -int pcb_getpid(void) +int rnd_getpid(void) { return getpid(); } -char *pcb_strndup(const char *s, int len) +char *rnd_strndup(const char *s, int len) { int a, l = strlen(s); char *o; @@ -98,7 +98,7 @@ return o; } -char *pcb_strdup(const char *s) +char *rnd_strdup(const char *s) { int l = strlen(s); char *o; @@ -110,7 +110,7 @@ #ifdef RND_HAVE_ROUND #undef round extern double round(double x); -double pcb_round(double x) +double rnd_round(double x) { return round(x); } @@ -117,7 +117,7 @@ #else /* Implementation idea borrowed from an old gcc (GPL'd) */ -double pcb_round(double x) +double rnd_round(double x) { double t; @@ -138,7 +138,7 @@ } #endif -int pcb_strcasecmp(const char *s1, const char *s2) +int rnd_strcasecmp(const char *s1, const char *s2) { while(tolower(*s1) == tolower(*s2)) { if (*s1 == '\0') @@ -149,7 +149,7 @@ return tolower(*s1) - tolower(*s2); } -int pcb_strncasecmp(const char *s1, const char *s2, size_t n) +int rnd_strncasecmp(const char *s1, const char *s2, size_t n) { if (n == 0) return 0; @@ -170,7 +170,7 @@ extern int setenv(); #endif -int pcb_setenv(const char *name, const char *val, int overwrite) +int rnd_setenv(const char *name, const char *val, int overwrite) { #ifdef RND_HAVE_SETENV return setenv(name, val, overwrite); @@ -191,7 +191,7 @@ #endif } -size_t pcb_print_utc(char *out, size_t out_len, time_t when) +size_t rnd_print_utc(char *out, size_t out_len, time_t when) { static const char *fmt = "%Y-%m-%d %H:%M:%S UTC"; if (when <= 0) @@ -200,7 +200,7 @@ return strftime(out, out_len, fmt, gmtime(&when)); } -void pcb_ms_sleep(long ms) +void rnd_ms_sleep(long ms) { #ifdef RND_HAVE_USLEEP usleep(ms*1000); @@ -217,13 +217,13 @@ tv.tv_usec = ms*1000; select(0, &s, &s, &s, &tv); # else -# error pcb_ms_sleep(): no milisecond sleep on this host. +# error rnd_ms_sleep(): no milisecond sleep on this host. # endif # endif #endif } -void pcb_ltime(unsigned long *secs, unsigned long *usecs) +void rnd_ltime(unsigned long *secs, unsigned long *usecs) { struct timeval tv; gettimeofday(&tv, NULL); @@ -232,15 +232,15 @@ *usecs = tv.tv_usec; } -double pcb_dtime(void) +double rnd_dtime(void) { unsigned long s, u; - pcb_ltime(&s, &u); + rnd_ltime(&s, &u); return (double)u / 1000000.0 + (double)s; } -int pcb_fileno(FILE *f) +int rnd_fileno(FILE *f) { return RND_HOST_FILENO(f); } Index: trunk/src/librnd/core/compat_misc.h =================================================================== --- trunk/src/librnd/core/compat_misc.h (revision 30941) +++ trunk/src/librnd/core/compat_misc.h (revision 30942) @@ -25,8 +25,8 @@ * mailing list: pcb-rnd (at) list.repo.hu (send "subscribe") */ -#ifndef PCB_COMPAT_MISC_H -#define PCB_COMPAT_MISC_H +#ifndef RND_COMPAT_MISC_H +#define RND_COMPAT_MISC_H #include @@ -35,39 +35,40 @@ #include #include -long pcb_rand(void); +long rnd_rand(void); /* Gets the user's real name when available; normally shouldn't be used, - consider using pcb_author() that allows config override */ -const char *pcb_get_user_name(void); + consider using an app-specific function like pcb_author() that + allows config override */ +const char *rnd_get_user_name(void); -int pcb_getpid(void); +int rnd_getpid(void); -char *pcb_strndup(const char *s, int len); -char *pcb_strdup(const char *s); +char *rnd_strndup(const char *s, int len); +char *rnd_strdup(const char *s); -#define pcb_strdup_null(x) (((x) != NULL) ? pcb_strdup (x) : NULL) +#define rnd_strdup_null(x) (((x) != NULL) ? rnd_strdup(x) : NULL) -double pcb_round(double x); +double rnd_round(double x); -int pcb_strcasecmp(const char *s1, const char *s2); -int pcb_strncasecmp(const char *s1, const char *s2, size_t n); +int rnd_strcasecmp(const char *s1, const char *s2); +int rnd_strncasecmp(const char *s1, const char *s2, size_t n); -int pcb_setenv(const char *name, const char *val, int overwrite); +int rnd_setenv(const char *name, const char *val, int overwrite); /* Print a date in UTC; if when is 0, print current date */ -size_t pcb_print_utc(char *out, size_t out_len, time_t when); +size_t rnd_print_utc(char *out, size_t out_len, time_t when); /* Sleep for the specified number if miliseconds */ -void pcb_ms_sleep(long ms); +void rnd_ms_sleep(long ms); /* Return system time (local, time zoned) in seconds and microseconds since epoch. (gettimeofday() wrapper) */ -void pcb_ltime(unsigned long *secs, unsigned long *usecs); +void rnd_ltime(unsigned long *secs, unsigned long *usecs); /* Return system time (local, time zoned) since epoch. (gettimeofday() wrapper) */ -double pcb_dtime(void); +double rnd_dtime(void); -int pcb_fileno(FILE *f); +int rnd_fileno(FILE *f); -#endif /* PCB_COMPAT_MISC_H */ +#endif /* RND_COMPAT_MISC_H */ Index: trunk/src/librnd/core/conf.c =================================================================== --- trunk/src/librnd/core/conf.c (revision 30941) +++ trunk/src/librnd/core/conf.c (revision 30942) @@ -326,17 +326,17 @@ conf_native_type_t pcb_conf_native_type_parse(const char *s) { - if (pcb_strcasecmp(s, "string") == 0) return CFN_STRING; - if (pcb_strcasecmp(s, "str") == 0) return CFN_STRING; - if (pcb_strcasecmp(s, "boolean") == 0) return CFN_BOOLEAN; - if (pcb_strcasecmp(s, "bool") == 0) return CFN_BOOLEAN; - if (pcb_strcasecmp(s, "integer") == 0) return CFN_INTEGER; - if (pcb_strcasecmp(s, "real") == 0) return CFN_REAL; - if (pcb_strcasecmp(s, "coord") == 0) return CFN_COORD; - if (pcb_strcasecmp(s, "unit") == 0) return CFN_UNIT; - if (pcb_strcasecmp(s, "color") == 0) return CFN_COLOR; - if (pcb_strcasecmp(s, "list") == 0) return CFN_LIST; - if (pcb_strcasecmp(s, "hlist") == 0) return CFN_HLIST; + if (rnd_strcasecmp(s, "string") == 0) return CFN_STRING; + if (rnd_strcasecmp(s, "str") == 0) return CFN_STRING; + if (rnd_strcasecmp(s, "boolean") == 0) return CFN_BOOLEAN; + if (rnd_strcasecmp(s, "bool") == 0) return CFN_BOOLEAN; + if (rnd_strcasecmp(s, "integer") == 0) return CFN_INTEGER; + if (rnd_strcasecmp(s, "real") == 0) return CFN_REAL; + if (rnd_strcasecmp(s, "coord") == 0) return CFN_COORD; + if (rnd_strcasecmp(s, "unit") == 0) return CFN_UNIT; + if (rnd_strcasecmp(s, "color") == 0) return CFN_COLOR; + if (rnd_strcasecmp(s, "list") == 0) return CFN_LIST; + if (rnd_strcasecmp(s, "hlist") == 0) return CFN_HLIST; return CFN_max; } @@ -344,10 +344,10 @@ conf_policy_t pcb_conf_policy_parse(const char *s) { - if (pcb_strcasecmp(s, "overwrite") == 0) return POL_OVERWRITE; - if (pcb_strcasecmp(s, "prepend") == 0) return POL_PREPEND; - if (pcb_strcasecmp(s, "append") == 0) return POL_APPEND; - if (pcb_strcasecmp(s, "disable") == 0) return POL_DISABLE; + if (rnd_strcasecmp(s, "overwrite") == 0) return POL_OVERWRITE; + if (rnd_strcasecmp(s, "prepend") == 0) return POL_PREPEND; + if (rnd_strcasecmp(s, "append") == 0) return POL_APPEND; + if (rnd_strcasecmp(s, "disable") == 0) return POL_DISABLE; return POL_invalid; } @@ -365,14 +365,14 @@ conf_role_t pcb_conf_role_parse(const char *s) { - if (pcb_strcasecmp(s, "internal") == 0) return CFR_INTERNAL; - if (pcb_strcasecmp(s, "system") == 0) return CFR_SYSTEM; - if (pcb_strcasecmp(s, "defaultpcb") == 0) return CFR_DEFAULTPCB; - if (pcb_strcasecmp(s, "user") == 0) return CFR_USER; - if (pcb_strcasecmp(s, "env") == 0) return CFR_ENV; - if (pcb_strcasecmp(s, "project") == 0) return CFR_PROJECT; - if (pcb_strcasecmp(s, "design") == 0) return CFR_DESIGN; - if (pcb_strcasecmp(s, "cli") == 0) return CFR_CLI; + if (rnd_strcasecmp(s, "internal") == 0) return CFR_INTERNAL; + if (rnd_strcasecmp(s, "system") == 0) return CFR_SYSTEM; + if (rnd_strcasecmp(s, "defaultpcb") == 0) return CFR_DEFAULTPCB; + if (rnd_strcasecmp(s, "user") == 0) return CFR_USER; + if (rnd_strcasecmp(s, "env") == 0) return CFR_ENV; + if (rnd_strcasecmp(s, "project") == 0) return CFR_PROJECT; + if (rnd_strcasecmp(s, "design") == 0) return CFR_DESIGN; + if (rnd_strcasecmp(s, "cli") == 0) return CFR_CLI; return CFR_invalid; } @@ -521,12 +521,12 @@ case CFN_BOOLEAN: while(isspace(*text)) text++; for(s = strue; *s != NULL; s++) - if (pcb_strncasecmp(*s, text, strlen(*s)) == 0) { + if (rnd_strncasecmp(*s, text, strlen(*s)) == 0) { dst->boolean[idx] = 1; return 0; } for(s = sfalse; *s != NULL; s++) - if (pcb_strncasecmp(*s, text, strlen(*s)) == 0) { + if (rnd_strncasecmp(*s, text, strlen(*s)) == 0) { dst->boolean[idx] = 0; return 0; } @@ -1079,7 +1079,7 @@ n = pcb_conf_get_field(path); if (n == NULL) { char *path_, *field; - path_ = pcb_strdup(path); + path_ = rnd_strdup(path); /* It might be an array element - truncate */ field = strrchr(path_, '['); @@ -1226,7 +1226,7 @@ } else { /* lihata syntax differs from conf syntax in array indexing */ - pc = pcb_strdup(path); + pc = rnd_strdup(path); pc[end-path] = '/'; end = strchr(pc+(end-path), ']'); if (end != NULL) @@ -1410,7 +1410,7 @@ if (mkdirp) pcb_conf_lht_get_first_pol(target, pol, 1); - path = pcb_strdup(path_); + path = rnd_strdup(path_); sidx = strrchr(path, '['); if (sidx != NULL) { char *end; @@ -1604,7 +1604,7 @@ if (cwd->data.text.value != NULL) free(cwd->data.text.value); - cwd->data.text.value = pcb_strdup(new_val); + cwd->data.text.value = rnd_strdup(new_val); cwd->file_name = pcb_conf_main_root[target]->active_file; } else @@ -1656,7 +1656,7 @@ if (node->data.text.value != NULL) free(node->data.text.value); - node->data.text.value = pcb_strdup(new_val); + node->data.text.value = rnd_strdup(new_val); return 0; } @@ -1671,7 +1671,7 @@ if (prefix != NULL) { for(sc = arg_; (*sc != '=') && (*sc != '\0'); sc++) if (*sc == '/') - arg = pcb_strdup(arg_); /* full path, don't use prefix */ + arg = rnd_strdup(arg_); /* full path, don't use prefix */ if (arg == NULL) { /* insert prefix */ int pl = strlen(prefix), al = strlen(arg_); @@ -1683,7 +1683,7 @@ } } else - arg = pcb_strdup(arg_); + arg = rnd_strdup(arg_); /* replace any - with _ in the path part; cli accepts dash but the backing C struct field names don't */ @@ -1826,7 +1826,7 @@ for(it = pcb_conflist_first(n->val.list); it != NULL; it = pcb_conflist_next(it)) { lht_node_t *txt; txt = lht_dom_node_alloc(LHT_TEXT, ""); - txt->data.text.value = pcb_strdup(it->payload); + txt->data.text.value = rnd_strdup(it->payload); lht_dom_list_append(ch, txt); } } @@ -1914,7 +1914,7 @@ char *path = NULL, *end; if (efn != NULL) - path = pcb_strdup(efn); + path = rnd_strdup(efn); else path = pcb_build_fn(hidlib, fn); Index: trunk/src/librnd/core/conf_act.c =================================================================== --- trunk/src/librnd/core/conf_act.c (revision 30941) +++ trunk/src/librnd/core/conf_act.c (revision 30942) @@ -307,9 +307,9 @@ } pcb_grid_inval(); if (val[0] == '*') - pcb_hidlib_set_grid(RND_ACT_HIDLIB, pcb_round(RND_ACT_HIDLIB->grid * d), pcb_false, 0, 0); + pcb_hidlib_set_grid(RND_ACT_HIDLIB, rnd_round(RND_ACT_HIDLIB->grid * d), pcb_false, 0, 0); else - pcb_hidlib_set_grid(RND_ACT_HIDLIB, pcb_round(RND_ACT_HIDLIB->grid / d), pcb_false, 0, 0); + pcb_hidlib_set_grid(RND_ACT_HIDLIB, rnd_round(RND_ACT_HIDLIB->grid / d), pcb_false, 0, 0); return 0; } Index: trunk/src/librnd/core/conf_regfile.c =================================================================== --- trunk/src/librnd/core/conf_regfile.c (revision 30941) +++ trunk/src/librnd/core/conf_regfile.c (revision 30942) @@ -52,7 +52,7 @@ if (!conf_files_inited) conf_files_init(); e = htsi_getentry(&conf_files, path); if (e == NULL) - htsi_set(&conf_files, pcb_strdup(path), 1); + htsi_set(&conf_files, rnd_strdup(path), 1); else e->value++; e = htsi_getentry(&conf_interns, intern); Index: trunk/src/librnd/core/error.c =================================================================== --- trunk/src/librnd/core/error.c (revision 30941) +++ trunk/src/librnd/core/error.c (revision 30942) @@ -209,7 +209,7 @@ rnd_PCB_ACT_MAY_CONVARG(1, FGW_STR, Log, op = argv[1].val.str); - if (pcb_strcasecmp(op, "Clear") == 0) { + if (rnd_strcasecmp(op, "Clear") == 0) { unsigned long from = -1, to = -1; rnd_PCB_ACT_MAY_CONVARG(2, FGW_ULONG, Log, from = fgw_keyword(&argv[2])); rnd_PCB_ACT_MAY_CONVARG(3, FGW_ULONG, Log, from = fgw_keyword(&argv[3])); @@ -217,7 +217,7 @@ pcb_event(NULL, PCB_EVENT_LOG_CLEAR, "pp", &from, &to); ret = 0; } - else if (pcb_strcasecmp(op, "Export") == 0) { + else if (rnd_strcasecmp(op, "Export") == 0) { const char *fmts[] = { "text", "lihata", NULL }; pcb_hid_dad_subdialog_t fmtsub; char *fn; Index: trunk/src/librnd/core/file_loaded.c =================================================================== --- trunk/src/librnd/core/file_loaded.c (revision 30941) +++ trunk/src/librnd/core/file_loaded.c (revision 30942) @@ -41,7 +41,7 @@ if ((cat == NULL) && (alloc)) { cat = calloc(sizeof(pcb_file_loaded_t), 1); cat->type = PCB_FLT_CATEGORY; - cat->name = pcb_strdup(name); + cat->name = rnd_strdup(name); htsp_init(&cat->data.category.children, strhash, strkeyeq); htsp_set(&pcb_file_loaded, cat->name, cat); } @@ -91,16 +91,16 @@ else { file = malloc(sizeof(pcb_file_loaded_t)); file->type = PCB_FLT_FILE; - file->name = pcb_strdup(name); + file->name = rnd_strdup(name); htsp_set(&cat->data.category.children, file->name, file); } if (path != NULL) - file->data.file.path = pcb_strdup(path); + file->data.file.path = rnd_strdup(path); else file->data.file.path = NULL; if (desc != NULL) - file->data.file.desc = pcb_strdup(desc); + file->data.file.desc = rnd_strdup(desc); else file->data.file.desc = NULL; return 0; Index: trunk/src/librnd/core/funchash.c =================================================================== --- trunk/src/librnd/core/funchash.c (revision 30941) +++ trunk/src/librnd/core/funchash.c (revision 30942) @@ -47,7 +47,7 @@ const fh_key_t *a = a_, *b = b_; if (a->cookie != b->cookie) return 1; - return !pcb_strcasecmp(a->key, b->key); + return !rnd_strcasecmp(a->key, b->key); } static unsigned fh_hash(const void *key) Index: trunk/src/librnd/core/grid.c =================================================================== --- trunk/src/librnd/core/grid.c (revision 30941) +++ trunk/src/librnd/core/grid.c (revision 30942) @@ -48,7 +48,7 @@ rnd_coord_t pcb_grid_fit(rnd_coord_t x, rnd_coord_t grid_spacing, rnd_coord_t grid_offset) { x -= grid_offset; - x = grid_spacing * pcb_round((double) x / grid_spacing); + x = grid_spacing * rnd_round((double) x / grid_spacing); x += grid_offset; return x; } @@ -67,7 +67,7 @@ /* remember where size starts */ while(isspace(*src)) src++; - sep = size = tmp = pcb_strdup(src); + sep = size = tmp = rnd_strdup(src); /* find optional offs */ sep2 = strchr(sep, '@'); @@ -126,7 +126,7 @@ free(tmp); if (nsep != NULL) - dst->name = pcb_strndup(src, nsep-src-1); + dst->name = rnd_strndup(src, nsep-src-1); else dst->name = NULL; return pcb_true; Index: trunk/src/librnd/core/gui_act.c =================================================================== --- trunk/src/librnd/core/gui_act.c (revision 30941) +++ trunk/src/librnd/core/gui_act.c (revision 30942) @@ -114,11 +114,11 @@ const char *cmd = NULL; rnd_PCB_ACT_MAY_CONVARG(1, FGW_STR, FullScreen, cmd = argv[1].val.str); - if ((cmd == NULL) || (pcb_strcasecmp(cmd, "Toggle") == 0)) + if ((cmd == NULL) || (rnd_strcasecmp(cmd, "Toggle") == 0)) pcb_conf_setf(CFR_DESIGN, "editor/fullscreen", -1, "%d", !pcbhl_conf.editor.fullscreen, POL_OVERWRITE); - else if (pcb_strcasecmp(cmd, "On") == 0) + else if (rnd_strcasecmp(cmd, "On") == 0) pcb_conf_set(CFR_DESIGN, "editor/fullscreen", -1, "1", POL_OVERWRITE); - else if (pcb_strcasecmp(cmd, "Off") == 0) + else if (rnd_strcasecmp(cmd, "Off") == 0) pcb_conf_set(CFR_DESIGN, "editor/fullscreen", -1, "0", POL_OVERWRITE); else RND_ACT_FAIL(FullScreen); @@ -180,7 +180,7 @@ RND_ACT_FAIL(Cursor); } - if (pcb_strcasecmp(a3, "grid") == 0) { + if (rnd_strcasecmp(a3, "grid") == 0) { char *end; dx = strtod(a1, &end) * pcbhl_conf.editor.grid; dy = strtod(a2, &end) * pcbhl_conf.editor.grid; @@ -190,7 +190,7 @@ dy = pcb_get_value_ex(a2, a3, NULL, extra_units_y, "", NULL); } - if (pcb_strcasecmp(a3, "view") == 0) { + if (rnd_strcasecmp(a3, "view") == 0) { if ((pcb_gui != NULL) && (pcb_gui->view_get != NULL)) { rnd_box_t viewbox; pcb_gui->view_get(pcb_gui, &viewbox); Index: trunk/src/librnd/core/hid_attrib.c =================================================================== --- trunk/src/librnd/core/hid_attrib.c (revision 30941) +++ trunk/src/librnd/core/hid_attrib.c (revision 30942) @@ -107,7 +107,7 @@ break; case PCB_HATT_STRING: if (a->value) - *(const char **) a->value = pcb_strdup(PCB_EMPTY(a->default_val.str)); + *(const char **) a->value = rnd_strdup(PCB_EMPTY(a->default_val.str)); break; case PCB_HATT_ENUM: if (a->value) @@ -168,9 +168,9 @@ break; case PCB_HATT_STRING: if (a->value) - *(char **) a->value = pcb_strdup(PCB_EMPTY((*argv)[1])); + *(char **) a->value = rnd_strdup(PCB_EMPTY((*argv)[1])); else - a->default_val.str = pcb_strdup(PCB_EMPTY((*argv)[1])); + a->default_val.str = rnd_strdup(PCB_EMPTY((*argv)[1])); (*argc)--; (*argv)++; break; Index: trunk/src/librnd/core/hid_cfg.c =================================================================== --- trunk/src/librnd/core/hid_cfg.c (revision 30941) +++ trunk/src/librnd/core/hid_cfg.c (revision 30942) @@ -274,7 +274,7 @@ continue; if (strncmp(cname, "li:", 3) == 0) { - char *start, *s, *tmp = pcb_strdup(cval); + char *start, *s, *tmp = rnd_strdup(cval); li = lht_dom_node_alloc(LHT_LIST, cname+3); for(s = start = tmp; *s != '\0'; s++) { @@ -286,7 +286,7 @@ if (*s == ';') { *s = '\0'; t = lht_dom_node_alloc(LHT_TEXT, ""); - t->data.text.value = pcb_strdup(start); + t->data.text.value = rnd_strdup(start); lht_dom_list_append(li, t); start = s+1; } @@ -293,7 +293,7 @@ } if (*start != '\0') { t = lht_dom_node_alloc(LHT_TEXT, ""); - t->data.text.value = pcb_strdup(start); + t->data.text.value = rnd_strdup(start); lht_dom_list_append(li, t); } free(tmp); @@ -300,7 +300,7 @@ } else { t = lht_dom_node_alloc(LHT_TEXT, cname); - t->data.text.value = pcb_strdup(cval); + t->data.text.value = rnd_strdup(cval); lht_dom_hash_put(node, t); } } Index: trunk/src/librnd/core/hid_cfg_input.c =================================================================== --- trunk/src/librnd/core/hid_cfg_input.c (revision 30941) +++ trunk/src/librnd/core/hid_cfg_input.c (revision 30942) @@ -53,11 +53,11 @@ if (*value != '<') { for(;;) { - if ((vlen >= 5) && (pcb_strncasecmp(value, "shift", 5) == 0)) m |= PCB_M_Shift; - else if ((vlen >= 4) && (pcb_strncasecmp(value, "ctrl", 4) == 0)) m |= PCB_M_Ctrl; - else if ((vlen >= 3) && (pcb_strncasecmp(value, "alt", 3) == 0)) m |= PCB_M_Alt; - else if ((vlen >= 7) && (pcb_strncasecmp(value, "release", 7) == 0)) m |= PCB_M_Release; - else if ((vlen >= 5) && (pcb_strncasecmp(value, "press", 5) == 0)) press = 1; + if ((vlen >= 5) && (rnd_strncasecmp(value, "shift", 5) == 0)) m |= PCB_M_Shift; + else if ((vlen >= 4) && (rnd_strncasecmp(value, "ctrl", 4) == 0)) m |= PCB_M_Ctrl; + else if ((vlen >= 3) && (rnd_strncasecmp(value, "alt", 3) == 0)) m |= PCB_M_Alt; + else if ((vlen >= 7) && (rnd_strncasecmp(value, "release", 7) == 0)) m |= PCB_M_Release; + else if ((vlen >= 5) && (rnd_strncasecmp(value, "press", 5) == 0)) press = 1; else rnd_message(PCB_MSG_ERROR, "Unknown modifier: %s\n", value); /* skip to next word */ @@ -86,14 +86,14 @@ mouse button number. */ if (!name) return 0; - else if (pcb_strcasecmp(name, "left") == 0) return PCB_MB_LEFT; - else if (pcb_strcasecmp(name, "middle") == 0) return PCB_MB_MIDDLE; - else if (pcb_strcasecmp(name, "right") == 0) return PCB_MB_RIGHT; + else if (rnd_strcasecmp(name, "left") == 0) return PCB_MB_LEFT; + else if (rnd_strcasecmp(name, "middle") == 0) return PCB_MB_MIDDLE; + else if (rnd_strcasecmp(name, "right") == 0) return PCB_MB_RIGHT; - else if (pcb_strcasecmp(name, "scroll-up") == 0) return PCB_MB_SCROLL_UP; - else if (pcb_strcasecmp(name, "scroll-down") == 0) return PCB_MB_SCROLL_DOWN; - else if (pcb_strcasecmp(name, "scroll-left") == 0) return PCB_MB_SCROLL_UP; - else if (pcb_strcasecmp(name, "scroll-right") == 0) return PCB_MB_SCROLL_DOWN; + else if (rnd_strcasecmp(name, "scroll-up") == 0) return PCB_MB_SCROLL_UP; + else if (rnd_strcasecmp(name, "scroll-down") == 0) return PCB_MB_SCROLL_DOWN; + else if (rnd_strcasecmp(name, "scroll-left") == 0) return PCB_MB_SCROLL_UP; + else if (rnd_strcasecmp(name, "scroll-right") == 0) return PCB_MB_SCROLL_DOWN; else { rnd_message(PCB_MSG_ERROR, "Error: unknown mouse button: %s\n", name); return 0; @@ -267,7 +267,7 @@ if (km->auto_tr != NULL) { const pcb_hid_cfg_keytrans_t *t; for(t = km->auto_tr; t->name != NULL; t++) { - if (pcb_strcasecmp(tmp, t->name) == 0) { + if (rnd_strcasecmp(tmp, t->name) == 0) { tmp[0] = t->sym; tmp[1] = '\0'; len = 1; @@ -309,12 +309,12 @@ } len -= k-last; k++; len--; - if (pcb_strncasecmp(k, "key>", 4) == 0) { + if (rnd_strncasecmp(k, "key>", 4) == 0) { k+=4; len-=4; key_raws[slen] = translate_key(km, k, len); key_trs[slen] = 0; } - else if (pcb_strncasecmp(k, "char>", 5) == 0) { + else if (rnd_strncasecmp(k, "char>", 5) == 0) { k+=5; len-=5; key_raws[slen] = 0; if (!isalnum(*k)) Index: trunk/src/librnd/core/hid_dad.h =================================================================== --- trunk/src/librnd/core/hid_dad.h (revision 30941) +++ trunk/src/librnd/core/hid_dad.h (revision 30942) @@ -258,7 +258,7 @@ #define PCB_DAD_LABEL(table, text) \ do { \ PCB_DAD_ALLOC(table, PCB_HATT_LABEL); \ - PCB_DAD_SET_ATTR_FIELD(table, name, pcb_strdup(text)); \ + PCB_DAD_SET_ATTR_FIELD(table, name, rnd_strdup(text)); \ } while(0) /* Add label usign printf formatting syntax: PCB_DAD_LABELF(tbl, ("a=%d", 12)); */ @@ -277,7 +277,7 @@ #define PCB_DAD_BOOL(table, label) \ do { \ PCB_DAD_ALLOC(table, PCB_HATT_BOOL); \ - PCB_DAD_SET_ATTR_FIELD(table, name, pcb_strdup(label)); \ + PCB_DAD_SET_ATTR_FIELD(table, name, rnd_strdup(label)); \ } while(0) #define PCB_DAD_INTEGER(table, label) \ Index: trunk/src/librnd/core/hid_dad_spin.c =================================================================== --- trunk/src/librnd/core/hid_dad_spin.c (revision 30941) +++ trunk/src/librnd/core/hid_dad_spin.c (revision 30942) @@ -244,7 +244,7 @@ else spin->no_unit_chg = 1; - hv.str = pcb_strdup(ctx.buf); + hv.str = rnd_strdup(ctx.buf); pcb_gui->attr_dlg_set_value(spin_hid_ctx, spin->wstr, &hv); } @@ -330,7 +330,7 @@ } spin_warn(hid_ctx, spin, end, warn); - hv.str = pcb_strdup(buf); + hv.str = rnd_strdup(buf); spin->set_writeback_lock++; pcb_gui->attr_dlg_set_value(hid_ctx, spin->wstr, &hv); spin->set_writeback_lock--; @@ -609,7 +609,7 @@ char buf[128]; if (hid_ctx == NULL) /* before run() */ - str->val.str = pcb_strdup(gen_str_coord(spin, end->val.crd, buf, sizeof(buf))); + str->val.str = rnd_strdup(gen_str_coord(spin, end->val.crd, buf, sizeof(buf))); else do_step(hid_ctx, spin, &dlg[spin->wstr], &dlg[spin->cmp.wend], 0); /* cheap conversion*/ } Index: trunk/src/librnd/core/hid_dad_spin.h =================================================================== --- trunk/src/librnd/core/hid_dad_spin.h (revision 30941) +++ trunk/src/librnd/core/hid_dad_spin.h (revision 30942) @@ -77,7 +77,7 @@ spin->wall = PCB_DAD_CURRENT(table); \ PCB_DAD_COMPFLAG(table, PCB_HATF_TIGHT); \ PCB_DAD_STRING(table); \ - PCB_DAD_DEFAULT_PTR(table, pcb_strdup("")); \ + PCB_DAD_DEFAULT_PTR(table, rnd_strdup("")); \ PCB_DAD_ENTER_CB(table, pcb_dad_spin_txt_enter_cb); \ PCB_DAD_CHANGE_CB(table, pcb_dad_spin_txt_change_cb); \ PCB_DAD_SET_ATTR_FIELD(table, user_data, (const char **)spin); \ Index: trunk/src/librnd/core/hid_dad_tree.c =================================================================== --- trunk/src/librnd/core/hid_dad_tree.c (revision 30941) +++ trunk/src/librnd/core/hid_dad_tree.c (revision 30942) @@ -101,7 +101,7 @@ parent = htsp_get(&tree->paths, path); if (parent != NULL) return parent; - cell[0] = pcb_strdup(path); + cell[0] = rnd_strdup(path); return pcb_dad_tree_append(tree->attrib, NULL, cell); } @@ -111,12 +111,12 @@ parent = pcb_dad_tree_mkdirp(tree, path, NULL); if (cells == NULL) { - cell[0] = pcb_strdup(last); + cell[0] = rnd_strdup(last); return pcb_dad_tree_append_under(tree->attrib, parent, cell); } old = cell[0]; - cells[0] = pcb_strdup(last); + cells[0] = rnd_strdup(last); free(old); return pcb_dad_tree_append_under(tree->attrib, parent, cells); } Index: trunk/src/librnd/core/hid_dlg.c =================================================================== --- trunk/src/librnd/core/hid_dlg.c (revision 30941) +++ trunk/src/librnd/core/hid_dlg.c (revision 30942) @@ -166,7 +166,7 @@ if (message == refresh) { if (active) - last = pcb_dtime(); + last = rnd_dtime(); have_timer = 0; refresh_now:; if (active) { @@ -235,7 +235,7 @@ val.dbl = (double)so_far / (double)total; - now = pcb_dtime(); + now = rnd_dtime(); if (now >= (last + (REFRESH_RATE / 1000.0))) { last = now; goto refresh_now; Index: trunk/src/librnd/core/hid_init.c =================================================================== --- trunk/src/librnd/core/hid_init.c (revision 30941) +++ trunk/src/librnd/core/hid_init.c (revision 30942) @@ -474,7 +474,7 @@ setlocale() won't do the trick on GUI. Also set all related env var to "C" so a setlocale(LC_ALL, "") will also do the right thing. */ for(lc = lcs; *lc != NULL; lc++) - pcb_setenv(*lc, "C", 1); + rnd_setenv(*lc, "C", 1); setlocale(LC_ALL, "C"); @@ -499,9 +499,9 @@ if (*s == '\\') *s = '/'; - pcb_w32_bindir = pcb_strdup(exedir); + pcb_w32_bindir = rnd_strdup(exedir); truncdir(exedir); - pcb_w32_root = pcb_strdup(exedir); + pcb_w32_root = rnd_strdup(exedir); pcb_w32_libdir = pcb_concat(exedir, "/lib/pcb-rnd", NULL); pcb_w32_sharedir = pcb_concat(exedir, "/share/pcb-rnd", NULL); @@ -595,7 +595,7 @@ return 1; } if (pcbhl_main_arg_match(cmd, "C", "-conffile")) { - vts0_append(&hidlib_conffile, pcb_strdup(arg)); + vts0_append(&hidlib_conffile, rnd_strdup(arg)); return 1; } } Index: trunk/src/librnd/core/hid_nogui.c =================================================================== --- trunk/src/librnd/core/hid_nogui.c (revision 30941) +++ trunk/src/librnd/core/hid_nogui.c (revision 30942) @@ -236,7 +236,7 @@ s = fgets(buf, MAX_LINE_LENGTH, stdin); if (s == NULL) { printf("\n"); - return pcb_strdup(CANCEL); + return rnd_strdup(CANCEL); } /* Strip any trailing newline characters */ @@ -247,7 +247,7 @@ if (s[0] == '\0') return NULL; - return pcb_strdup(s); + return rnd_strdup(s); } #undef MAX_LINE_LENGTH @@ -273,12 +273,12 @@ tmp = read_stdin_line(); if (tmp == NULL) - answer = pcb_strdup((default_str != NULL) ? default_str : ""); + answer = rnd_strdup((default_str != NULL) ? default_str : ""); else answer = tmp; /* always allocated */ } else - answer = pcb_strdup(""); + answer = rnd_strdup(""); res->type = FGW_STR | FGW_DYN; res->val.str = answer; @@ -336,7 +336,7 @@ char *answer; if (pcbhl_conf.rc.quiet) - return pcb_strdup(""); + return rnd_strdup(""); if (default_file) printf("%s [%s] : ", title, default_file); @@ -345,9 +345,9 @@ answer = read_stdin_line(); if (answer == NULL) - return (default_file != NULL) ? pcb_strdup(default_file) : NULL; + return (default_file != NULL) ? rnd_strdup(default_file) : NULL; else - return pcb_strdup(answer); + return rnd_strdup(answer); } void *pcb_nogui_attr_dlg_new(pcb_hid_t *hid, const char *id, pcb_hid_attribute_t *attrs_, int n_attrs_, const char *title_, void *caller_data, rnd_bool modal, void (*button_cb)(void *caller_data, pcb_hid_attr_ev_t ev), int defx, int defy, int minx, int miny) @@ -401,7 +401,7 @@ } else { if ((pcbhl_conf.rc.verbose >= PCB_MSG_INFO) || (pcb_gui != &nogui_hid)) { - now = pcb_dtime(); + now = rnd_dtime(); if (now >= nextt) { fprintf(stderr, "progress: %ld/%ld %s\n", so_far, total, message); nextt = now + 0.2; Index: trunk/src/librnd/core/paths.c =================================================================== --- trunk/src/librnd/core/paths.c (revision 30941) +++ trunk/src/librnd/core/paths.c (revision 30942) @@ -35,7 +35,7 @@ #include #include -int pcb_getpid(void); +int rnd_getpid(void); int pcb_build_fn_cb(void *ctx, gds_t *s, const char **input) { @@ -45,7 +45,7 @@ switch(**input) { case 'P': - sprintf(buff, "%.8i", pcb_getpid()); + sprintf(buff, "%.8i", rnd_getpid()); gds_append_str(s, buff); (*input)++; return 0; Index: trunk/src/librnd/core/pcb_bool.c =================================================================== --- trunk/src/librnd/core/pcb_bool.c (revision 30941) +++ trunk/src/librnd/core/pcb_bool.c (revision 30942) @@ -30,9 +30,9 @@ pcb_bool_op_t pcb_str2boolop(const char *s) { - if (pcb_strcasecmp(s, "set") == 0) return PCB_BOOL_SET; - if (pcb_strcasecmp(s, "clear") == 0) return PCB_BOOL_CLEAR; - if (pcb_strcasecmp(s, "toggle") == 0) return PCB_BOOL_TOGGLE; - if (pcb_strcasecmp(s, "preserve") == 0) return PCB_BOOL_PRESERVE; + if (rnd_strcasecmp(s, "set") == 0) return PCB_BOOL_SET; + if (rnd_strcasecmp(s, "clear") == 0) return PCB_BOOL_CLEAR; + if (rnd_strcasecmp(s, "toggle") == 0) return PCB_BOOL_TOGGLE; + if (rnd_strcasecmp(s, "preserve") == 0) return PCB_BOOL_PRESERVE; return PCB_BOOL_INVALID; } Index: trunk/src/librnd/core/plugins.c =================================================================== --- trunk/src/librnd/core/plugins.c (revision 30941) +++ trunk/src/librnd/core/plugins.c (revision 30942) @@ -46,7 +46,7 @@ paths_alloced += 16; pcb_pup_paths = realloc(pcb_pup_paths, sizeof(char *) * paths_alloced); } - pcb_pup_paths[paths_used] = pcb_strdup(dir); + pcb_pup_paths[paths_used] = rnd_strdup(dir); paths_used++; pcb_pup_paths[paths_used] = NULL; } Index: trunk/src/librnd/core/rotate.h =================================================================== --- trunk/src/librnd/core/rotate.h (revision 30941) +++ trunk/src/librnd/core/rotate.h (revision 30942) @@ -57,8 +57,8 @@ rnd_coord_t px = *x - cx; rnd_coord_t py = *y - cy; - nx = pcb_round(px * cosa + py * sina + cx); - ny = pcb_round(py * cosa - px * sina + cy); + nx = rnd_round(px * cosa + py * sina + cx); + ny = rnd_round(py * cosa - px * sina + cy); *x = nx; *y = ny; Index: trunk/src/librnd/core/safe_fs.c =================================================================== --- trunk/src/librnd/core/safe_fs.c (revision 30941) +++ trunk/src/librnd/core/safe_fs.c (revision 30942) @@ -287,7 +287,7 @@ if (res != NULL) { if (full_path != NULL) - *full_path = pcb_strdup(tmp); + *full_path = rnd_strdup(tmp); return res; } Index: trunk/src/librnd/core/tool.c =================================================================== --- trunk/src/librnd/core/tool.c (revision 30941) +++ trunk/src/librnd/core/tool.c (revision 30942) @@ -305,10 +305,10 @@ hidlib->tool_x = hidlib->ch_x; hidlib->tool_y = hidlib->ch_y; pcb_hid_notify_crosshair_change(RND_ACT_HIDLIB, pcb_false); - if (pcb_strcasecmp(cmd, "Cancel") == 0) { + if (rnd_strcasecmp(cmd, "Cancel") == 0) { pcb_tool_select_by_id(RND_ACT_HIDLIB, pcbhl_conf.editor.mode); } - else if (pcb_strcasecmp(cmd, "Escape") == 0) { + else if (rnd_strcasecmp(cmd, "Escape") == 0) { const pcb_tool_t *t; escape:; t = pcb_tool_get(pcbhl_conf.editor.mode); @@ -319,10 +319,10 @@ else t->escape(RND_ACT_HIDLIB); } - else if ((pcb_strcasecmp(cmd, "Press") == 0) || (pcb_strcasecmp(cmd, "Notify") == 0)) { + else if ((rnd_strcasecmp(cmd, "Press") == 0) || (rnd_strcasecmp(cmd, "Notify") == 0)) { pcb_tool_do_press(RND_ACT_HIDLIB); } - else if (pcb_strcasecmp(cmd, "Release") == 0) { + else if (rnd_strcasecmp(cmd, "Release") == 0) { if (pcbhl_conf.editor.enable_stroke) { int handled = 0; pcb_event(RND_ACT_HIDLIB, PCB_EVENT_STROKE_FINISH, "p", &handled); @@ -337,16 +337,16 @@ } do_release(RND_ACT_HIDLIB); } - else if (pcb_strcasecmp(cmd, "Stroke") == 0) { + else if (rnd_strcasecmp(cmd, "Stroke") == 0) { if (pcbhl_conf.editor.enable_stroke) pcb_event(RND_ACT_HIDLIB, PCB_EVENT_STROKE_START, "cc", hidlib->tool_x, hidlib->tool_y); else goto escape; /* Right mouse button restarts drawing mode. */ } - else if (pcb_strcasecmp(cmd, "Restore") == 0) { /* restore the last saved tool */ + else if (rnd_strcasecmp(cmd, "Restore") == 0) { /* restore the last saved tool */ pcb_tool_restore(RND_ACT_HIDLIB); } - else if (pcb_strcasecmp(cmd, "Save") == 0) { /* save currently selected tool */ + else if (rnd_strcasecmp(cmd, "Save") == 0) { /* save currently selected tool */ pcb_tool_save(RND_ACT_HIDLIB); } else { Index: trunk/src/librnd/core/unit.c =================================================================== --- trunk/src/librnd/core/unit.c (revision 30941) +++ trunk/src/librnd/core/unit.c (revision 30942) @@ -177,7 +177,7 @@ case PCB_UNIT_IMPERIAL: base = PCB_MIL_TO_COORD(x); break; case PCB_UNIT_FREQ: base = x; break; } - res = pcb_round(base/unit->scale_factor); + res = rnd_round(base/unit->scale_factor); /* clamp */ switch(unit->family) { Index: trunk/src/librnd/pcb_compat.h =================================================================== --- trunk/src/librnd/pcb_compat.h (revision 30941) +++ trunk/src/librnd/pcb_compat.h (revision 30942) @@ -200,3 +200,18 @@ #define pcb_tempfile_unlink rnd_tempfile_unlink #define pcb_is_path_abs rnd_is_path_abs #define pcb_lrealpath rnd_lrealpath +#define pcb_rand rnd_rand +#define pcb_get_user_name rnd_get_user_name +#define pcb_getpid rnd_getpid +#define pcb_strndup rnd_strndup +#define pcb_strdup rnd_strdup +#define pcb_strdup_null rnd_strdup_null +#define pcb_round rnd_round +#define pcb_strcasecmp rnd_strcasecmp +#define pcb_strncasecmp rnd_strncasecmp +#define pcb_setenv rnd_setenv +#define pcb_print_utc rnd_print_utc +#define pcb_ms_sleep rnd_ms_sleep +#define pcb_ltime rnd_ltime +#define pcb_dtime rnd_dtime +#define pcb_fileno rnd_fileno Index: trunk/src/librnd/poly/offset.c =================================================================== --- trunk/src/librnd/poly/offset.c (revision 30941) +++ trunk/src/librnd/poly/offset.c (revision 30942) @@ -164,12 +164,12 @@ /* create a new pline by copying the cache */ - tmp[0] = pcb_round(pcsh[0].x); - tmp[1] = pcb_round(pcsh[0].y); + tmp[0] = rnd_round(pcsh[0].x); + tmp[1] = rnd_round(pcsh[0].y); res = pcb_poly_contour_new(tmp); for(n = 1; n < num_pts; n++) { - tmp[0] = pcb_round(pcsh[n].x); - tmp[1] = pcb_round(pcsh[n].y); + tmp[0] = rnd_round(pcsh[n].x); + tmp[1] = rnd_round(pcsh[n].y); pcb_poly_vertex_include(res->head->prev, pcb_poly_node_create(tmp)); } @@ -297,8 +297,8 @@ if (inside) c = -c; ox = v->point[0]; oy = v->point[1]; - v->point[0] = pcb_round(v->point[0] + c * vx); - v->point[1] = pcb_round(v->point[1] + c * vy); + v->point[0] = rnd_round(v->point[0] + c * vx); + v->point[1] = rnd_round(v->point[1] + c * vy); if ((ox == v->point[0]) && (oy == v->point[1])) return -1; /* too close, can't pull any more */ @@ -377,10 +377,10 @@ if (((prevx == dx) || (prevx == -dx)) && ((prevy == dy) || (prevy == -dy))) { /* apply direct shift of the whole parallel line */ - v->point[0] = pcb_round(v->point[0] + prjx * tune); - v->point[1] = pcb_round(v->point[1] + prjy * tune); - v->prev->point[0] = pcb_round(v->prev->point[0] + prjx * tune); - v->prev->point[1] = pcb_round(v->prev->point[1] + prjy * tune); + v->point[0] = rnd_round(v->point[0] + prjx * tune); + v->point[1] = rnd_round(v->point[1] + prjy * tune); + v->prev->point[0] = rnd_round(v->prev->point[0] + prjx * tune); + v->prev->point[1] = rnd_round(v->prev->point[1] + prjy * tune); v = v->next; goto retry; } Index: trunk/src/librnd/poly/polyarea.h =================================================================== --- trunk/src/librnd/poly/polyarea.h (revision 30941) +++ trunk/src/librnd/poly/polyarea.h (revision 30942) @@ -167,18 +167,18 @@ #ifndef M_PI #define M_PI 3.14159265358979323846 #endif -double pcb_round(double x); /* from math_helper.h */ +double rnd_round(double x); /* from math_helper.h */ /* Calculate an endpoint of an arc and return the result in *x;*y */ RND_INLINE void pcb_arc_get_endpt(rnd_coord_t cx, rnd_coord_t cy, rnd_coord_t width, rnd_coord_t height, pcb_angle_t astart, pcb_angle_t adelta, int which, rnd_coord_t *x, rnd_coord_t *y) { if (which == 0) { - *x = pcb_round((double)cx - (double)width * cos(astart * (M_PI/180.0))); - *y = pcb_round((double)cy + (double)height * sin(astart * (M_PI/180.0))); + *x = rnd_round((double)cx - (double)width * cos(astart * (M_PI/180.0))); + *y = rnd_round((double)cy + (double)height * sin(astart * (M_PI/180.0))); } else { - *x = pcb_round((double)cx - (double)width * cos((astart + adelta) * (M_PI/180.0))); - *y = pcb_round((double)cy + (double)height * sin((astart + adelta) * (M_PI/180.0))); + *x = rnd_round((double)cx - (double)width * cos((astart + adelta) * (M_PI/180.0))); + *y = rnd_round((double)cy + (double)height * sin((astart + adelta) * (M_PI/180.0))); } } Index: trunk/src/main.c =================================================================== --- trunk/src/main.c (revision 30941) +++ trunk/src/main.c (revision 30942) @@ -123,7 +123,7 @@ tmps = getenv("PATH"); if (tmps != NULL) { - path = pcb_strdup(tmps); + path = rnd_strdup(tmps); /* search through the font path for a font file */ for (p = strtok(path, RND_PATH_DELIMETER); p && *p; p = strtok(NULL, RND_PATH_DELIMETER)) { @@ -164,7 +164,7 @@ } else { /* we have failed to find out anything from argv[0] so fall back to the original install prefix */ - bindir = pcb_strdup(BINDIR); + bindir = rnd_strdup(BINDIR); } /* now find the path to exec_prefix */ @@ -177,12 +177,12 @@ /* export the most important paths and data for child processes (e.g. parametric footprints) */ tmp = pcb_concat(PCBSHAREDIR, "/pcblib", NULL); - se |= pcb_setenv("PCB_RND_VERSION", PCB_VERSION, 1); - se |= pcb_setenv("PCB_RND_REVISION", PCB_REVISION, 1); - se |= pcb_setenv("PCB_RND_PCBLIB", tmp, 1); - se |= pcb_setenv("PCB_RND_SHARE", PCBSHAREDIR, 1); - se |= pcb_setenv("PCB_RND_LIB", PCBLIBDIR, 1); - se |= pcb_setenv("PCB_RND_EXEC_PREFIX", exec_prefix, 1); + se |= rnd_setenv("PCB_RND_VERSION", PCB_VERSION, 1); + se |= rnd_setenv("PCB_RND_REVISION", PCB_REVISION, 1); + se |= rnd_setenv("PCB_RND_PCBLIB", tmp, 1); + se |= rnd_setenv("PCB_RND_SHARE", PCBSHAREDIR, 1); + se |= rnd_setenv("PCB_RND_LIB", PCBLIBDIR, 1); + se |= rnd_setenv("PCB_RND_EXEC_PREFIX", exec_prefix, 1); free(tmp); if (se != 0) @@ -525,7 +525,7 @@ exit(1); } /* keep filename if load failed: file might not exist, save it by that name */ - PCB->hidlib.filename = pcb_strdup(command_line_pcb); + PCB->hidlib.filename = rnd_strdup(command_line_pcb); } } Index: trunk/src/main_act.c =================================================================== --- trunk/src/main_act.c (revision 30941) +++ trunk/src/main_act.c (revision 30942) @@ -275,12 +275,12 @@ RND_PCB_ACT_CONVARG(1, FGW_STR, System, cmd = argv[1].val.str); RND_ACT_IRES(0); - pcb_setenv("PCB_RND_BOARD_FILE_NAME", RND_ACT_HIDLIB->filename == NULL ? "" : RND_ACT_HIDLIB->filename, 1); + rnd_setenv("PCB_RND_BOARD_FILE_NAME", RND_ACT_HIDLIB->filename == NULL ? "" : RND_ACT_HIDLIB->filename, 1); pcb_snprintf(tmp, sizeof(tmp), "%mm", pcb_crosshair.X); - pcb_setenv("PCB_RND_CROSSHAIR_X_MM", tmp, 1); + rnd_setenv("PCB_RND_CROSSHAIR_X_MM", tmp, 1); pcb_snprintf(tmp, sizeof(tmp), "%mm", pcb_crosshair.Y); - pcb_setenv("PCB_RND_CROSSHAIR_Y_MM", tmp, 1); - pcb_setenv("PCB_RND_CURRENT_LAYER_NAME", PCB_CURRLAYER(PCB_ACT_BOARD)->name, 1); + rnd_setenv("PCB_RND_CROSSHAIR_Y_MM", tmp, 1); + rnd_setenv("PCB_RND_CURRENT_LAYER_NAME", PCB_CURRLAYER(PCB_ACT_BOARD)->name, 1); RND_ACT_IRES(pcb_system(RND_ACT_HIDLIB, cmd)); return 0; } Index: trunk/src/netlist.c =================================================================== --- trunk/src/netlist.c (revision 30941) +++ trunk/src/netlist.c (revision 30942) @@ -75,8 +75,8 @@ t->type = PCB_OBJ_NET_TERM; t->parent_type = PCB_PARENT_NET; t->parent.net = net; - t->refdes = pcb_strdup(refdes); - t->term = pcb_strdup(term); + t->refdes = rnd_strdup(refdes); + t->term = rnd_strdup(term); pcb_termlist_append(&net->conns, t); return t; } @@ -168,9 +168,9 @@ a = pcb_undo_alloc(net->parent.board, &undo_term_alloc, sizeof(undo_term_alloc_t)); a->pcb = net->parent.board; a->nl_idx = net->parent_nl_idx; - a->netname = pcb_strdup(net->name); - a->refdes = pcb_strdup(refdes); - a->term = pcb_strdup(term); + a->netname = rnd_strdup(net->name); + a->refdes = rnd_strdup(refdes); + a->term = rnd_strdup(term); return pcb_net_term_alloc(net, a->refdes, a->term); } else @@ -219,7 +219,7 @@ memcpy(pn, pinname, len); } else - pn = pcb_strdup(pinname); + pn = rnd_strdup(pinname); refdes = pn; @@ -282,7 +282,7 @@ for(n = 0; n < PCB_NUM_NETLISTS; n++) if (nl == &pcb->netlist[n]) net->parent_nl_idx = n; - net->name = pcb_strdup(netname); + net->name = rnd_strdup(netname); htsp_set(nl, net->name, net); return net; } @@ -379,7 +379,7 @@ for(e = htsp_first(nl); e != NULL; e = htsp_next(nl, e)) { pcb_net_t *net = e->value; - if (pcb_strcasecmp(name, net->name) == 0) + if (rnd_strcasecmp(name, net->name) == 0) break; } @@ -646,7 +646,7 @@ memcpy(pn, pinname, len); } else - pn = pcb_strdup(pinname); + pn = rnd_strdup(pinname); refdes = pn; term = strchr(refdes, '-'); Index: trunk/src/netlist_act.c =================================================================== --- trunk/src/netlist_act.c (revision 30941) +++ trunk/src/netlist_act.c (revision 30942) @@ -251,7 +251,7 @@ if (argc > 3) { { char *refdes, *termid; - refdes = pcb_strdup(a2); + refdes = rnd_strdup(a2); termid = strchr(refdes, '-'); if (termid != NULL) { *termid = '\0'; @@ -260,7 +260,7 @@ else termid = ""; for(term = pcb_termlist_first(&net->conns); term != NULL; term = pcb_termlist_next(term)) { - if ((pcb_strcasecmp(refdes, term->refdes) == 0) && (pcb_strcasecmp(termid, term->term) == 0)) { + if ((rnd_strcasecmp(refdes, term->refdes) == 0) && (rnd_strcasecmp(termid, term->term) == 0)) { pin_found = 1; func(net, term); } Index: trunk/src/obj_arc.c =================================================================== --- trunk/src/obj_arc.c (revision 30941) +++ trunk/src/obj_arc.c (revision 30942) @@ -308,8 +308,8 @@ if (!PCB_FLAG_TEST(PCB_FLAG_FLOATER, a1) && !PCB_FLAG_TEST(PCB_FLAG_FLOATER, a2)) { if (pcb_neq_tr_coords(tr1, a1->X, a1->Y, tr2, a2->X, a2->Y)) return 0; - if (pcb_normalize_angle(pcb_round(a1->StartAngle * sgn1 + tr1->rot * sgn1)) != pcb_normalize_angle(pcb_round(a2->StartAngle * sgn2 + tr2->rot * sgn2))) return 0; - if (pcb_round(a1->Delta * sgn1) != pcb_round(a2->Delta * sgn2)) return 0; + if (pcb_normalize_angle(rnd_round(a1->StartAngle * sgn1 + tr1->rot * sgn1)) != pcb_normalize_angle(rnd_round(a2->StartAngle * sgn2 + tr2->rot * sgn2))) return 0; + if (rnd_round(a1->Delta * sgn1) != rnd_round(a2->Delta * sgn2)) return 0; } return 1; @@ -324,7 +324,7 @@ rnd_coord_t x, y; pcb_hash_tr_coords(tr, &x, &y, a->X, a->Y); crd = pcb_hash_coord(x) ^ pcb_hash_coord(y) ^ - pcb_hash_coord(pcb_normalize_angle(pcb_round(a->StartAngle*sgn + tr->rot*sgn))) ^ pcb_hash_coord(pcb_round(a->Delta * sgn)); + pcb_hash_coord(pcb_normalize_angle(rnd_round(a->StartAngle*sgn + tr->rot*sgn))) ^ pcb_hash_coord(rnd_round(a->Delta * sgn)); } return @@ -340,7 +340,7 @@ da = -da; while(da > 360.0) da = 360.0; - return pcb_round(2.0*r*M_PI*da/360.0); + return rnd_round(2.0*r*M_PI*da/360.0); } double pcb_arc_area(const pcb_arc_t *arc) @@ -843,17 +843,17 @@ pcb_arc_pre(arc); if (sx != 1.0) { - arc->X = pcb_round((double)arc->X * sx); - arc->Width = pcb_round((double)arc->Width * sx); + arc->X = rnd_round((double)arc->X * sx); + arc->Width = rnd_round((double)arc->Width * sx); } if (sy != 1.0) { - arc->Y = pcb_round((double)arc->Y * sy); - arc->Height = pcb_round((double)arc->Height * sy); + arc->Y = rnd_round((double)arc->Y * sy); + arc->Height = rnd_round((double)arc->Height * sy); } if (sth != 1.0) - arc->Thickness = pcb_round((double)arc->Thickness * sth); + arc->Thickness = rnd_round((double)arc->Thickness * sth); pcb_arc_bbox(arc); if (onbrd) @@ -956,8 +956,8 @@ la = (arc->StartAngle+ea)/2.0; - *x0 = pcb_round((double)arc->X - (double)arc->Width * cos(la * PCB_M180)); - *y0 = pcb_round((double)arc->Y + (double)arc->Height * sin(la * PCB_M180)); + *x0 = rnd_round((double)arc->X - (double)arc->Width * cos(la * PCB_M180)); + *y0 = rnd_round((double)arc->Y + (double)arc->Height * sin(la * PCB_M180)); *vert = (((la < 45) && (la > -45)) || ((la > 135) && (la < 225))); } @@ -1001,7 +1001,7 @@ if (step < 0) step = -step; ea2 = ea - step/3; for(a = arc->StartAngle; a < ea2; a += step) - if (cb(uctx, pcb_round((double)arc->X - (double)arc->Width * cos(a * PCB_M180)), pcb_round((double)arc->Y + (double)arc->Height * sin(a * PCB_M180))) != 0) + if (cb(uctx, rnd_round((double)arc->X - (double)arc->Width * cos(a * PCB_M180)), rnd_round((double)arc->Y + (double)arc->Height * sin(a * PCB_M180))) != 0) return; } else { @@ -1008,11 +1008,11 @@ if (step > 0) step = +step; ea2 = ea + step/3; for(a = sa; a > ea2; a -= step) - if (cb(uctx, pcb_round((double)arc->X - (double)arc->Width * cos(a * PCB_M180)), pcb_round((double)arc->Y + (double)arc->Height * sin(a * PCB_M180))) != 0) + if (cb(uctx, rnd_round((double)arc->X - (double)arc->Width * cos(a * PCB_M180)), rnd_round((double)arc->Y + (double)arc->Height * sin(a * PCB_M180))) != 0) return; } - cb(uctx, pcb_round((double)arc->X - (double)arc->Width * cos(ea * PCB_M180)), pcb_round((double)arc->Y + (double)arc->Height * sin(ea * PCB_M180))); + cb(uctx, rnd_round((double)arc->X - (double)arc->Width * cos(ea * PCB_M180)), rnd_round((double)arc->Y + (double)arc->Height * sin(ea * PCB_M180))); } void pcb_arc_name_invalidate_draw(pcb_arc_t *arc) Index: trunk/src/obj_gfx.c =================================================================== --- trunk/src/obj_gfx.c (revision 30941) +++ trunk/src/obj_gfx.c (revision 30942) @@ -121,10 +121,10 @@ rx = (double)gfx->sx / 2.0; ry = (double)gfx->sy / 2.0; - gfx->cox[0] = pcb_round((double)gfx->cx + rx); gfx->coy[0] = pcb_round((double)gfx->cy + ry); - gfx->cox[1] = pcb_round((double)gfx->cx - rx); gfx->coy[1] = pcb_round((double)gfx->cy + ry); - gfx->cox[2] = pcb_round((double)gfx->cx - rx); gfx->coy[2] = pcb_round((double)gfx->cy - ry); - gfx->cox[3] = pcb_round((double)gfx->cx + rx); gfx->coy[3] = pcb_round((double)gfx->cy - ry); + gfx->cox[0] = rnd_round((double)gfx->cx + rx); gfx->coy[0] = rnd_round((double)gfx->cy + ry); + gfx->cox[1] = rnd_round((double)gfx->cx - rx); gfx->coy[1] = rnd_round((double)gfx->cy + ry); + gfx->cox[2] = rnd_round((double)gfx->cx - rx); gfx->coy[2] = rnd_round((double)gfx->cy - ry); + gfx->cox[3] = rnd_round((double)gfx->cx + rx); gfx->coy[3] = rnd_round((double)gfx->cy - ry); if (gfx->rot != 0.0) { a = gfx->rot / PCB_RAD_TO_DEG; cosa = cos(a); @@ -210,7 +210,7 @@ if (a1->sx != a2->sx) return 0; if (a1->sy != a2->sy) return 0; if (pcb_neq_tr_coords(tr1, a1->cx, a1->cy, tr2, a2->cx, a2->cy)) return 0; - if (pcb_normalize_angle(pcb_round(a1->rot * sgn1)) != pcb_normalize_angle(pcb_round(a2->rot * sgn2))) return 0; + if (pcb_normalize_angle(rnd_round(a1->rot * sgn1)) != pcb_normalize_angle(rnd_round(a2->rot * sgn2))) return 0; TODO("compare pixmaps"); return 1; } @@ -224,7 +224,7 @@ rnd_coord_t x, y; pcb_hash_tr_coords(tr, &x, &y, a->cx, a->cy); crd = pcb_hash_coord(x) ^ pcb_hash_coord(y) ^ pcb_hash_coord(a->sx) ^ pcb_hash_coord(a->sy) ^ - pcb_hash_coord(pcb_normalize_angle(pcb_round(a->rot*sgn + tr->rot*sgn))); + pcb_hash_coord(pcb_normalize_angle(rnd_round(a->rot*sgn + tr->rot*sgn))); } TODO("hash pixmaps"); @@ -543,8 +543,8 @@ if (onbrd) pcb_gfx_pre(gfx); - if (sx != 1.0) gfx->sx = pcb_round((double)gfx->sx * sx); - if (sy != 1.0) gfx->sy = pcb_round((double)gfx->sy * sy); + if (sx != 1.0) gfx->sx = rnd_round((double)gfx->sx * sx); + if (sy != 1.0) gfx->sy = rnd_round((double)gfx->sy * sy); pcb_gfx_bbox(gfx); if (onbrd) Index: trunk/src/obj_hash.h =================================================================== --- trunk/src/obj_hash.h (revision 30941) +++ trunk/src/obj_hash.h (revision 30942) @@ -45,7 +45,7 @@ +-1 nanometer rounding error */ RND_INLINE rnd_coord_t pcb_round_tol(double v, int tol) { - return pcb_round(v/(double)tol)*tol; + return rnd_round(v/(double)tol)*tol; } RND_INLINE void pcb_hash_tr_coords(const pcb_host_trans_t *tr, rnd_coord_t *dstx, rnd_coord_t *dsty, rnd_coord_t srcx, rnd_coord_t srcy) Index: trunk/src/obj_line.c =================================================================== --- trunk/src/obj_line.c (revision 30941) +++ trunk/src/obj_line.c (revision 30942) @@ -404,7 +404,7 @@ rnd_coord_t dx = line->Point1.X - line->Point2.X; rnd_coord_t dy = line->Point1.Y - line->Point2.Y; TODO(": use the distance func instead") - return pcb_round(sqrt((double)dx*(double)dx + (double)dy*(double)dy)); + return rnd_round(sqrt((double)dx*(double)dx + (double)dy*(double)dy)); } double pcb_line_area(const pcb_line_t *line) @@ -437,14 +437,14 @@ nx = -vy; ny = vx; - x[0] = (rnd_coord_t)pcb_round(x1 - vx * width + nx * width); - y[0] = (rnd_coord_t)pcb_round(y1 - vy * width + ny * width); - x[1] = (rnd_coord_t)pcb_round(x1 - vx * width - nx * width); - y[1] = (rnd_coord_t)pcb_round(y1 - vy * width - ny * width); - x[2] = (rnd_coord_t)pcb_round(x2 + vx * width - nx * width); - y[2] = (rnd_coord_t)pcb_round(y2 + vy * width - ny * width); - x[3] = (rnd_coord_t)pcb_round(x2 + vx * width + nx * width); - y[3] = (rnd_coord_t)pcb_round(y2 + vy * width + ny * width); + x[0] = (rnd_coord_t)rnd_round(x1 - vx * width + nx * width); + y[0] = (rnd_coord_t)rnd_round(y1 - vy * width + ny * width); + x[1] = (rnd_coord_t)rnd_round(x1 - vx * width - nx * width); + y[1] = (rnd_coord_t)rnd_round(y1 - vy * width - ny * width); + x[2] = (rnd_coord_t)rnd_round(x2 + vx * width - nx * width); + y[2] = (rnd_coord_t)rnd_round(y2 + vy * width - ny * width); + x[3] = (rnd_coord_t)rnd_round(x2 + vx * width + nx * width); + y[3] = (rnd_coord_t)rnd_round(y2 + vy * width + ny * width); } void pcb_line_pre(pcb_line_t *line) @@ -971,17 +971,17 @@ pcb_line_pre(line); if (sx != 1.0) { - line->Point1.X = pcb_round((double)line->Point1.X * sx); - line->Point2.X = pcb_round((double)line->Point2.X * sx); + line->Point1.X = rnd_round((double)line->Point1.X * sx); + line->Point2.X = rnd_round((double)line->Point2.X * sx); } if (sy != 1.0) { - line->Point1.Y = pcb_round((double)line->Point1.Y * sy); - line->Point2.Y = pcb_round((double)line->Point2.Y * sy); + line->Point1.Y = rnd_round((double)line->Point1.Y * sy); + line->Point2.Y = rnd_round((double)line->Point2.Y * sy); } if (sth != 1.0) - line->Thickness = pcb_round((double)line->Thickness * sth); + line->Thickness = rnd_round((double)line->Thickness * sth); pcb_line_bbox(line); Index: trunk/src/obj_poly.c =================================================================== --- trunk/src/obj_poly.c (revision 30941) +++ trunk/src/obj_poly.c (revision 30942) @@ -359,8 +359,8 @@ pcb_poly_pre(poly); PCB_POLY_POINT_LOOP(poly); { - point->X = pcb_round((double)point->X * sx); - point->Y = pcb_round((double)point->Y * sy); + point->X = rnd_round((double)point->X * sx); + point->Y = rnd_round((double)point->Y * sy); } PCB_END_LOOP; pcb_poly_bbox(poly); @@ -1281,8 +1281,8 @@ for(go = pcb_poly_vect_first(it, &x, &y), n = 0; go; go = pcb_poly_vect_next(it, &x, &y), n++) { - it->v->point[0] = pcb_round(p[n].x); - it->v->point[1] = pcb_round(p[n].y); + it->v->point[0] = rnd_round(p[n].x); + it->v->point[1] = rnd_round(p[n].y); } if (p != p_st) Index: trunk/src/obj_pstk.c =================================================================== --- trunk/src/obj_pstk.c (revision 30941) +++ trunk/src/obj_pstk.c (revision 30942) @@ -427,12 +427,12 @@ /* slow - but would be used on export mostly, not on-screen drawing */ pcb_polo_t *p, p_st[32]; rnd_coord_t *x, *y, xy_st[64]; - double vl = pcb_round(-dthick/2); + double vl = rnd_round(-dthick/2); long n; if (shape->data.poly.inverted) dthick = -dthick; - vl = pcb_round(dthick/2); + vl = rnd_round(dthick/2); if (shape->data.poly.len >= sizeof(p_st) / sizeof(p_st[0])) { p = malloc(sizeof(pcb_polo_t) * shape->data.poly.len); @@ -452,8 +452,8 @@ pcb_polo_norms(p, shape->data.poly.len); pcb_polo_offs(vl, p, shape->data.poly.len); for(n = 0; n < shape->data.poly.len; n++) { - x[n] = pcb_round(p[n].x); - y[n] = pcb_round(p[n].y); + x[n] = rnd_round(p[n].x); + y[n] = rnd_round(p[n].y); } if (!fill) { @@ -1263,16 +1263,16 @@ pcb_pstk_shape_scale(prt, 0, n, sx, sy, undoable); if (prt->hdia > 0.0) - prt->hdia = pcb_round((double)prt->hdia * ((sx+sy)/2.0)); + prt->hdia = rnd_round((double)prt->hdia * ((sx+sy)/2.0)); pcb_pstk_proto_update(prt); ps->proto = pcb_pstk_proto_insert_or_free(ps->parent.data, prt, 1, undoable); if (sx != 1.0) - ps->x = pcb_round((double)ps->x * sx); + ps->x = rnd_round((double)ps->x * sx); if (sy != 1.0) - ps->y = pcb_round((double)ps->y * sy); + ps->y = rnd_round((double)ps->y * sy); pcb_pstk_post(ps); } Index: trunk/src/obj_pstk_proto.c =================================================================== --- trunk/src/obj_pstk_proto.c (revision 30941) +++ trunk/src/obj_pstk_proto.c (revision 30942) @@ -645,7 +645,7 @@ memcpy(dst, src, sizeof(pcb_pstk_proto_t)); if (src->name != NULL) - dst->name = pcb_strdup(src->name); + dst->name = rnd_strdup(src->name); pcb_vtpadstack_tshape_init(&dst->tr); if (src->tr.used > 0) { @@ -1043,7 +1043,7 @@ if ((new_name == NULL) || (*new_name == '\0')) proto->name = NULL; else - proto->name = pcb_strdup(new_name); + proto->name = rnd_strdup(new_name); if (undoable) { padstack_proto_change_name_t *u = pcb_undo_alloc(PCB, &undo_pstk_proto_change_name, sizeof(padstack_proto_change_name_t)); @@ -1116,8 +1116,8 @@ } x /= (double)poly->len; y /= (double)poly->len; - *cx = pcb_round(x); - *cy = pcb_round(y); + *cx = rnd_round(x); + *cy = rnd_round(y); } void pcb_pstk_shape_grow_(pcb_pstk_shape_t *shp, rnd_bool is_absolute, rnd_coord_t val) @@ -1152,7 +1152,7 @@ } else { pcb_polo_t *p, p_st[32]; - double vl = pcb_round(val/2); + double vl = rnd_round(val/2); if (shp->data.poly.inverted) vl = -vl; @@ -1189,20 +1189,20 @@ switch(shp->shape) { case PCB_PSSH_LINE: - shp->data.line.thickness = pcb_round(shp->data.line.thickness * ((sx+sy)/2.0)); + shp->data.line.thickness = rnd_round(shp->data.line.thickness * ((sx+sy)/2.0)); if (shp->data.line.thickness < 1) shp->data.line.thickness = 1; - shp->data.line.x1 = pcb_round((double)shp->data.line.x1 * sx); - shp->data.line.y1 = pcb_round((double)shp->data.line.y1 * sy); - shp->data.line.x2 = pcb_round((double)shp->data.line.x2 * sx); - shp->data.line.y2 = pcb_round((double)shp->data.line.y2 * sy); + shp->data.line.x1 = rnd_round((double)shp->data.line.x1 * sx); + shp->data.line.y1 = rnd_round((double)shp->data.line.y1 * sy); + shp->data.line.x2 = rnd_round((double)shp->data.line.x2 * sx); + shp->data.line.y2 = rnd_round((double)shp->data.line.y2 * sy); break; case PCB_PSSH_CIRC: - shp->data.circ.dia = pcb_round(shp->data.circ.dia * ((sx+sy)/2.0)); + shp->data.circ.dia = rnd_round(shp->data.circ.dia * ((sx+sy)/2.0)); if (shp->data.circ.dia < 1) shp->data.circ.dia = 1; - shp->data.circ.x = pcb_round((double)shp->data.circ.x * sx); - shp->data.circ.y = pcb_round((double)shp->data.circ.y * sy); + shp->data.circ.x = rnd_round((double)shp->data.circ.x * sx); + shp->data.circ.y = rnd_round((double)shp->data.circ.y * sy); break; case PCB_PSSH_HSHADOW: break; @@ -1211,8 +1211,8 @@ pcb_polyarea_free(&shp->data.poly.pa); for(n = 0; n < shp->data.poly.len; n++) { - shp->data.poly.x[n] = pcb_round((double)shp->data.poly.x[n] * sx); - shp->data.poly.y[n] = pcb_round((double)shp->data.poly.y[n] * sy); + shp->data.poly.x[n] = rnd_round((double)shp->data.poly.x[n] * sx); + shp->data.poly.y[n] = rnd_round((double)shp->data.poly.y[n] * sy); } pcb_pstk_shape_update_pa(&shp->data.poly); break; Index: trunk/src/obj_subc.c =================================================================== --- trunk/src/obj_subc.c (revision 30941) +++ trunk/src/obj_subc.c (revision 30942) @@ -155,7 +155,7 @@ dst->parent.data = sc->data; dst->parent_type = PCB_PARENT_DATA; dst->type = PCB_OBJ_LAYER; - dst->name = pcb_strdup(src->name); + dst->name = rnd_strdup(src->name); return dst; } @@ -170,7 +170,7 @@ dst->comb = comb; dst->meta.bound.stack_offs = stack_offs; if (purpose != NULL) - dst->meta.bound.purpose = pcb_strdup(purpose); + dst->meta.bound.purpose = rnd_strdup(purpose); else dst->meta.bound.purpose = NULL; @@ -177,7 +177,7 @@ dst->parent.data = sc->data; dst->parent_type = PCB_PARENT_DATA; dst->type = PCB_OBJ_LAYER; - dst->name = pcb_strdup(name); + dst->name = rnd_strdup(name); return dst; } @@ -279,7 +279,7 @@ /* ugly hack to get round angles where possible: if error to a round angle is less than 1/10000, it was meant to be round, just got ruined by rounding errors */ - rr = pcb_round(r*10000.0) / 10000.0; + rr = rnd_round(r*10000.0) / 10000.0; if (rr - r < 0.0001) *rot = rr; else @@ -495,8 +495,8 @@ } add_aux_line(sc->aux_layer, "subc-role", "origin", ox, oy, ox, oy); - add_aux_line(sc->aux_layer, "subc-role", "x", ox, oy, pcb_round((double)ox + cs*unit), pcb_round((double)oy + sn*unit)); - add_aux_line(sc->aux_layer, "subc-role", "y", ox, oy, pcb_round((double)ox + sn*unit), pcb_round((double)oy + cs*unit)); + add_aux_line(sc->aux_layer, "subc-role", "x", ox, oy, rnd_round((double)ox + cs*unit), rnd_round((double)oy + sn*unit)); + add_aux_line(sc->aux_layer, "subc-role", "y", ox, oy, rnd_round((double)ox + sn*unit), rnd_round((double)oy + cs*unit)); } void pcb_subc_create_aux_point(pcb_subc_t *sc, rnd_coord_t x, rnd_coord_t y, const char *role) @@ -893,7 +893,7 @@ if ((pcb != NULL) && (pcb == src_pcb)) { /* copy within the same board */ memcpy(&dl->meta.bound, &sl->meta.bound, sizeof(sl->meta.bound)); - dl->name = pcb_strdup(sl->name); + dl->name = rnd_strdup(sl->name); dl->comb = sl->comb; if (dl->meta.bound.real != NULL) pcb_layer_link_trees(dl, dl->meta.bound.real); @@ -901,7 +901,7 @@ else if (pcb != NULL) { /* copying from buffer to board */ memcpy(&dl->meta.bound, &sl->meta.bound, sizeof(sl->meta.bound)); - dl->name = pcb_strdup(sl->name); + dl->name = rnd_strdup(sl->name); dl->meta.bound.real = pcb_layer_resolve_binding(pcb, sl); dl->comb = sl->comb; @@ -920,7 +920,7 @@ memcpy(&dl->meta.bound, &sl->meta.bound, sizeof(sl->meta.bound)); dl->meta.bound.real = NULL; - dl->name = pcb_strdup(sl->name); + dl->name = rnd_strdup(sl->name); dl->comb = sl->comb; } @@ -1757,7 +1757,7 @@ { void *old; if (sc->refdes != NULL) - old = pcb_strdup(sc->refdes); /* strdup because the rnd_attribute_put() is going to free the original */ + old = rnd_strdup(sc->refdes); /* strdup because the rnd_attribute_put() is going to free the original */ else old = NULL; rnd_attribute_put(&sc->Attributes, "refdes", ctx->chgname.new_name); @@ -2206,7 +2206,7 @@ } memset(&sc->data->Layer[n], 0, sizeof(sc->data->Layer[n])); - sc->data->Layer[n].name = pcb_strdup(name); + sc->data->Layer[n].name = rnd_strdup(name); sc->data->Layer[n].comb = comb; sc->data->Layer[n].is_bound = 1; sc->data->Layer[n].meta.bound.type = lyt; Index: trunk/src/obj_term.c =================================================================== --- trunk/src/obj_term.c (revision 30941) +++ trunk/src/obj_term.c (revision 30942) @@ -71,7 +71,7 @@ e = htsp_getentry(terminals, obj->term); if (e == NULL) { /* allocate new terminal */ - char *tname = pcb_strdup(obj->term); + char *tname = rnd_strdup(obj->term); v = malloc(sizeof(vtp0_t)); vtp0_init(v); htsp_set(terminals, tname, v); @@ -174,7 +174,7 @@ /* remove from previous terminal */ if (r->obj->term != NULL) { - old_term = pcb_strdup(r->obj->term); + old_term = rnd_strdup(r->obj->term); rnd_attribute_remove(&r->obj->Attributes, "term"); pcb_obj_invalidate_label(r->obj->type, r->obj->parent.any, r->obj, r->obj); r->obj->term = NULL; @@ -182,7 +182,7 @@ /* add to new terminal */ if (*r->str != '\0') { - r->obj->term = autofree = pcb_strdup(r->str); + r->obj->term = autofree = rnd_strdup(r->str); pcb_obj_invalidate_label(r->obj->type, r->obj->parent.any, r->obj, r->obj); } Index: trunk/src/obj_text.c =================================================================== --- trunk/src/obj_text.c (revision 30941) +++ trunk/src/obj_text.c (revision 30942) @@ -185,7 +185,7 @@ text->Flags = Flags; text->Scale = Scale; text->thickness = thickness; - text->TextString = pcb_strdup(TextString); + text->TextString = rnd_strdup(TextString); text->fid = PCBFont->id; pcb_add_text_on_layer(Layer, text, PCBFont); @@ -274,11 +274,11 @@ res = (unsigned char *)pcb_strdup_subst(text->TextString, pcb_text_render_str_cb, text, PCB_SUBST_PERCENT | PCB_SUBST_CONF); if (res == NULL) { - res = (unsigned char *)pcb_strdup(""); + res = (unsigned char *)rnd_strdup(""); } else if (*res == '\0') { free(res); - res = (unsigned char *)pcb_strdup(""); + res = (unsigned char *)rnd_strdup(""); } return res; @@ -407,14 +407,14 @@ /* calculate the transformed coordinates of all 4 corners of the raw (non-axis-aligned) bounding box */ - cx[0] = pcb_round(pcb_xform_x(mx, minx, miny)); - cy[0] = pcb_round(pcb_xform_y(mx, minx, miny)); - cx[1] = pcb_round(pcb_xform_x(mx, maxx, miny)); - cy[1] = pcb_round(pcb_xform_y(mx, maxx, miny)); - cx[2] = pcb_round(pcb_xform_x(mx, maxx, maxy)); - cy[2] = pcb_round(pcb_xform_y(mx, maxx, maxy)); - cx[3] = pcb_round(pcb_xform_x(mx, minx, maxy)); - cy[3] = pcb_round(pcb_xform_y(mx, minx, maxy)); + cx[0] = rnd_round(pcb_xform_x(mx, minx, miny)); + cy[0] = rnd_round(pcb_xform_y(mx, minx, miny)); + cx[1] = rnd_round(pcb_xform_x(mx, maxx, miny)); + cy[1] = rnd_round(pcb_xform_y(mx, maxx, miny)); + cx[2] = rnd_round(pcb_xform_x(mx, maxx, maxy)); + cy[2] = rnd_round(pcb_xform_y(mx, maxx, maxy)); + cx[3] = rnd_round(pcb_xform_x(mx, minx, maxy)); + cy[3] = rnd_round(pcb_xform_y(mx, minx, maxy)); /* calculate the axis-aligned version */ Text->bbox_naked.X1 = Text->bbox_naked.X2 = cx[0]; @@ -870,16 +870,16 @@ pcb_text_pre(text); if (sx != 1.0) - text->X = pcb_round((double)text->X * sx); + text->X = rnd_round((double)text->X * sx); if (sy != 1.0) - text->Y = pcb_round((double)text->Y * sy); + text->Y = rnd_round((double)text->Y * sy); if ((sx != 1.0) || (sy != 1.0)) - text->Scale = pcb_round((double)text->Scale * (sy+sx)/2.0); + text->Scale = rnd_round((double)text->Scale * (sy+sx)/2.0); if ((sth != 1.0) && (text->thickness > 0.0)) - text->thickness = pcb_round((double)text->thickness * sth); + text->thickness = rnd_round((double)text->thickness * sth); pcb_text_bbox(pcb_font(PCB, text->fid, 1), text); if (onbrd) @@ -1020,8 +1020,8 @@ /* transform each coordinate */ for(n = 0, p = poly->Points; n < max; n++,p++) { - x[n] = pcb_round(pcb_xform_x(mx, p->X + xo, p->Y)); - y[n] = pcb_round(pcb_xform_y(mx, p->X + xo, p->Y)); + x[n] = rnd_round(pcb_xform_x(mx, p->X + xo, p->Y)); + y[n] = rnd_round(pcb_xform_y(mx, p->X + xo, p->Y)); } if ((info != NULL) && (info->xform != NULL) && (info->xform->bloat != 0)) { @@ -1039,8 +1039,8 @@ dv = 0.5; pcb_polo_offs(info->xform->bloat*dv, pp, max); for(n = 0, p = pp; n < max; n++,p++) { - x[n] = pcb_round(p->x); - y[n] = pcb_round(p->y); + x[n] = rnd_round(p->x); + y[n] = rnd_round(p->y); } } @@ -1110,10 +1110,10 @@ { rnd_coord_t tx1, ty1, tx2, ty2; - tx1 = pcb_round(pcb_xform_x(mx, x1, y1)); - ty1 = pcb_round(pcb_xform_y(mx, x1, y1)); - tx2 = pcb_round(pcb_xform_x(mx, x2, y2)); - ty2 = pcb_round(pcb_xform_y(mx, x2, y2)); + tx1 = rnd_round(pcb_xform_x(mx, x1, y1)); + ty1 = rnd_round(pcb_xform_y(mx, x1, y1)); + tx2 = rnd_round(pcb_xform_x(mx, x2, y2)); + ty2 = rnd_round(pcb_xform_y(mx, x2, y2)); tx1 += xordx; ty1 += xordy; @@ -1199,10 +1199,10 @@ for (n = font->Symbol[*string].LineN; n; n--, line++) { /* create one line, scale, move, rotate and swap it */ newline = *line; - newline.Point1.X = pcb_round(pcb_xform_x(mx, line->Point1.X+x, line->Point1.Y)); - newline.Point1.Y = pcb_round(pcb_xform_y(mx, line->Point1.X+x, line->Point1.Y)); - newline.Point2.X = pcb_round(pcb_xform_x(mx, line->Point2.X+x, line->Point2.Y)); - newline.Point2.Y = pcb_round(pcb_xform_y(mx, line->Point2.X+x, line->Point2.Y)); + newline.Point1.X = rnd_round(pcb_xform_x(mx, line->Point1.X+x, line->Point1.Y)); + newline.Point1.Y = rnd_round(pcb_xform_y(mx, line->Point1.X+x, line->Point1.Y)); + newline.Point2.X = rnd_round(pcb_xform_x(mx, line->Point2.X+x, line->Point2.Y)); + newline.Point2.Y = rnd_round(pcb_xform_y(mx, line->Point2.X+x, line->Point2.Y)); newline.Thickness = PCB_SCALE_TEXT(newline.Thickness, scale / 2); if (newline.Thickness < min_line_width) @@ -1223,8 +1223,8 @@ for(a = arclist_first(&font->Symbol[*string].arcs); a != NULL; a = arclist_next(a)) { newarc = *a; - newarc.X = pcb_round(pcb_xform_x(mx, a->X + x, a->Y)); - newarc.Y = pcb_round(pcb_xform_y(mx, a->X + x, a->Y)); + newarc.X = rnd_round(pcb_xform_x(mx, a->X + x, a->Y)); + newarc.Y = rnd_round(pcb_xform_y(mx, a->X + x, a->Y)); newarc.Height = newarc.Width = PCB_SCALE_TEXT(newarc.Height, scale); newarc.Thickness = PCB_SCALE_TEXT(newarc.Thickness, scale / 2); newarc.StartAngle += rotdeg; @@ -1259,14 +1259,14 @@ rnd_coord_t size = (font->DefaultSymbol.X2 - font->DefaultSymbol.X1) * 6 / 5; rnd_coord_t px[4], py[4]; - px[0] = pcb_round(pcb_xform_x(mx, font->DefaultSymbol.X1 + x, font->DefaultSymbol.Y1)); - py[0] = pcb_round(pcb_xform_y(mx, font->DefaultSymbol.X1 + x, font->DefaultSymbol.Y1)); - px[1] = pcb_round(pcb_xform_x(mx, font->DefaultSymbol.X2 + x, font->DefaultSymbol.Y1)); - py[1] = pcb_round(pcb_xform_y(mx, font->DefaultSymbol.X2 + x, font->DefaultSymbol.Y1)); - px[2] = pcb_round(pcb_xform_x(mx, font->DefaultSymbol.X2 + x, font->DefaultSymbol.Y2)); - py[2] = pcb_round(pcb_xform_y(mx, font->DefaultSymbol.X2 + x, font->DefaultSymbol.Y2)); - px[3] = pcb_round(pcb_xform_x(mx, font->DefaultSymbol.X1 + x, font->DefaultSymbol.Y2)); - py[3] = pcb_round(pcb_xform_y(mx, font->DefaultSymbol.X1 + x, font->DefaultSymbol.Y2)); + px[0] = rnd_round(pcb_xform_x(mx, font->DefaultSymbol.X1 + x, font->DefaultSymbol.Y1)); + py[0] = rnd_round(pcb_xform_y(mx, font->DefaultSymbol.X1 + x, font->DefaultSymbol.Y1)); + px[1] = rnd_round(pcb_xform_x(mx, font->DefaultSymbol.X2 + x, font->DefaultSymbol.Y1)); + py[1] = rnd_round(pcb_xform_y(mx, font->DefaultSymbol.X2 + x, font->DefaultSymbol.Y1)); + px[2] = rnd_round(pcb_xform_x(mx, font->DefaultSymbol.X2 + x, font->DefaultSymbol.Y2)); + py[2] = rnd_round(pcb_xform_y(mx, font->DefaultSymbol.X2 + x, font->DefaultSymbol.Y2)); + px[3] = rnd_round(pcb_xform_x(mx, font->DefaultSymbol.X1 + x, font->DefaultSymbol.Y2)); + py[3] = rnd_round(pcb_xform_y(mx, font->DefaultSymbol.X1 + x, font->DefaultSymbol.Y2)); /* draw move on to next cursor position */ if ((cb == NULL) && (xordraw || (info->xform->thin_draw || info->xform->wireframe))) { @@ -1538,7 +1538,7 @@ r = fmod(rot, 90.0); if (dir_out != NULL) { - int d = pcb_round(rot / 90); + int d = rnd_round(rot / 90); if (d < 0) d += 4; *dir_out = d; Index: trunk/src/obj_text.h =================================================================== --- trunk/src/obj_text.h (revision 30941) +++ trunk/src/obj_text.h (revision 30942) @@ -49,8 +49,8 @@ /* These need to be carefully written to avoid overflows, and return a Coord type. */ -#define PCB_SCALE_TEXT(COORD,TEXTSCALE) ((rnd_coord_t)pcb_round((COORD) * ((double)(TEXTSCALE) / 100.0))) -#define PCB_UNPCB_SCALE_TEXT(COORD,TEXTSCALE) ((rnd_coord_t)pcb_round((COORD) * (100.0 / (double)(TEXTSCALE)))) +#define PCB_SCALE_TEXT(COORD,TEXTSCALE) ((rnd_coord_t)rnd_round((COORD) * ((double)(TEXTSCALE) / 100.0))) +#define PCB_UNPCB_SCALE_TEXT(COORD,TEXTSCALE) ((rnd_coord_t)rnd_round((COORD) * (100.0 / (double)(TEXTSCALE)))) pcb_text_t *pcb_text_alloc(pcb_layer_t * layer); pcb_text_t *pcb_text_alloc_id(pcb_layer_t *layer, long int id); Index: trunk/src/object_act.c =================================================================== --- trunk/src/object_act.c (revision 30941) +++ trunk/src/object_act.c (revision 30942) @@ -141,7 +141,7 @@ if (s->refdes != NULL) buf = pcb_strdup_printf("Subcircuit %s Attributes", s->refdes); else - buf = pcb_strdup("Unnamed Subcircuit's Attributes"); + buf = rnd_strdup("Unnamed Subcircuit's Attributes"); pcb_gui->edit_attributes(pcb_gui, buf, &(s->Attributes)); free(buf); @@ -458,15 +458,15 @@ plc->ly = conf_core.import.footprint_placement.y; plc->dd = conf_core.import.footprint_placement.disperse; - if (pcb_strcasecmp(conf_plc_met, "disperse") == 0) plc->plc_method = PLC_DISPERSE; - else if (pcb_strcasecmp(conf_plc_met, "frame") == 0) plc->plc_method = PLC_FRAME; - else if (pcb_strcasecmp(conf_plc_met, "fit") == 0) plc->plc_method = PLC_FIT; + if (rnd_strcasecmp(conf_plc_met, "disperse") == 0) plc->plc_method = PLC_DISPERSE; + else if (rnd_strcasecmp(conf_plc_met, "frame") == 0) plc->plc_method = PLC_FRAME; + else if (rnd_strcasecmp(conf_plc_met, "fit") == 0) plc->plc_method = PLC_FIT; else rnd_message(PCB_MSG_ERROR, "Invalid import/footprint_placement/method '%s', falling back to disperse\n", conf_plc_met); s = conf_core.import.footprint_placement.location; if ((s == NULL) || (*s == '\0')) plc->location = PLC_AT; - else if (pcb_strcasecmp(s, "mark") == 0) plc->location = PLC_MARK; - else if (pcb_strcasecmp(s, "center") == 0) plc->location = PLC_CENTER; + else if (rnd_strcasecmp(s, "mark") == 0) plc->location = PLC_MARK; + else if (rnd_strcasecmp(s, "center") == 0) plc->location = PLC_CENTER; else rnd_message(PCB_MSG_ERROR, "Invalid import/footprint_placement/location '%s', falling back to coordinates\n", s); } @@ -478,9 +478,9 @@ } if ((conf_rem_met != NULL) && (*conf_rem_met != '\0')) { - if (pcb_strcasecmp(conf_rem_met, "select") == 0) plc->rem_method = PLC_SELECT; - else if (pcb_strcasecmp(conf_rem_met, "remove") == 0) plc->rem_method = PLC_REMOVE; - else if (pcb_strcasecmp(conf_rem_met, "list") == 0) plc->rem_method = PLC_LIST; + if (rnd_strcasecmp(conf_rem_met, "select") == 0) plc->rem_method = PLC_SELECT; + else if (rnd_strcasecmp(conf_rem_met, "remove") == 0) plc->rem_method = PLC_REMOVE; + else if (rnd_strcasecmp(conf_rem_met, "list") == 0) plc->rem_method = PLC_LIST; else rnd_message(PCB_MSG_ERROR, "Invalid import/footprint_removal/method '%s', falling back to select\n", conf_plc_met); } @@ -512,8 +512,8 @@ /* not yet implemented */ case PLC_DISPERSE: if (plc->dd > 0) { - px += pcb_rand() % (plc->dd * 2) - plc->dd; - py += pcb_rand() % (plc->dd * 2) - plc->dd; + px += rnd_rand() % (plc->dd * 2) - plc->dd; + py += rnd_rand() % (plc->dd * 2) - plc->dd; } break; case PLC_FRAME: @@ -934,7 +934,7 @@ rnd_PCB_ACT_MAY_CONVARG(2, FGW_STR, MinClearGap, delta = argv[2].val.str); rnd_PCB_ACT_MAY_CONVARG(3, FGW_STR, MinClearGap, delta = argv[3].val.str); - if (pcb_strcasecmp(function, "Selected") == 0) + if (rnd_strcasecmp(function, "Selected") == 0) flags = PCB_FLAG_SELECTED; else { units = delta; Index: trunk/src/pcb_minuid.c =================================================================== --- trunk/src/pcb_minuid.c (revision 30941) +++ trunk/src/pcb_minuid.c (revision 30942) @@ -7,7 +7,7 @@ void pcb_minuid_init(void) { - int pid = pcb_getpid(); + int pid = rnd_getpid(); minuid_init(&pcb_minuid); minuid_salt(&pcb_minuid, &pid, sizeof(pid)); } Index: trunk/src/plug_footprint.c =================================================================== --- trunk/src/plug_footprint.c (revision 30941) +++ trunk/src/plug_footprint.c (revision 30942) @@ -48,7 +48,7 @@ { char *newname, *s; - *basename = newname = pcb_strdup(name); + *basename = newname = rnd_strdup(name); s = strchr(newname, '('); if (s == NULL) { *params = NULL; @@ -78,7 +78,7 @@ fp_tags = htsp_alloc(strhash, strkeyeq); e = htsp_getentry(fp_tags, tag); if ((e == NULL) && alloc) { - htsp_set(fp_tags, pcb_strdup(tag), (void *) counter); + htsp_set(fp_tags, rnd_strdup(tag), (void *) counter); counter++; e = htsp_getentry(fp_tags, tag); } @@ -88,7 +88,7 @@ void pcb_fp_init() { pcb_library.type = PCB_LIB_DIR; - pcb_library.name = pcb_strdup("/"); /* All names are eventually free()'d */ + pcb_library.name = rnd_strdup("/"); /* All names are eventually free()'d */ } void pcb_fp_uninit() @@ -122,7 +122,7 @@ if (sep != NULL) { long offs = sep - name; - fctx->filename = pcb_strdup(name); + fctx->filename = rnd_strdup(name); sep = (char *)fctx->filename + offs; *sep = '\0'; fctx->free_filename = 0; @@ -174,7 +174,7 @@ strcpy(entry->name+nl, "()"); } else - entry->name = pcb_strdup(name); + entry->name = rnd_strdup(name); entry->type = PCB_LIB_FOOTPRINT; entry->data.fp.type = type; @@ -220,9 +220,9 @@ pcb_fplibrary_t *l = pcb_get_library_memory(parent); if (name_len > 0) - l->name = pcb_strndup(name, name_len); + l->name = rnd_strndup(name, name_len); else - l->name = pcb_strdup(name); + l->name = rnd_strdup(name); l->parent = parent; l->type = PCB_LIB_DIR; l->data.dir.backend = NULL; @@ -469,7 +469,7 @@ if ((be == NULL) || (be->load_dir == NULL)) return -1; - path = pcb_strdup(l->name); + path = rnd_strdup(l->name); pcb_fp_rmdir(l); res = be->load_dir(be, path, 1); pcb_fp_sort_children(&pcb_library); Index: trunk/src/plug_io.c =================================================================== --- trunk/src/plug_io.c (revision 30941) +++ trunk/src/plug_io.c (revision 30942) @@ -121,7 +121,7 @@ last_design_dir = rnd_lrealpath(fn); if (last_design_dir == NULL) { - last_design_dir = pcb_strdup(""); + last_design_dir = rnd_strdup(""); conf_force_set_str(conf_core.rc.path.design, last_design_dir); pcb_conf_ro("rc/path/design"); return; @@ -814,7 +814,7 @@ /* memory might have been released before this function is called */ if (PCB && PCB->Changed && (conf_core.rc.emergency_name != NULL) && (*conf_core.rc.emergency_name != '\0')) { const char *fmt = conf_core.rc.emergency_format == NULL ? DEFAULT_EMERGENCY_FMT : conf_core.rc.emergency_format; - sprintf(filename, conf_core.rc.emergency_name, (long int)pcb_getpid()); + sprintf(filename, conf_core.rc.emergency_name, (long int)rnd_getpid()); rnd_message(PCB_MSG_INFO, "Trying to save your layout in '%s'\n", filename); pcb_write_pcb_file(filename, pcb_true, fmt, pcb_true, pcb_false, -1, 0); } @@ -1048,7 +1048,7 @@ switch(head->type) { case PCB_FP_INVALID: /* first append */ (*tail)->type = PCB_FP_FILE; - (*tail)->name = pcb_strdup(fpname); + (*tail)->name = rnd_strdup(fpname); break; case PCB_FP_FILE: /* second append */ /* clone the existing head */ @@ -1059,7 +1059,7 @@ head->type = PCB_FP_DIR; head->libtype = PCB_LIB_DIR; - head->name = pcb_strdup(filename); + head->name = rnd_strdup(filename); head->next = m; *tail = m; @@ -1068,7 +1068,7 @@ m = calloc(sizeof(pcb_plug_fp_map_t), 1); m->type = PCB_FP_FILE; m->libtype = PCB_LIB_FOOTPRINT; - m->name = pcb_strdup(fpname); + m->name = rnd_strdup(fpname); (*tail)->next = m; *tail = m; Index: trunk/src/rats_patch.c =================================================================== --- trunk/src/rats_patch.c (revision 30941) +++ trunk/src/rats_patch.c (revision 30942) @@ -149,9 +149,9 @@ undo_ratspatch_append_t *a; char *nid = NULL, *na1 = NULL, *na2 = NULL; - if (id != NULL) nid = pcb_strdup(id); - if (a1 != NULL) na1 = pcb_strdup(a1); - if (a2 != NULL) na2 = pcb_strdup(a2); + if (id != NULL) nid = rnd_strdup(id); + if (a1 != NULL) na1 = rnd_strdup(a1); + if (a2 != NULL) na2 = rnd_strdup(a2); if (undoable) { a = pcb_undo_alloc(pcb, &undo_ratspatch_append, sizeof(undo_ratspatch_append_t)); @@ -481,7 +481,7 @@ } } else - fpname = pcb_strdup(fpname); + fpname = rnd_strdup(fpname); if (strcmp(fpname, "@buffer") != 0) { /* check if the footprint is available */ @@ -568,7 +568,7 @@ } /* fetch the name of the new footprint */ - rnd_PCB_ACT_MAY_CONVARG(2, FGW_STR, ReplaceFootprint, fpname = pcb_strdup(argv[2].val.str)); + rnd_PCB_ACT_MAY_CONVARG(2, FGW_STR, ReplaceFootprint, fpname = rnd_strdup(argv[2].val.str)); if (act_replace_footprint_src(fpname, &news) != 0) { RND_ACT_IRES(1); return 0; @@ -603,12 +603,12 @@ default_file = malloc(len + 8); memcpy(default_file, PCB->hidlib.filename, len + 1); end = strrchr(default_file, '.'); - if ((end == NULL) || (pcb_strcasecmp(end, ".pcb") != 0)) + if ((end == NULL) || (rnd_strcasecmp(end, ".pcb") != 0)) end = default_file + len; strcpy(end, ".bap"); } else - default_file = pcb_strdup("unnamed.bap"); + default_file = rnd_strdup("unnamed.bap"); fn = pcb_gui->fileselect(pcb_gui, "Save netlist patch as ...", "Choose a file to save netlist patch to\n" Index: trunk/src/route.c =================================================================== --- trunk/src/route.c (revision 30941) +++ trunk/src/route.c (revision 30942) @@ -133,8 +133,8 @@ p_object->layer = layer; p_object->type = PCB_OBJ_ARC; - p_route->end_point.X = pcb_round((double)center->X - ((double)radius * cos((start_angle + delta) * PCB_M180))); - p_route->end_point.Y = pcb_round((double)center->Y + ((double)radius * sin((start_angle + delta) * PCB_M180))); + p_route->end_point.X = rnd_round((double)center->X - ((double)radius * cos((start_angle + delta) * PCB_M180))); + p_route->end_point.Y = rnd_round((double)center->Y + ((double)radius * sin((start_angle + delta) * PCB_M180))); } Index: trunk/src/select.c =================================================================== --- trunk/src/select.c (revision 30941) +++ trunk/src/select.c (revision 30942) @@ -519,7 +519,7 @@ static int strlst_match(const char **pat, const char *name) { for (; *pat != NULL; pat++) - if (pcb_strcasecmp(*pat, name) == 0) + if (rnd_strcasecmp(*pat, name) == 0) return 1; return 0; } Index: trunk/src/thermal.c =================================================================== --- trunk/src/thermal.c (revision 30941) +++ trunk/src/thermal.c (revision 30942) @@ -112,8 +112,8 @@ ltmp.Flags = pcb_flag_make(PCB_FLAG_SQUARE); else ltmp.Flags = pcb_no_flags(); - ltmp.Point1.X = pcb_round(x1); ltmp.Point1.Y = pcb_round(y1); - ltmp.Point2.X = pcb_round(x2); ltmp.Point2.Y = pcb_round(y2); + ltmp.Point1.X = rnd_round(x1); ltmp.Point1.Y = rnd_round(y1); + ltmp.Point2.X = rnd_round(x2); ltmp.Point2.Y = rnd_round(y2); return pcb_poly_from_pcb_line(<mp, clr); } @@ -129,8 +129,8 @@ /* pcb_trace("sa=%f ea=%f diff=%f\n", sa, ea, ea-sa);*/ atmp.Flags = pcb_no_flags(); - atmp.X = pcb_round(cx); - atmp.Y = pcb_round(cy); + atmp.X = rnd_round(cx); + atmp.Y = rnd_round(cy); da = ea-sa; if ((da < max_span_angle) && (da > -max_span_angle)) { Index: trunk/src/undo_act.c =================================================================== --- trunk/src/undo_act.c (revision 30941) +++ trunk/src/undo_act.c (revision 30942) @@ -110,13 +110,13 @@ } else if (function) { pcb_hid_notify_crosshair_change(RND_ACT_HIDLIB, pcb_false); - if (pcb_strcasecmp(function, "ClearList") == 0) + if (rnd_strcasecmp(function, "ClearList") == 0) pcb_undo_clear_list(pcb_false); - else if (pcb_strcasecmp(function, "FreezeSerial") == 0) + else if (rnd_strcasecmp(function, "FreezeSerial") == 0) pcb_undo_freeze_serial(); - else if (pcb_strcasecmp(function, "UnFreezeSerial") == 0) + else if (rnd_strcasecmp(function, "UnFreezeSerial") == 0) pcb_undo_unfreeze_serial(); - else if (pcb_strcasecmp(function, "IncSerial") == 0) + else if (rnd_strcasecmp(function, "IncSerial") == 0) pcb_undo_inc_serial(); } pcb_hid_notify_crosshair_change(RND_ACT_HIDLIB, pcb_true); Index: trunk/src/view.c =================================================================== --- trunk/src/view.c (revision 30941) +++ trunk/src/view.c (revision 30942) @@ -129,9 +129,9 @@ if (title == NULL) title = ""; if (description == NULL) description = ""; - v->type = pcb_strdup(type); - v->title = pcb_strdup(title); - v->description = pcb_strdup(description); + v->type = rnd_strdup(type); + v->title = rnd_strdup(title); + v->description = rnd_strdup(description); v->hidlib = hl; return v; Index: trunk/src_plugins/acompnet/acompnet.c =================================================================== --- trunk/src_plugins/acompnet/acompnet.c (revision 30941) +++ trunk/src_plugins/acompnet/acompnet.c (revision 30942) @@ -107,12 +107,12 @@ overlap_t ovl; rnd_box_t bbox; - x = pcb_round(x); - y = pcb_round(y); + x = rnd_round(x); + y = rnd_round(y); ovl.x = x; ovl.y = y; - ovl.r = pcb_round(sep/2-1); + ovl.r = rnd_round(sep/2-1); bbox.X1 = x - ovl.r; bbox.X2 = x + ovl.r; bbox.Y1 = y - ovl.r; Index: trunk/src_plugins/act_draw/act_draw.c =================================================================== --- trunk/src_plugins/act_draw/act_draw.c (revision 30941) +++ trunk/src_plugins/act_draw/act_draw.c (revision 30942) @@ -257,7 +257,7 @@ static long poly_append_ptlist(pcb_poly_t *poly, const char *ptlist) { long len; - char *s, *next, *tmp = pcb_strdup(ptlist); + char *s, *next, *tmp = rnd_strdup(ptlist); double c[2]; rnd_bool success; Index: trunk/src_plugins/asm/asm.c =================================================================== --- trunk/src_plugins/asm/asm.c (revision 30941) +++ trunk/src_plugins/asm/asm.c (revision 30942) @@ -106,7 +106,7 @@ static char *templ_compile(gdl_list_t *dst, const char *src_) { - char *s, *next, *src = pcb_strdup(src_); + char *s, *next, *src = rnd_strdup(src_); for(s = src; (s != NULL) && (*s != '\0'); s = next) { while(isspace(*s) || (*s == ',')) s++; Index: trunk/src_plugins/autoplace/autoplace.c =================================================================== --- trunk/src_plugins/autoplace/autoplace.c (revision 30941) +++ trunk/src_plugins/autoplace/autoplace.c (revision 30942) @@ -483,7 +483,7 @@ (*boxpp)->box = subc->BoundingBox; (*boxpp)->comp = (pcb_any_obj_t *)subc; (*boxpp)->refdes = subc->refdes; - (*boxpp)->rot90 = pcb_round(rot / 90.0); + (*boxpp)->rot90 = rnd_round(rot / 90.0); (*boxpp)->vbox = &subc->BoundingBox; } PCB_END_LOOP; @@ -504,7 +504,7 @@ pcb_subc_get_side(subc, &onbtm); pcb_subc_get_rotation(subc, &rot); - rot90 = pcb_round(rot / 90.0); + rot90 = rnd_round(rot / 90.0); boxp = (struct ebox *)r_find_neighbor(onbtm ? rt_s : rt_c, &subc->BoundingBox, dir[i]); /* score bounding box alignments */ @@ -597,9 +597,9 @@ { PerturbationType pt = { 0 }; /* pick subcircuit to perturb */ - pt.comp = (pcb_any_obj_t *) selected->array[pcb_rand() % vtp0_len(selected)]; + pt.comp = (pcb_any_obj_t *) selected->array[rnd_rand() % vtp0_len(selected)]; /* exchange, flip/rotate or shift? */ - switch (pcb_rand() % ((vtp0_len(selected) > 1) ? 3 : 2)) { + switch (rnd_rand() % ((vtp0_len(selected) > 1) ? 3 : 2)) { case 0: { /* shift! */ rnd_coord_t grid; @@ -606,8 +606,8 @@ double scaleX = PCB_CLAMP(sqrt(T), PCB_MIL_TO_COORD(2.5), PCB->hidlib.size_x / 3); double scaleY = PCB_CLAMP(sqrt(T), PCB_MIL_TO_COORD(2.5), PCB->hidlib.size_y / 3); pt.which = SHIFT; - pt.DX = scaleX * 2 * ((((double) pcb_rand()) / RAND_MAX) - 0.5); - pt.DY = scaleY * 2 * ((((double) pcb_rand()) / RAND_MAX) - 0.5); + pt.DX = scaleX * 2 * ((((double) rnd_rand()) / RAND_MAX) - 0.5); + pt.DY = scaleY * 2 * ((((double) rnd_rand()) / RAND_MAX) - 0.5); /* snap to grid. different grids for "high" and "low" T */ grid = (T > PCB_MIL_TO_COORD(10)) ? CostParameter.large_grid_size : CostParameter.small_grid_size; /* (round away from zero) */ @@ -630,7 +630,7 @@ rnd_bool isSMD = is_smd(pt.comp); pt.which = ROTATE; - pt.rotate = isSMD ? (pcb_rand() & 3) : (1 + (pcb_rand() % 3)); + pt.rotate = isSMD ? (rnd_rand() & 3) : (1 + (rnd_rand() % 3)); /* 0 - flip; 1-3, rotate. */ break; } @@ -637,7 +637,7 @@ case 2: { /* exchange! */ pt.which = EXCHANGE; - pt.other = (pcb_any_obj_t *)selected->array[pcb_rand() % (vtp0_len(selected) - 1)]; + pt.other = (pcb_any_obj_t *)selected->array[rnd_rand() % (vtp0_len(selected) - 1)]; if (pt.other == pt.comp) pt.other = (pcb_any_obj_t *)selected->array[vtp0_len(selected) - 1]; /* don't allow exchanging a solderside-side SMD component @@ -781,7 +781,7 @@ good_moves++; steps++; } - else if ((pcb_rand() / (double) RAND_MAX) < exp(MIN(MAX(-20, (C0 - Cprime) / T), 20))) { + else if ((rnd_rand() / (double) RAND_MAX) < exp(MIN(MAX(-20, (C0 - Cprime) / T), 20))) { /* not good but keep it anyway */ C0 = Cprime; steps++; Index: trunk/src_plugins/autoroute/autoroute.c =================================================================== --- trunk/src_plugins/autoroute/autoroute.c (revision 30941) +++ trunk/src_plugins/autoroute/autoroute.c (revision 30942) @@ -4332,7 +4332,7 @@ * end at bigger ones. also prefer to start at planes, then pads */ pcb_heap_insert(net_heap, (float) (b.X2 - b.X1) * #if defined(ROUTE_RANDOMIZED) - (0.3 + pcb_rand() / (RAND_MAX + 1.0)) * + (0.3 + rnd_rand() / (RAND_MAX + 1.0)) * #endif (b.Y2 - b.Y1) * (p->type == PLANE ? -1 : ((p->type == TERM) ? 1 : 10)), p); } Index: trunk/src_plugins/cam/cam.c =================================================================== --- trunk/src_plugins/cam/cam.c (revision 30941) +++ trunk/src_plugins/cam/cam.c (revision 30942) @@ -57,10 +57,10 @@ char *fn = pcb_derive_default_filename_(PCB->hidlib.filename, ""); char *val, *end = strrchr(fn, RND_DIR_SEPARATOR_C); if (end != NULL) - val = pcb_strdup(end+1); + val = rnd_strdup(end+1); else - val = pcb_strdup(fn); - pcb_cam_set_var(ctx->vars, pcb_strdup("base"), val); + val = rnd_strdup(fn); + pcb_cam_set_var(ctx->vars, rnd_strdup("base"), val); free(fn); } } @@ -112,7 +112,7 @@ static int cam_parse_opt_outfile(cam_ctx_t *ctx, const char *optval) { - char *fn, *tmp = pcb_strdup(optval); + char *fn, *tmp = rnd_strdup(optval); int dirlen = prefix_mkdir(tmp, &fn); free(ctx->prefix); @@ -124,7 +124,7 @@ } else ctx->prefix = NULL; - pcb_cam_set_var(ctx->vars, pcb_strdup("base"), pcb_strdup(fn)); + pcb_cam_set_var(ctx->vars, rnd_strdup("base"), rnd_strdup(fn)); free(tmp); return 0; } @@ -136,8 +136,8 @@ if (sep == NULL) return 1; - key = pcb_strndup(opt, sep-opt); - val = pcb_strdup(sep+1); + key = rnd_strndup(opt, sep-opt); + val = rnd_strdup(sep+1); pcb_cam_set_var(ctx->vars, key, val); return 0; } @@ -176,7 +176,7 @@ } } - if (pcb_strcasecmp(cmd, "gui") == 0) { + if (rnd_strcasecmp(cmd, "gui") == 0) { rs = cam_gui(RND_ACT_HIDLIB, arg); } else { @@ -186,12 +186,12 @@ RND_ACT_IRES(1); return 0; } - if (pcb_strcasecmp(cmd, "exec") == 0) { + if (rnd_strcasecmp(cmd, "exec") == 0) { rs = cam_compile(&ctx, arg); if (rs == 0) rs = cam_exec(&ctx); } - else if (pcb_strcasecmp(cmd, "call") == 0) + else if (rnd_strcasecmp(cmd, "call") == 0) rs = cam_call(arg, &ctx); } @@ -234,7 +234,7 @@ cam_export_has_outfile = 0; cam_init_inst(&cam_export_ctx); - cam_export_job = pcb_strdup((*argv)[0]); + cam_export_job = rnd_strdup((*argv)[0]); oargc = (*argc); (*argc)--; for(d = 0, s = 1; s < oargc; s++) { Index: trunk/src_plugins/cam/cam_compile.c =================================================================== --- trunk/src_plugins/cam/cam_compile.c (revision 30941) +++ trunk/src_plugins/cam/cam_compile.c (revision 30942) @@ -186,11 +186,11 @@ if (strcmp(cmd, "desc") == 0) { code->inst = PCB_CAM_DESC; - code->op.desc.arg = pcb_strdup(arg); + code->op.desc.arg = rnd_strdup(arg); } else if (strcmp(cmd, "write") == 0) { code->inst = PCB_CAM_WRITE; - code->op.write.arg = pcb_strdup(arg); + code->op.write.arg = rnd_strdup(arg); } else if (strcmp(cmd, "partial") == 0) { ctx->has_partial = 1; @@ -198,7 +198,7 @@ if ((arg == NULL) || (*arg == '\0')) code->op.partial.arg = NULL; else - code->op.partial.arg = pcb_strdup(arg); + code->op.partial.arg = rnd_strdup(arg); } else if (strcmp(cmd, "full") == 0) { code->inst = PCB_CAM_PARTIAL; @@ -222,7 +222,7 @@ } free(ctx->args); - curr = pcb_strdup(curr == NULL ? "" : curr); + curr = rnd_strdup(curr == NULL ? "" : curr); for(maxa = 0, s = curr; *s != '\0'; s++) if (isspace(*s)) maxa++; @@ -242,7 +242,7 @@ } if (*curr == '\0') continue; - code->op.plugin.argv[code->op.plugin.argc] = pcb_strdup(curr); + code->op.plugin.argv[code->op.plugin.argc] = rnd_strdup(curr); code->op.plugin.argc++; } @@ -257,7 +257,7 @@ static int cam_compile(cam_ctx_t *ctx, const char *script_in) { - char *arg, *curr, *next, *script = pcb_strdup(script_in); + char *arg, *curr, *next, *script = rnd_strdup(script_in); int res = 0, r; for(curr = script; curr != NULL; curr = next) { Index: trunk/src_plugins/cam/cam_gui.c =================================================================== --- trunk/src_plugins/cam/cam_gui.c (revision 30941) +++ trunk/src_plugins/cam/cam_gui.c (revision 30942) @@ -53,7 +53,7 @@ /* remember cursor */ r = pcb_dad_tree_get_selected(attr); if (r != NULL) - cursor_path = pcb_strdup(r->cell[0]); + cursor_path = rnd_strdup(r->cell[0]); /* remove existing items */ pcb_dad_tree_clear(tree); @@ -66,7 +66,7 @@ cell[1] = NULL; conf_loop_list(cn->val.list, item, idx) { - cell[0] = pcb_strdup(item->name); + cell[0] = rnd_strdup(item->name); pcb_dad_tree_append(attr, NULL, cell); } } @@ -115,7 +115,7 @@ cell[2] = ""; if (plugin != NULL) - cell[1] = pcb_strdup(plugin->op.plugin.exporter->name); + cell[1] = rnd_strdup(plugin->op.plugin.exporter->name); else cell[1] = ""; @@ -147,7 +147,7 @@ /* remember cursor */ r = pcb_dad_tree_get_selected(attr); if (r != NULL) - cursor_path = pcb_strdup(r->cell[0]); + cursor_path = rnd_strdup(r->cell[0]); /* remove existing items */ pcb_dad_tree_clear(tree); @@ -154,8 +154,8 @@ /* add all new items */ for(e = htsp_first(vars); e != NULL; e = htsp_next(vars, e)) { - cell[0] = pcb_strdup(e->key); - cell[1] = pcb_strdup(e->value); + cell[0] = rnd_strdup(e->key); + cell[1] = rnd_strdup(e->value); cell[2] = NULL; pcb_dad_tree_append(attr, NULL, cell); } @@ -207,7 +207,7 @@ static char *kill_tabs(const char *str_in) { char *res, *o; - res = pcb_strdup(str_in); + res = rnd_strdup(str_in); for(o = res; *o != '\0'; o++) if (*o == '\t') *o = ' '; Index: trunk/src_plugins/ddraft/centgeo.c =================================================================== --- trunk/src_plugins/ddraft/centgeo.c (revision 30941) +++ trunk/src_plugins/ddraft/centgeo.c (revision 30942) @@ -75,8 +75,8 @@ s = 1.0; if (ip != NULL) { - ip->X1 = pcb_round((double)Line1->Point1.X + r * line1_dx); - ip->Y1 = pcb_round((double)Line1->Point1.Y + r * line1_dy); + ip->X1 = rnd_round((double)Line1->Point1.X + r * line1_dx); + ip->Y1 = rnd_round((double)Line1->Point1.Y + r * line1_dy); if (s == 1.0) { ip->X2 = Line1->Point2.X; ip->Y2 = Line1->Point2.Y; @@ -102,8 +102,8 @@ if (r >= 0.0 && r <= 1.0) { if (s >= 0.0 && s <= 1.0) { if (ip != NULL) { - ip->X1 = pcb_round((double)Line1->Point1.X + r * line1_dx); - ip->Y1 = pcb_round((double)Line1->Point1.Y + r * line1_dy); + ip->X1 = rnd_round((double)Line1->Point1.X + r * line1_dx); + ip->Y1 = rnd_round((double)Line1->Point1.Y + r * line1_dy); } if (offs != NULL) offs[0] = r; @@ -124,8 +124,8 @@ line_dx = line->Point2.X - line->Point1.X; line_dy = line->Point2.Y - line->Point1.Y; - *dstx = pcb_round((double)line->Point1.X + offs * line_dx); - *dsty = pcb_round((double)line->Point1.Y + offs * line_dy); + *dstx = rnd_round((double)line->Point1.X + offs * line_dx); + *dsty = rnd_round((double)line->Point1.Y + offs * line_dy); } double pcb_cline_pt_offs(pcb_line_t *line, rnd_coord_t px, rnd_coord_t py) @@ -215,8 +215,8 @@ r = (Radius + r2) / l; if ((r >= 0) && (r <= 1)) { - ix = pcb_round(Line->Point1.X + r * dx); - iy = pcb_round(Line->Point1.Y + r * dy); + ix = rnd_round(Line->Point1.X + r * dx); + iy = rnd_round(Line->Point1.Y + r * dy); if (!line_ep(Line, ix, iy) && pcb_is_point_on_arc(ix, iy, 1, Arc)) { if (oline) append(r, ix, iy); @@ -227,8 +227,8 @@ r = (Radius - r2) / l; if ((r >= 0) && (r <= 1)) { - ix = pcb_round(Line->Point1.X + r * dx); - iy = pcb_round(Line->Point1.Y + r * dy); + ix = rnd_round(Line->Point1.X + r * dx); + iy = rnd_round(Line->Point1.Y + r * dy); if (!line_ep(Line, ix, iy) && pcb_is_point_on_arc(ix, iy, 1, Arc)) { if (oline) append(r, ix, iy); Index: trunk/src_plugins/ddraft/cli.c =================================================================== --- trunk/src_plugins/ddraft/cli.c (revision 30941) +++ trunk/src_plugins/ddraft/cli.c (revision 30942) @@ -109,7 +109,7 @@ return CLI_INVALID; for(p = cli_tnames; p->name != NULL; p++) { - if (pcb_strncasecmp(p->name, type, typelen) == 0) { + if (rnd_strncasecmp(p->name, type, typelen) == 0) { if (found != NULL) return CLI_INVALID; /* multiple match */ found = p; @@ -426,10 +426,10 @@ if (moved) { if ((annot) && (len > 0)) { rnd_coord_t *c = vtc0_alloc_append(&pcb_ddraft_attached.annot_lines, 4); - c[0] = pcb_round(lx); - c[1] = pcb_round(ly); - c[2] = pcb_round(x); - c[3] = pcb_round(y); + c[0] = rnd_round(lx); + c[1] = rnd_round(ly); + c[2] = rnd_round(x); + c[3] = rnd_round(y); } angle = atan2(y - ly, x - lx) * PCB_RAD_TO_DEG; lx = x; @@ -441,8 +441,8 @@ over:; if (have_angle || have_dist) /* could not apply */ return -1; - *ox = pcb_round(x); - *oy = pcb_round(y); + *ox = rnd_round(x); + *oy = rnd_round(y); return n; } @@ -482,7 +482,7 @@ return NULL; for(p = ddraft_ops; p->name != NULL; p++) { - if (pcb_strncasecmp(p->name, op, oplen) == 0) { + if (rnd_strncasecmp(p->name, op, oplen) == 0) { if (found != NULL) return NULL; /* multiple match */ found = p; Index: trunk/src_plugins/ddraft/constraint_gui.c =================================================================== --- trunk/src_plugins/ddraft/constraint_gui.c (revision 30941) +++ trunk/src_plugins/ddraft/constraint_gui.c (revision 30942) @@ -66,7 +66,7 @@ len -= l; \ end += l; \ } \ - PCB_DAD_SET_VALUE(cnstgui_ctx.dlg_hid_ctx, cnstgui_ctx.name, str, pcb_strdup(buff)); \ + PCB_DAD_SET_VALUE(cnstgui_ctx.dlg_hid_ctx, cnstgui_ctx.name, str, rnd_strdup(buff)); \ } while(0) #define c2g_float(name) \ @@ -140,9 +140,9 @@ static void reset_line(void *hid_ctx, void *caller_data, pcb_hid_attribute_t *attr) { - PCB_DAD_SET_VALUE(cnstgui_ctx.dlg_hid_ctx, cnstgui_ctx.line_angle, str, pcb_strdup("")); + PCB_DAD_SET_VALUE(cnstgui_ctx.dlg_hid_ctx, cnstgui_ctx.line_angle, str, rnd_strdup("")); PCB_DAD_SET_VALUE(cnstgui_ctx.dlg_hid_ctx, cnstgui_ctx.line_angle_mod, dbl, 0); - PCB_DAD_SET_VALUE(cnstgui_ctx.dlg_hid_ctx, cnstgui_ctx.line_length, str, pcb_strdup("")); + PCB_DAD_SET_VALUE(cnstgui_ctx.dlg_hid_ctx, cnstgui_ctx.line_length, str, rnd_strdup("")); PCB_DAD_SET_VALUE(cnstgui_ctx.dlg_hid_ctx, cnstgui_ctx.line_length_mod, crd, 0); gui2cons(hid_ctx, caller_data, attr); } @@ -149,9 +149,9 @@ static void reset_move(void *hid_ctx, void *caller_data, pcb_hid_attribute_t *attr) { - PCB_DAD_SET_VALUE(cnstgui_ctx.dlg_hid_ctx, cnstgui_ctx.move_angle, str, pcb_strdup("")); + PCB_DAD_SET_VALUE(cnstgui_ctx.dlg_hid_ctx, cnstgui_ctx.move_angle, str, rnd_strdup("")); PCB_DAD_SET_VALUE(cnstgui_ctx.dlg_hid_ctx, cnstgui_ctx.move_angle_mod, dbl, 0); - PCB_DAD_SET_VALUE(cnstgui_ctx.dlg_hid_ctx, cnstgui_ctx.move_length, str, pcb_strdup("")); + PCB_DAD_SET_VALUE(cnstgui_ctx.dlg_hid_ctx, cnstgui_ctx.move_length, str, rnd_strdup("")); PCB_DAD_SET_VALUE(cnstgui_ctx.dlg_hid_ctx, cnstgui_ctx.move_length_mod, crd, 0); gui2cons(hid_ctx, caller_data, attr); } Index: trunk/src_plugins/diag/diag.c =================================================================== --- trunk/src_plugins/diag/diag.c (revision 30941) +++ trunk/src_plugins/diag/diag.c (revision 30942) @@ -464,7 +464,7 @@ rnd_message(PCB_MSG_INFO, "Measuring find.c peformance for %f seconds starting from %ld pins...\n", duration, pins); - from = pcb_dtime(); + from = rnd_dtime(); end = from + duration; do { PCB_SUBC_LOOP(PCB->Data) { @@ -476,7 +476,7 @@ } PCB_END_LOOP; its++; - now = pcb_dtime(); + now = rnd_dtime(); } while(now < end); rnd_message(PCB_MSG_INFO, "find2.c peformance: %d %f pin find per second\n", its, (double)its * (double)pins / (now-from)); RND_ACT_IRES(0); Index: trunk/src_plugins/dialogs/dlg_fontsel.c =================================================================== --- trunk/src_plugins/dialogs/dlg_fontsel.c (revision 30941) +++ trunk/src_plugins/dialogs/dlg_fontsel.c (revision 30942) @@ -211,7 +211,7 @@ rnd_PCB_ACT_MAY_CONVARG(1, FGW_STR, Fontsel, op = argv[1].val.str); if (op != NULL) { - if (pcb_strcasecmp(op, "Object") == 0) { + if (rnd_strcasecmp(op, "Object") == 0) { rnd_coord_t x, y; int type; void *ptr1, *ptr2, *ptr3; Index: trunk/src_plugins/dialogs/dlg_layer_binding.c =================================================================== --- trunk/src_plugins/dialogs/dlg_layer_binding.c (revision 30941) +++ trunk/src_plugins/dialogs/dlg_layer_binding.c (revision 30942) @@ -153,13 +153,13 @@ /* name and type */ if (layer_name_mismatch(w, layer)) - PCB_DAD_SET_VALUE(hid_ctx, w->name, str, pcb_strdup(layer->name)); + PCB_DAD_SET_VALUE(hid_ctx, w->name, str, rnd_strdup(layer->name)); if (layer_purpose_mismatch(w, layer)) { char *purp = layer->meta.bound.purpose; if (purp == NULL) purp = ""; - PCB_DAD_SET_VALUE(hid_ctx, w->purpose, str, pcb_strdup(purp)); + PCB_DAD_SET_VALUE(hid_ctx, w->purpose, str, rnd_strdup(purp)); } PCB_DAD_SET_VALUE(hid_ctx, w->comp, lng, layer->comb); @@ -207,7 +207,7 @@ if (layer_name_mismatch(w, layer)) { free((char *)layer->name); - layer->name = pcb_strdup(ctx->attrs[w->name].val.str); + layer->name = rnd_strdup(ctx->attrs[w->name].val.str); } if (layer_purpose_mismatch(w, layer)) { @@ -216,7 +216,7 @@ if ((purp == NULL) || (*purp == '\0')) layer->meta.bound.purpose = NULL; else - layer->meta.bound.purpose = pcb_strdup(purp); + layer->meta.bound.purpose = rnd_strdup(purp); } layer->comb = ctx->attrs[w->comp].val.lng; Index: trunk/src_plugins/dialogs/dlg_layer_flags.c =================================================================== --- trunk/src_plugins/dialogs/dlg_layer_flags.c (revision 30941) +++ trunk/src_plugins/dialogs/dlg_layer_flags.c (revision 30942) @@ -65,7 +65,7 @@ PCB_DAD_END(dlg); - dlg[wname].val.str = pcb_strdup(ly->name); + dlg[wname].val.str = rnd_strdup(ly->name); dlg[wsub].val.lng = ly->comb & PCB_LYC_SUB; dlg[wauto].val.lng = ly->comb & PCB_LYC_AUTO; @@ -143,9 +143,9 @@ PCB_DAD_END(dlg); - dlg[wname].val.str = pcb_strdup(g->name); + dlg[wname].val.str = rnd_strdup(g->name); dlg[wtype].val.lng = orig_type = pcb_ly_type2enum(g->ltype); - dlg[wpurp].val.str = pcb_strdup(g->purpose == NULL ? "" : g->purpose); + dlg[wpurp].val.str = rnd_strdup(g->purpose == NULL ? "" : g->purpose); if (!omit_loc) dlg[wloc].val.lng = def_loc; @@ -202,7 +202,7 @@ if (*dlg[wpurp].val.str == '\0') pcb_layergrp_set_purpose__(g, NULL, 1); else - pcb_layergrp_set_purpose__(g, pcb_strdup(dlg[wpurp].val.str), 1); + pcb_layergrp_set_purpose__(g, rnd_strdup(dlg[wpurp].val.str), 1); changed = 1; } Index: trunk/src_plugins/dialogs/dlg_lib_pstk.c =================================================================== --- trunk/src_plugins/dialogs/dlg_lib_pstk.c (revision 30941) +++ trunk/src_plugins/dialogs/dlg_lib_pstk.c (revision 30942) @@ -100,7 +100,7 @@ /* remember cursor */ r = pcb_dad_tree_get_selected(attr); if (r != NULL) - cursor_path = pcb_strdup(r->cell[0]); + cursor_path = rnd_strdup(r->cell[0]); /* remove existing items */ pcb_dad_tree_clear(tree); @@ -111,11 +111,11 @@ if (!proto->in_use) continue; cell[0] = pcb_strdup_printf("%ld", id); - cell[1] = pcb_strdup(proto->name == NULL ? "" : proto->name); + cell[1] = rnd_strdup(proto->name == NULL ? "" : proto->name); if (ctx->stat != NULL) cell[2] = pcb_strdup_printf("%d", ctx->stat[id]); else - cell[2] = pcb_strdup(""); + cell[2] = rnd_strdup(""); pcb_dad_tree_append(attr, NULL, cell); } @@ -609,7 +609,7 @@ name = pcb_strdup_printf("pcb-rnd padstacks - subcircuit #%ld", subc_id); } else - name = pcb_strdup("pcb-rnd padstacks - board"); + name = rnd_strdup("pcb-rnd padstacks - board"); PCB_DAD_NEW("pstk_lib", ctx->dlg, name, ctx, modal, pstklib_close_cb); Index: trunk/src_plugins/dialogs/dlg_library.c =================================================================== --- trunk/src_plugins/dialogs/dlg_library.c (revision 30941) +++ trunk/src_plugins/dialogs/dlg_library.c (revision 30942) @@ -262,7 +262,7 @@ for(l = parent_lib->data.dir.children.array, n = 0; n < parent_lib->data.dir.children.used; l++, n++) { pcb_hid_row_t *row; - cell[0] = pcb_strdup(l->name); + cell[0] = rnd_strdup(l->name); row = pcb_dad_tree_append_under(attr, parent_row, cell); row->user_data = l; if (l->type == PCB_LIB_DIR) @@ -284,7 +284,7 @@ /* remember cursor */ r = pcb_dad_tree_get_selected(attr); if (r != NULL) - cursor_path = pcb_strdup(r->cell[0]); + cursor_path = rnd_strdup(r->cell[0]); /* remove existing items */ pcb_dad_tree_clear(tree); @@ -443,7 +443,7 @@ attr = &ctx->dlg[ctx->wtree]; tree = attr->wdata; otext = attr_inp->val.str; - text = pcb_strdup(otext); + text = rnd_strdup(otext); have_filter_text = (*text != '\0'); para_start = strchr(otext, '('); @@ -490,7 +490,7 @@ vtp0_init(&taglist); if (tags != NULL) { - tags = pcb_strdup(tags); + tags = rnd_strdup(tags); for (tag = tags; tag != NULL; tag = next) { next = strpbrk(tag, " \t\r\n"); if (next != NULL) { @@ -533,7 +533,7 @@ for(r = gdl_first(rowlist); r != NULL; r = gdl_next(rowlist, r)) { pcb_fplibrary_t *l = r->user_data; - if ((pcb_strncasecmp(r->cell[0], name, namelen) == 0) && (l->type == PCB_LIB_FOOTPRINT) && (l->data.fp.type == PCB_FP_PARAMETRIC)) + if ((rnd_strncasecmp(r->cell[0], name, namelen) == 0) && (l->type == PCB_LIB_FOOTPRINT) && (l->data.fp.type == PCB_FP_PARAMETRIC)) return r; pr = find_fp_prefix_(tree, &r->children, name, namelen); if (pr != NULL) @@ -567,7 +567,7 @@ r = pcb_dad_tree_get_selected(attr); if (!ctx->last_clicked && (otext != NULL)) { - name = pcb_strdup(otext); + name = rnd_strdup(otext); sep = strchr(name, '('); if (sep != NULL) *sep = '\0'; @@ -574,7 +574,7 @@ } else { pcb_fplibrary_t *l = r->user_data; - name = pcb_strdup(l->name); + name = rnd_strdup(l->name); if (name != NULL) { pcb_hid_attr_val_t hv; hv.str = name; @@ -588,7 +588,7 @@ } namelen = strlen(name); - if ((r == NULL) || (pcb_strncasecmp(name, r->cell[0], namelen) != 0)) { + if ((r == NULL) || (rnd_strncasecmp(name, r->cell[0], namelen) != 0)) { /* no selection or wrong selection: go find the right one */ rnew = find_fp_prefix(ctx, name, namelen); } @@ -622,7 +622,7 @@ while((l->parent != NULL) && (l->parent->parent != NULL)) l = l->parent; - oname = pcb_strdup(l->name); /* need to save the name because refresh invalidates l */ + oname = rnd_strdup(l->name); /* need to save the name because refresh invalidates l */ if (pcb_fp_rehash(&PCB->hidlib, l) == 0) rnd_message(PCB_MSG_INFO, "Refreshed library '%s'\n", oname); Index: trunk/src_plugins/dialogs/dlg_library_param.c =================================================================== --- trunk/src_plugins/dialogs/dlg_library_param.c (revision 30941) +++ trunk/src_plugins/dialogs/dlg_library_param.c (revision 30942) @@ -127,7 +127,7 @@ curr_type = PCB_HATT_END; \ curr = -1; \ vtp0_init(&curr_enum); \ - vtp0_append(&curr_enum, pcb_strdup("")); \ + vtp0_append(&curr_enum, rnd_strdup("")); \ numrows++; \ } while(0) @@ -142,7 +142,7 @@ break; \ pre_append(); \ PCB_DAD_LABEL(library_ctx.pdlg, name); \ - PCB_DAD_HELP(library_ctx.pdlg, pcb_strdup(help)); \ + PCB_DAD_HELP(library_ctx.pdlg, rnd_strdup(help)); \ switch(curr_type) { \ case PCB_HATT_COORD: \ case PCB_HATT_END: \ @@ -166,13 +166,13 @@ ctx->pwid[curr] = PCB_DAD_CURRENT(library_ctx.pdlg); \ PCB_DAD_CHANGE_CB(library_ctx.pdlg, library_param_cb); \ vtp0_init(&curr_enum); \ - vtp0_append(&curr_enum, pcb_strdup("")); \ + vtp0_append(&curr_enum, rnd_strdup("")); \ break; \ default: \ PCB_DAD_LABEL(library_ctx.pdlg, "internal error: invalid type"); \ } \ - PCB_DAD_HELP(library_ctx.pdlg, pcb_strdup(help)); \ - ctx->pnames[curr] = pcb_strdup(name); \ + PCB_DAD_HELP(library_ctx.pdlg, rnd_strdup(help)); \ + ctx->pnames[curr] = rnd_strdup(name); \ htsi_set(&ctx->param_names, ctx->pnames[curr], curr); \ post_append(); \ } while(0) @@ -192,7 +192,7 @@ ctx->num_params = 0; vtp0_init(&curr_enum); - vtp0_append(&curr_enum, pcb_strdup("")); + vtp0_append(&curr_enum, rnd_strdup("")); while(fgets(line, sizeof(line), f) != NULL) { char *end, *col, *arg, *cmd = line; @@ -226,12 +226,12 @@ } else if (strcmp(cmd, "params") == 0) { free(ctx->help_params); - ctx->help_params = pcb_strdup(arg); + ctx->help_params = rnd_strdup(arg); } else if (strcmp(cmd, "example") == 0) { if (examples == 0) { free(ctx->example); - ctx->example = pcb_strdup(arg); + ctx->example = rnd_strdup(arg); } examples++; } @@ -246,8 +246,8 @@ ctx->num_params++; free(name); free(help); - name = pcb_strdup(col); - help = pcb_strdup(arg); + name = rnd_strdup(col); + help = rnd_strdup(arg); curr_type = PCB_HATT_STRING; /* assume string until a dim or enum overrides that */ } else if (strncmp(cmd, "default:", 6) == 0) { @@ -254,7 +254,7 @@ free(help_def); if (arg == NULL) arg = ""; - help_def = pcb_strdup(arg); + help_def = rnd_strdup(arg); } else if (strncmp(cmd, "dim:", 4) == 0) { curr_type = PCB_HATT_COORD; @@ -276,7 +276,7 @@ evl = pcb_strdup_printf("%s (%s)", col, arg); } else - evl = pcb_strdup(col); + evl = rnd_strdup(col); vtp0_append(&curr_enum, evl); } } @@ -413,8 +413,8 @@ help_params = ""; - parain = pcb_strdup(user_params); - parahlp = pcb_strdup(help_params); + parain = rnd_strdup(user_params); + parahlp = rnd_strdup(help_params); /* truncate trailing ")" */ if (*parain != '\0') { Index: trunk/src_plugins/dialogs/dlg_loadsave.c =================================================================== --- trunk/src_plugins/dialogs/dlg_loadsave.c (revision 30941) +++ trunk/src_plugins/dialogs/dlg_loadsave.c (revision 30942) @@ -48,7 +48,7 @@ static char *dup_cwd(void) { char tmp[PCB_PATH_MAX + 1]; - return pcb_strdup(rnd_get_wd(tmp)); + return rnd_strdup(rnd_get_wd(tmp)); } const char pcb_acts_Load[] = "Load()\n" "Load(Layout|LayoutToBuffer|ElementToBuffer|Netlist|Revert)"; @@ -70,13 +70,13 @@ rnd_PCB_ACT_MAY_CONVARG(1, FGW_STR, Load, function = argv[1].val.str); - if (pcb_strcasecmp(function, "Netlist") == 0) + if (rnd_strcasecmp(function, "Netlist") == 0) name = pcb_gui->fileselect(pcb_gui, "Load netlist file", "Import netlist from file", last_netlist, ".net", NULL, "netlist", PCB_HID_FSD_READ, NULL); - else if ((pcb_strcasecmp(function, "FootprintToBuffer") == 0) || (pcb_strcasecmp(function, "ElementToBuffer") == 0)) + else if ((rnd_strcasecmp(function, "FootprintToBuffer") == 0) || (rnd_strcasecmp(function, "ElementToBuffer") == 0)) name = pcb_gui->fileselect(pcb_gui, "Load footprint to buffer", "Import footprint from file", last_footprint, NULL, NULL, "footprint", PCB_HID_FSD_READ, NULL); - else if (pcb_strcasecmp(function, "LayoutToBuffer") == 0) + else if (rnd_strcasecmp(function, "LayoutToBuffer") == 0) name = pcb_gui->fileselect(pcb_gui, "Load layout to buffer", "load layout (board) to buffer", last_layout, NULL, NULL, "board", PCB_HID_FSD_READ, NULL); - else if (pcb_strcasecmp(function, "Layout") == 0) + else if (rnd_strcasecmp(function, "Layout") == 0) name = pcb_gui->fileselect(pcb_gui, "Load layout file", "load layout (board) as board to edit", last_layout, NULL, NULL, "board", PCB_HID_FSD_READ, NULL); else { rnd_message(PCB_MSG_ERROR, "Invalid subcommand for Load(): '%s'\n", function); @@ -405,7 +405,7 @@ rnd_PCB_ACT_MAY_CONVARG(1, FGW_STR, Save, function = argv[1].val.str); - is_dialog = (function != NULL) && (pcb_strncasecmp(function, "Dialog", 6) == 0); + is_dialog = (function != NULL) && (rnd_strncasecmp(function, "Dialog", 6) == 0); if ((!is_dialog) && (argc > 2)) return RND_ACT_CALL_C(pcb_act_SaveTo, res, argc, argv); @@ -412,7 +412,7 @@ memset(&save, 0, sizeof(save)); - if (pcb_strcasecmp(function, "Layout") == 0) + if (rnd_strcasecmp(function, "Layout") == 0) if (PCB->hidlib.filename != NULL) return rnd_actionva(RND_ACT_HIDLIB, "SaveTo", "Layout", NULL); @@ -424,19 +424,19 @@ RND_PCB_ACT_CONVARG(4, FGW_STR, Save, prompt = argv[4].val.str); rnd_PCB_ACT_MAY_CONVARG(5, FGW_STR, Save, default_pattern = argv[5].val.str); - if (pcb_strcasecmp(siot, "pcb") == 0) list_iot = PCB_IOT_PCB; - else if (pcb_strcasecmp(siot, "footprint") == 0) list_iot = PCB_IOT_FOOTPRINT; - else if (pcb_strcasecmp(siot, "font") == 0) list_iot = PCB_IOT_FONT; - else if (pcb_strcasecmp(siot, "buffer") == 0) list_iot = PCB_IOT_BUFFER; + if (rnd_strcasecmp(siot, "pcb") == 0) list_iot = PCB_IOT_PCB; + else if (rnd_strcasecmp(siot, "footprint") == 0) list_iot = PCB_IOT_FOOTPRINT; + else if (rnd_strcasecmp(siot, "font") == 0) list_iot = PCB_IOT_FONT; + else if (rnd_strcasecmp(siot, "buffer") == 0) list_iot = PCB_IOT_BUFFER; else RND_ACT_FAIL(Save); - if (pcb_strcasecmp(sext, "none") == 0) list_ext = PCB_IOL_EXT_NONE; - else if (pcb_strcasecmp(sext, "board") == 0) list_ext = PCB_IOL_EXT_BOARD; - else if (pcb_strcasecmp(sext, "fp") == 0) list_ext = PCB_IOL_EXT_FP; + if (rnd_strcasecmp(sext, "none") == 0) list_ext = PCB_IOL_EXT_NONE; + else if (rnd_strcasecmp(sext, "board") == 0) list_ext = PCB_IOL_EXT_BOARD; + else if (rnd_strcasecmp(sext, "fp") == 0) list_ext = PCB_IOL_EXT_FP; else RND_ACT_FAIL(Save); } - if (pcb_strcasecmp(function, "PasteBuffer") == 0) { + if (rnd_strcasecmp(function, "PasteBuffer") == 0) { default_pattern = conf_core.rc.save_fp_fmt; num_fmts = pcb_io_list(&avail, PCB_IOT_FOOTPRINT, 1, 1, PCB_IOL_EXT_FP); prompt = "Save subcircuit as"; @@ -444,7 +444,7 @@ list_ext = PCB_IOL_EXT_FP; goto list_by_pattern; } - else if (pcb_strcasecmp(function, "DialogByPattern") == 0) { + else if (rnd_strcasecmp(function, "DialogByPattern") == 0) { int n; dialog_by_pattern = 1; @@ -465,7 +465,7 @@ /* look for exact match, case insensitive */ if (fmt < 0) for (n = 0; n < num_fmts; n++) - if (pcb_strcasecmp(avail.plug[n]->description, default_pattern) == 0) + if (rnd_strcasecmp(avail.plug[n]->description, default_pattern) == 0) fmt = n; /* look for partial match */ @@ -540,7 +540,7 @@ if (PCB->hidlib.filename == NULL) name_in = pcb_concat("unnamed", extensions_param[fmt], NULL); else - name_in = pcb_strdup(PCB->hidlib.filename); + name_in = rnd_strdup(PCB->hidlib.filename); } @@ -589,7 +589,7 @@ if (pcbhl_conf.rc.verbose) fprintf(stderr, "Save: Calling SaveTo(%s, %s)\n", function, final_name); - if (pcb_strcasecmp(function, "PasteBuffer") == 0) { + if (rnd_strcasecmp(function, "PasteBuffer") == 0) { const char *sfmt = avail.plug[fmt]->description; if (fmt_param != NULL) sfmt = avail.plug[save.pick]->description; @@ -605,7 +605,7 @@ * ActionSaveTo() will ignore the new file name we * just obtained. */ - if (pcb_strcasecmp(function, "Layout") == 0) + if (rnd_strcasecmp(function, "Layout") == 0) rnd_actionva(RND_ACT_HIDLIB, "SaveTo", "LayoutAs", final_name, sfmt, NULL); else rnd_actionva(RND_ACT_HIDLIB, "SaveTo", function, final_name, sfmt, NULL); Index: trunk/src_plugins/dialogs/dlg_netlist.c =================================================================== --- trunk/src_plugins/dialogs/dlg_netlist.c (revision 30941) +++ trunk/src_plugins/dialogs/dlg_netlist.c (revision 30942) @@ -64,7 +64,7 @@ /* remember cursor */ r = pcb_dad_tree_get_selected(attr); if (r != NULL) - cursor_path = pcb_strdup(r->cell[0]); + cursor_path = rnd_strdup(r->cell[0]); /* remove existing items */ pcb_dad_tree_clear(tree); @@ -73,8 +73,8 @@ if (nets != NULL) { cell[2] = NULL; for(n = nets; *n != NULL; n++) { - cell[0] = pcb_strdup((*n)->name); - cell[1] = pcb_strdup((*n)->inhibit_rats ? "*" : ""); + cell[0] = rnd_strdup((*n)->name); + cell[1] = rnd_strdup((*n)->inhibit_rats ? "*" : ""); pcb_dad_tree_append(attr, NULL, cell); } free(nets); @@ -104,7 +104,7 @@ if (net != NULL) { r = pcb_dad_tree_get_selected(attr); if (r != NULL) - cursor_path = pcb_strdup(r->cell[0]); + cursor_path = rnd_strdup(r->cell[0]); } /* remove existing items */ @@ -172,7 +172,7 @@ pcb_event(&PCB->hidlib, PCB_EVENT_GUI_LEAD_USER, "cci", 0, 0, 0); if (row == NULL) return; - refdes = pcb_strdup(row->cell[0]); + refdes = rnd_strdup(row->cell[0]); term = strchr(refdes, '-'); if (term != NULL) { *term = '\0'; @@ -199,7 +199,7 @@ r = pcb_dad_tree_get_selected(atree); if (r == NULL) return; - name = pcb_strdup(r->cell[0]); + name = rnd_strdup(r->cell[0]); if (w == ctx->wsel) rnd_actionva(&ctx->pcb->hidlib, "netlist", "select", name, NULL); Index: trunk/src_plugins/dialogs/dlg_padstack.c =================================================================== --- trunk/src_plugins/dialogs/dlg_padstack.c (revision 30941) +++ trunk/src_plugins/dialogs/dlg_padstack.c (revision 30942) @@ -171,7 +171,7 @@ free((char *)pse->attrs[pse->prname].val.str); pse->attrs[pse->prname].val.str = NULL; - PCB_DAD_SET_VALUE(hid_ctx, pse->prname, str, pcb_strdup(proto->name == NULL ? "" : proto->name)); + PCB_DAD_SET_VALUE(hid_ctx, pse->prname, str, rnd_strdup(proto->name == NULL ? "" : proto->name)); PCB_DAD_SET_VALUE(hid_ctx, pse->hdia, crd, proto->hdia); PCB_DAD_SET_VALUE(hid_ctx, pse->hplated, lng, proto->hplated); PCB_DAD_SET_VALUE(hid_ctx, pse->htop_val, lng, proto->htop); Index: trunk/src_plugins/dialogs/dlg_pref.c =================================================================== --- trunk/src_plugins/dialogs/dlg_pref.c (revision 30941) +++ trunk/src_plugins/dialogs/dlg_pref.c (revision 30942) @@ -173,7 +173,7 @@ case CFN_STRING: PCB_DAD_STRING(ctx->dlg); item->wid = PCB_DAD_CURRENT(ctx->dlg); - ctx->dlg[item->wid].val.str = pcb_strdup(cn->val.string[0]); + ctx->dlg[item->wid].val.str = rnd_strdup(cn->val.string[0]); PCB_DAD_HELP(ctx->dlg, cn->description); PCB_DAD_CHANGE_CB(ctx->dlg, change_cb); break; Index: trunk/src_plugins/dialogs/dlg_pref_board.c =================================================================== --- trunk/src_plugins/dialogs/dlg_pref_board.c (revision 30941) +++ trunk/src_plugins/dialogs/dlg_pref_board.c (revision 30942) @@ -52,7 +52,7 @@ oldname = PCB_EMPTY(PCB->hidlib.name); if (strcmp(oldname, newname) != 0) { free(PCB->hidlib.name); - PCB->hidlib.name = pcb_strdup(newname); + PCB->hidlib.name = rnd_strdup(newname); changed = 1; } @@ -85,7 +85,7 @@ PCB_DAD_LABEL(ctx->dlg, "Board name"); PCB_DAD_STRING(ctx->dlg); ctx->board.wname = PCB_DAD_CURRENT(ctx->dlg); - ctx->dlg[ctx->board.wname].val.str = pcb_strdup(PCB_EMPTY(PCB->hidlib.name)); + ctx->dlg[ctx->board.wname].val.str = rnd_strdup(PCB_EMPTY(PCB->hidlib.name)); PCB_DAD_CHANGE_CB(ctx->dlg, pref_board_dlg2brd); PCB_DAD_LABEL(ctx->dlg, "Thermal scale"); PCB_DAD_REAL(ctx->dlg, ""); @@ -96,7 +96,7 @@ PCB_DAD_LABEL(ctx->dlg, "Type"); PCB_DAD_LABEL(ctx->dlg, ""); ctx->board.wtype = PCB_DAD_CURRENT(ctx->dlg); - ctx->dlg[ctx->board.wtype].name = pcb_strdup((PCB->is_footprint ? "footprint" : "PCB board")); + ctx->dlg[ctx->board.wtype].name = rnd_strdup((PCB->is_footprint ? "footprint" : "PCB board")); PCB_DAD_CHANGE_CB(ctx->dlg, pref_board_dlg2brd); PCB_DAD_LABEL(ctx->dlg, "Board attributes"); PCB_DAD_BUTTON(ctx->dlg, "Edit..."); Index: trunk/src_plugins/dialogs/dlg_pref_color.c =================================================================== --- trunk/src_plugins/dialogs/dlg_pref_color.c (revision 30941) +++ trunk/src_plugins/dialogs/dlg_pref_color.c (revision 30942) @@ -118,7 +118,7 @@ PCB_DAD_BEGIN_VBOX(ctx->dlg); PCB_DAD_COLOR(ctx->dlg); ctx->color.wgen[n] = w = PCB_DAD_CURRENT(ctx->dlg); - ctx->dlg[w].user_data = pcb_strdup(e->key); + ctx->dlg[w].user_data = rnd_strdup(e->key); PCB_DAD_CHANGE_CB(ctx->dlg, pref_color_gen_cb); PCB_DAD_END(ctx->dlg); PCB_DAD_LABEL(ctx->dlg, nat->description); Index: trunk/src_plugins/dialogs/dlg_pref_conf.c =================================================================== --- trunk/src_plugins/dialogs/dlg_pref_conf.c (revision 30941) +++ trunk/src_plugins/dialogs/dlg_pref_conf.c (revision 30942) @@ -102,7 +102,7 @@ } } else { - cell[0] = pcb_strdup(basename); + cell[0] = rnd_strdup(basename); pcb_dad_tree_append_under(attr, parent, cell); } } @@ -147,7 +147,7 @@ for(n = 0; n < CFR_max_real; n++) { char *cell[5]= {NULL}; - cell[0] = pcb_strdup(pcb_conf_role_name(n)); + cell[0] = rnd_strdup(pcb_conf_role_name(n)); if (nat != NULL) { lht_node_t *nd; long prio = pcb_conf_default_prio[n]; @@ -157,8 +157,8 @@ if (nd != NULL) { /* role, prio, policy, value */ pcb_conf_get_policy_prio(nd, &pol, &prio); cell[1] = pcb_strdup_printf("%ld", prio); - cell[2] = pcb_strdup(pcb_conf_policy_name(pol)); - cell[3] = pcb_strdup(pref_conf_get_val(nd, nat, idx)); + cell[2] = rnd_strdup(pcb_conf_policy_name(pol)); + cell[3] = rnd_strdup(pref_conf_get_val(nd, nat, idx)); } } r = pcb_dad_tree_append(attr, NULL, cell); @@ -217,7 +217,7 @@ hv.str = path == NULL ? "" : path; pcb_gui->attr_dlg_set_value(ctx->dlg_hid_ctx, ctx->conf.wname, &hv); - tmp = pcb_strdup(nat->description); + tmp = rnd_strdup(nat->description); pcb_text_wrap(tmp, DESC_WRAP_WIDTH, '\n', ' '); hv.str = tmp; pcb_gui->attr_dlg_set_value(ctx->dlg_hid_ctx, ctx->conf.wdesc, &hv); @@ -246,9 +246,9 @@ else strval = print_conf_val(n->type, &n->val, buf, sizeof(buf)); - cell[0] = rolename == NULL ? pcb_strdup("") : pcb_strdup(rolename); + cell[0] = rolename == NULL ? rnd_strdup("") : rnd_strdup(rolename); cell[1] = pcb_strdup_printf("%ld", n->prop.prio); - cell[2] = pcb_strdup(strval); + cell[2] = rnd_strdup(strval); cell[3] = 0; pcb_dad_tree_append(attr, NULL, cell); } @@ -487,7 +487,7 @@ if (tabarg != NULL) { pcb_hid_attr_val_t hv; - hv.str = pcb_strdup(tabarg); + hv.str = rnd_strdup(tabarg); pcb_gui->attr_dlg_set_value(ctx->dlg_hid_ctx, ctx->conf.wfilter, &hv); pcb_pref_dlg_conf_filter_cb(ctx->dlg_hid_ctx, ctx, &ctx->dlg[ctx->conf.wfilter]); pcb_dad_tree_expcoll(&ctx->dlg[ctx->conf.wtree], NULL, 1, 1); Index: trunk/src_plugins/dialogs/dlg_pref_confedit.c =================================================================== --- trunk/src_plugins/dialogs/dlg_pref_confedit.c (revision 30941) +++ trunk/src_plugins/dialogs/dlg_pref_confedit.c (revision 30942) @@ -102,7 +102,7 @@ for(nl = nd->data.list.first; nl != NULL; nl = nl->next) { char *cell[2] = {NULL}; if (nl->type == LHT_TEXT) - cell[0] = pcb_strdup(nl->data.text.value); + cell[0] = rnd_strdup(nl->data.text.value); pcb_dad_tree_append(attr, NULL, cell); } } @@ -165,7 +165,7 @@ for(r = gdl_first(&tree->rows); r != NULL; r = gdl_next(&tree->rows, r)) { lht_node_t *n = lht_dom_node_alloc(LHT_TEXT, NULL); lht_dom_list_append(nd, n); - n->data.text.value = pcb_strdup(r->cell[0]); + n->data.text.value = rnd_strdup(r->cell[0]); } pcb_conf_makedirty(ctx->role); pcb_conf_update(ctx->nat->hash_path, ctx->idx); @@ -206,7 +206,7 @@ if (nv == NULL) return; - if (pcb_dad_tree_modify_cell(attr, r, 0, pcb_strdup(nv)) == 0) + if (pcb_dad_tree_modify_cell(attr, r, 0, rnd_strdup(nv)) == 0) pref_conf_editval_cb(hid_ctx, ctx, attr); } @@ -227,7 +227,7 @@ pcb_hid_row_t *r = pcb_dad_tree_get_selected(attr); char *cols[] = {NULL, NULL}; - cols[0] = pcb_strdup(""); + cols[0] = rnd_strdup(""); if (trigger_attr == &ctx->dlg[ctx->winsa]) r = pcb_dad_tree_append(attr, r, cols); Index: trunk/src_plugins/dialogs/dlg_pref_lib.c =================================================================== --- trunk/src_plugins/dialogs/dlg_pref_lib.c (revision 30941) +++ trunk/src_plugins/dialogs/dlg_pref_lib.c (revision 30942) @@ -78,7 +78,7 @@ r = pcb_dad_tree_get_selected(attr); if (r != NULL) { free(pref_ctx.lib.cursor_path); - pref_ctx.lib.cursor_path = pcb_strdup(r->cell[0]); + pref_ctx.lib.cursor_path = rnd_strdup(r->cell[0]); } /* remove all existing entries */ @@ -113,10 +113,10 @@ /* copy everything from the config tree to the dialog */ conf_loop_list_str(&conf_core.rc.library_search_paths, i, s, idx) { char *tmp; - cell[0] = pcb_strdup(i->payload); + cell[0] = rnd_strdup(i->payload); pcb_path_resolve(&PCB->hidlib, cell[0], &tmp, 0, pcb_false); - cell[1] = pcb_strdup(tmp == NULL ? "" : tmp); - cell[2] = pcb_strdup(pref_node_src(i->prop.src)); + cell[1] = rnd_strdup(tmp == NULL ? "" : tmp); + cell[2] = rnd_strdup(pref_node_src(i->prop.src)); cell[3] = NULL; pcb_dad_tree_append(attr, NULL, cell); } @@ -169,10 +169,10 @@ /* append items from the widget */ for(r = gdl_first(&tree->rows); r != NULL; r = gdl_next(&tree->rows, r)) { nd = lht_dom_node_alloc(LHT_TEXT, ""); - nd->data.text.value = pcb_strdup(r->cell[0]); + nd->data.text.value = rnd_strdup(r->cell[0]); nd->doc = m->doc; lht_dom_list_append(lst, nd); - pcb_dad_tree_modify_cell(attr, r, 2, pcb_strdup(pref_node_src(nd))); + pcb_dad_tree_modify_cell(attr, r, 2, rnd_strdup(pref_node_src(nd))); } pcb_conf_update("rc/library_search_paths", -1); @@ -211,7 +211,7 @@ if (prev == NULL) return; - cell[0] = pcb_strdup(r->cell[0]); /* have to copy because this is also the primary key (path for the hash) */ + cell[0] = rnd_strdup(r->cell[0]); /* have to copy because this is also the primary key (path for the hash) */ cell[1] = r->cell[1]; r->cell[1] = NULL; cell[2] = r->cell[2]; r->cell[2] = NULL; cell[3] = NULL; @@ -238,7 +238,7 @@ if (next == NULL) return; - cell[0] = pcb_strdup(r->cell[0]); /* have to copy because this is also the primary key (path for the hash) */ + cell[0] = rnd_strdup(r->cell[0]); /* have to copy because this is also the primary key (path for the hash) */ cell[1] = r->cell[1]; r->cell[1] = NULL; cell[2] = r->cell[2]; r->cell[2] = NULL; cell[3] = NULL; @@ -280,13 +280,13 @@ PCB_DAD_LABEL(ctx.dlg, "Path:"); PCB_DAD_STRING(ctx.dlg); ctx.wpath = PCB_DAD_CURRENT(ctx.dlg); - ctx.dlg[ctx.wpath].val.str = pcb_strdup(cell[0]); + ctx.dlg[ctx.wpath].val.str = rnd_strdup(cell[0]); PCB_DAD_CHANGE_CB(ctx.dlg, lib_cell_edit_update); PCB_DAD_LABEL(ctx.dlg, "Expanded\nversion:"); - PCB_DAD_LABEL(ctx.dlg, pcb_strdup(cell[1])); + PCB_DAD_LABEL(ctx.dlg, rnd_strdup(cell[1])); ctx.wexp = PCB_DAD_CURRENT(ctx.dlg); - ctx.dlg[ctx.wexp].val.str = pcb_strdup(cell[1]); + ctx.dlg[ctx.wexp].val.str = rnd_strdup(cell[1]); PCB_DAD_LABEL(ctx.dlg, ""); PCB_DAD_BUTTON(ctx.dlg, "Help..."); @@ -302,9 +302,9 @@ } free(cell[0]); - cell[0] = pcb_strdup(PCB_EMPTY(ctx.dlg[ctx.wpath].val.str)); + cell[0] = rnd_strdup(PCB_EMPTY(ctx.dlg[ctx.wpath].val.str)); free(cell[1]); - cell[1] = pcb_strdup(PCB_EMPTY(ctx.dlg[ctx.wexp].val.str)); + cell[1] = rnd_strdup(PCB_EMPTY(ctx.dlg[ctx.wexp].val.str)); PCB_DAD_FREE(ctx.dlg); return 0; @@ -335,14 +335,14 @@ } if (pos != 0) { - cell[0] = pcb_strdup(""); - cell[1] = pcb_strdup(""); - cell[2] = pcb_strdup(SRC_BRD); + cell[0] = rnd_strdup(""); + cell[1] = rnd_strdup(""); + cell[2] = rnd_strdup(SRC_BRD); } else { - cell[0] = pcb_strdup(r->cell[0]); - cell[1] = pcb_strdup(r->cell[1]); - cell[2] = pcb_strdup(r->cell[2]); + cell[0] = rnd_strdup(r->cell[0]); + cell[1] = rnd_strdup(r->cell[1]); + cell[2] = rnd_strdup(r->cell[2]); } cell[3] = NULL; Index: trunk/src_plugins/dialogs/dlg_pref_sizes.c =================================================================== --- trunk/src_plugins/dialogs/dlg_pref_sizes.c (revision 30941) +++ trunk/src_plugins/dialogs/dlg_pref_sizes.c (revision 30942) @@ -133,7 +133,7 @@ PCB_DAD_COMPFLAG(ctx->dlg, PCB_HATF_FRAME); PCB_DAD_LABEL(ctx->dlg, "Configure DRC rules:"); for(di = gdl_first(&pcb_drc_impls); di != NULL; di = di->link.next) { - char *ra = pcb_strdup(di->list_rules_action); /* need to strdup it just in case the plugin is unloaded while the preferences dialog is open */ + char *ra = rnd_strdup(di->list_rules_action); /* need to strdup it just in case the plugin is unloaded while the preferences dialog is open */ vtp0_append(&ctx->auto_free, ra); PCB_DAD_BUTTON(ctx->dlg, di->name); PCB_DAD_HELP(ctx->dlg, di->desc); Index: trunk/src_plugins/dialogs/dlg_search_edit.c =================================================================== --- trunk/src_plugins/dialogs/dlg_search_edit.c (revision 30941) +++ trunk/src_plugins/dialogs/dlg_search_edit.c (revision 30942) @@ -50,7 +50,7 @@ switch(ctx->se.expr->rtype) { case RIGHT_STR: - ctx->se.right = pcb_strdup(attr->val.str); + ctx->se.right = rnd_strdup(attr->val.str); break; case RIGHT_INT: ctx->se.right = pcb_strdup_printf("%d", attr->val.lng); @@ -85,7 +85,7 @@ if (click) { r = pcb_dad_tree_get_selected(attr); if (r != NULL) - cursor_path = pcb_strdup(r->cell[0]); + cursor_path = rnd_strdup(r->cell[0]); } /* remove existing items */ @@ -233,7 +233,7 @@ for(t = expr_tab; t->left_desc != NULL; t++) { if (t->left_var == NULL) parent = NULL; - cell[0] = pcb_strdup(t->left_desc); + cell[0] = rnd_strdup(t->left_desc); if (parent != NULL) r = pcb_dad_tree_append_under(attr, parent, cell); else @@ -274,7 +274,7 @@ free(ctx->se.right); ctx->se.right = NULL; if (row != NULL) - ctx->se.right = pcb_strdup(row->cell[0]); + ctx->se.right = rnd_strdup(row->cell[0]); } static int srchedit_window(search_expr_t *expr) @@ -285,7 +285,7 @@ ctx->se = *expr; if (ctx->se.right != NULL) - ctx->se.right = pcb_strdup(ctx->se.right); + ctx->se.right = rnd_strdup(ctx->se.right); /* clear all cache fields so a second window open won't inhibit refreshes */ ctx->last_op = NULL; Index: trunk/src_plugins/dialogs/dlg_undo.c =================================================================== --- trunk/src_plugins/dialogs/dlg_undo.c (revision 30941) +++ trunk/src_plugins/dialogs/dlg_undo.c (revision 30942) @@ -79,7 +79,7 @@ /* remember cursor */ r = pcb_dad_tree_get_selected(attr); if (r != NULL) - cursor_path = pcb_strdup(r->cell[0]); + cursor_path = rnd_strdup(r->cell[0]); /* remove existing items */ pcb_dad_tree_clear(tree); @@ -100,9 +100,9 @@ else if (i == pcb_uundo.tail) mark[0] = 't'; sprintf(ser, "%ld", (long)i->serial); - cell[0] = pcb_strdup(ser); - cell[1] = pcb_strdup(mark); - cell[2] = pcb_strdup(payload); + cell[0] = rnd_strdup(ser); + cell[1] = rnd_strdup(mark); + cell[2] = rnd_strdup(payload); pcb_dad_tree_append(attr, NULL, cell); } Index: trunk/src_plugins/dialogs/dlg_view.c =================================================================== --- trunk/src_plugins/dialogs/dlg_view.c (revision 30941) +++ trunk/src_plugins/dialogs/dlg_view.c (revision 30942) @@ -97,7 +97,7 @@ /* remember cursor */ r = pcb_dad_tree_get_selected(attr); if (r != NULL) - cursor_path = pcb_strdup(r->cell[0]); + cursor_path = rnd_strdup(r->cell[0]); /* remove existing items */ pcb_dad_tree_clear(tree); @@ -108,14 +108,14 @@ pcb_hid_row_t *r, *rt; rt = htsp_get(&tree->paths, v->type); if (rt == NULL) { - cell[0] = pcb_strdup(v->type); - cell[1] = pcb_strdup(""); + cell[0] = rnd_strdup(v->type); + cell[1] = rnd_strdup(""); rt = pcb_dad_tree_append(attr, NULL, cell); rt->user_data2.lng = 0; } cell[0] = pcb_strdup_printf("%lu", v->uid); - cell[1] = pcb_strdup(v->title); + cell[1] = rnd_strdup(v->title); r = pcb_dad_tree_append_under(attr, rt, cell); r->user_data2.lng = v->uid; pcb_dad_tree_expcoll(attr, rt, 1, 0); @@ -138,10 +138,10 @@ if (cnt >= 0) { char tmp[32]; sprintf(tmp, "%ld", cnt+1); - PCB_DAD_SET_VALUE(ctx->dlg_hid_ctx, ctx->wpos, str, pcb_strdup(tmp)); + PCB_DAD_SET_VALUE(ctx->dlg_hid_ctx, ctx->wpos, str, rnd_strdup(tmp)); } else - PCB_DAD_SET_VALUE(ctx->dlg_hid_ctx, ctx->wpos, str, pcb_strdup("")); + PCB_DAD_SET_VALUE(ctx->dlg_hid_ctx, ctx->wpos, str, rnd_strdup("")); } static void view2dlg_count(view_ctx_t *ctx) @@ -149,7 +149,7 @@ char tmp[32]; sprintf(tmp, "%ld", (long)pcb_view_list_length(ctx->lst)); - PCB_DAD_SET_VALUE(ctx->dlg_hid_ctx, ctx->wcount, str, pcb_strdup(tmp)); + PCB_DAD_SET_VALUE(ctx->dlg_hid_ctx, ctx->wcount, str, rnd_strdup(tmp)); } static void view2dlg(view_ctx_t *ctx) @@ -168,10 +168,10 @@ pcb_view_t *v = pcb_view_by_uid(ctx->lst, ctx->selected); if (v != NULL) { pcb_view_goto(v); - PCB_DAD_SET_VALUE(ctx->dlg_hid_ctx, ctx->wdescription, str, pcb_text_wrap(pcb_strdup(v->description), 32, '\n', ' ')); + PCB_DAD_SET_VALUE(ctx->dlg_hid_ctx, ctx->wdescription, str, pcb_text_wrap(rnd_strdup(v->description), 32, '\n', ' ')); switch(v->data_type) { case PCB_VIEW_PLAIN: - PCB_DAD_SET_VALUE(ctx->dlg_hid_ctx, ctx->wmeasure, str, pcb_strdup("")); + PCB_DAD_SET_VALUE(ctx->dlg_hid_ctx, ctx->wmeasure, str, rnd_strdup("")); break; case PCB_VIEW_DRC: if (v->data.drc.have_measured) @@ -184,8 +184,8 @@ if (v == NULL) { ctx->selected = 0; - PCB_DAD_SET_VALUE(ctx->dlg_hid_ctx, ctx->wdescription, str, pcb_strdup("")); - PCB_DAD_SET_VALUE(ctx->dlg_hid_ctx, ctx->wmeasure, str, pcb_strdup("")); + PCB_DAD_SET_VALUE(ctx->dlg_hid_ctx, ctx->wdescription, str, rnd_strdup("")); + PCB_DAD_SET_VALUE(ctx->dlg_hid_ctx, ctx->wmeasure, str, rnd_strdup("")); } else pcb_dad_preview_zoomto(&ctx->dlg[ctx->wprev], &v->bbox); @@ -745,7 +745,7 @@ drc_gui_ctx.lst = &pcb_drc_lst; drc_gui_ctx.refresh = drc_refresh; pcb_drc_all(); - if (pcb_strcasecmp(dlg_type, "simple") == 0) + if (rnd_strcasecmp(dlg_type, "simple") == 0) pcb_dlg_view_simplified("drc_simple", &drc_gui_ctx, "DRC violations"); else pcb_dlg_view_full("drc_full", &drc_gui_ctx, "DRC violations"); @@ -769,7 +769,7 @@ io_gui_ctx.pcb = PCB; io_gui_ctx.lst = &pcb_io_incompat_lst; io_gui_ctx.refresh = NULL; - if (pcb_strcasecmp(dlg_type, "simple") == 0) + if (rnd_strcasecmp(dlg_type, "simple") == 0) pcb_dlg_view_simplified("io_incompat_simple", &io_gui_ctx, "IO incompatibilities in last save"); else pcb_dlg_view_full("io_incompat_full", &io_gui_ctx, "IO incompatibilities in last save"); Index: trunk/src_plugins/distalign/distalign.c =================================================================== --- trunk/src_plugins/distalign/distalign.c (revision 30941) +++ trunk/src_plugins/distalign/distalign.c (revision 30942) @@ -78,7 +78,7 @@ return K_none; } for (i = 0; i < PCB_ENTRIES(keywords); ++i) { - if (keywords[i] && pcb_strcasecmp(s, keywords[i]) == 0) + if (keywords[i] && rnd_strcasecmp(s, keywords[i]) == 0) return i; } return -1; Index: trunk/src_plugins/djopt/djopt.c =================================================================== --- trunk/src_plugins/djopt/djopt.c (revision 30941) +++ trunk/src_plugins/djopt/djopt.c (revision 30942) @@ -270,7 +270,7 @@ dy2 = (double) y2; d = sqrt((dx1 - dx2) * (dx1 - dx2) + (dy1 - dy2) * (dy1 - dy2)); - d = pcb_round(d); + d = rnd_round(d); return (int) d; } Index: trunk/src_plugins/draw_csect/draw_csect.c =================================================================== --- trunk/src_plugins/draw_csect/draw_csect.c (revision 30941) +++ trunk/src_plugins/draw_csect/draw_csect.c (revision 30942) @@ -742,9 +742,9 @@ pcb_layergrp_t *g = pcb_get_grp_new_misc(PCB); pcb_undo_freeze_serial(); - g->name = pcb_strdup("global_outline"); + g->name = rnd_strdup("global_outline"); g->ltype = PCB_LYT_BOUNDARY; - g->purpose = pcb_strdup("uroute"); + g->purpose = rnd_strdup("uroute"); g->valid = 1; g->open = 1; pcb_layergrp_undoable_created(g); @@ -769,7 +769,7 @@ g->valid = 1; pcb_layergrp_undoable_created(g); g = pcb_layergrp_insert_after(PCB, gactive); - g->name = pcb_strdup("Intern"); + g->name = rnd_strdup("Intern"); g->ltype = PCB_LYT_INTERN | PCB_LYT_COPPER; g->valid = 1; pcb_layergrp_undoable_created(g); Index: trunk/src_plugins/draw_fab/draw_fab.c =================================================================== --- trunk/src_plugins/draw_fab/draw_fab.c (revision 30941) +++ trunk/src_plugins/draw_fab/draw_fab.c (revision 30942) @@ -292,7 +292,7 @@ /* Create a portable timestamp. */ if (!conf_draw_fab.plugins.draw_fab.omit_date) - pcb_print_utc(utcTime, sizeof(utcTime), 0); + rnd_print_utc(utcTime, sizeof(utcTime), 0); else strcpy(utcTime, ""); Index: trunk/src_plugins/draw_fontsel/draw_fontsel.c =================================================================== --- trunk/src_plugins/draw_fontsel/draw_fontsel.c (revision 30941) +++ trunk/src_plugins/draw_fontsel/draw_fontsel.c (revision 30942) @@ -125,7 +125,7 @@ t = dtext(x, *y, 200, f->id, buf); pcb_text_bbox(pcb_font(PCB, f->id, 1), t); - *y += pcb_round(PCB_COORD_TO_MM(t->BoundingBox.Y2 - t->BoundingBox.Y1) + 0.5); + *y += rnd_round(PCB_COORD_TO_MM(t->BoundingBox.Y2 - t->BoundingBox.Y1) + 0.5); if (font_coords < MAX_FONT) { font_coord[font_coords].y1 = y_old; Index: trunk/src_plugins/drc_query/dlg.c =================================================================== --- trunk/src_plugins/drc_query/dlg.c (revision 30941) +++ trunk/src_plugins/drc_query/dlg.c (revision 30942) @@ -165,7 +165,7 @@ return; \ } \ free(ntxt->data.text.value); \ - ntxt->data.text.value = pcb_strdup(nval == NULL ? "" : nval); \ + ntxt->data.text.value = rnd_strdup(nval == NULL ? "" : nval); \ } while(0) static void rule_btn_save_cb(void *hid_ctx, void *caller_data, pcb_hid_attribute_t *attr_inp) @@ -244,7 +244,7 @@ ctx = calloc(sizeof(rule_edit_ctx_t), 1); ctx->role = role; - ctx->rule = pcb_strdup(rule); + ctx->rule = rnd_strdup(rule); ctx->path = path; gdl_insert(&rule_edit_dialogs, ctx, link); @@ -381,7 +381,7 @@ /* remember cursor */ r = pcb_dad_tree_get_selected(attr); if (r != NULL) - cursor_path = pcb_strdup(r->cell[0]); + cursor_path = rnd_strdup(r->cell[0]); /* remove existing items */ pcb_dad_tree_clear(tree); @@ -403,7 +403,7 @@ role = pcb_conf_lookup_role(rule); cell[0] = rule->name; - cell[1] = pcb_strdup(pcb_conf_role_name(role)); + cell[1] = rnd_strdup(pcb_conf_role_name(role)); cell[2] = *dis ? "YES" : "no"; if (st->run_cnt > 0) cell[3] = pcb_strdup_printf("%.3fs", st->last_run_time); Index: trunk/src_plugins/drc_query/drc_query.c =================================================================== --- trunk/src_plugins/drc_query/drc_query.c (revision 30941) +++ trunk/src_plugins/drc_query/drc_query.c (revision 30942) @@ -165,9 +165,9 @@ st = pcb_drcq_stat_get(name); - ts = pcb_dtime(); + ts = rnd_dtime(); pcb_qry_run_script(ec, pcb, query, scope, drc_qry_exec_cb, &qctx); - te = pcb_dtime(); + te = rnd_dtime(); st->last_run_time = te - ts; st->sum_run_time += te - ts; @@ -269,7 +269,7 @@ if ((ndesc != NULL) && (ndesc->type == LHT_TEXT)) sdesc = ndesc->data.text.value; b = calloc(sizeof(pcb_bool_t), 1); - nat = pcb_conf_reg_field_(b, 1, CFN_BOOLEAN, path, pcb_strdup(sdesc), 0); + nat = pcb_conf_reg_field_(b, 1, CFN_BOOLEAN, path, rnd_strdup(sdesc), 0); if (nat == NULL) { free(b); rnd_message(PCB_MSG_ERROR, "drc_query: failed to register conf node '%s'\n", path); @@ -322,7 +322,7 @@ } c = calloc(sizeof(anyval), 1); - nat = pcb_conf_reg_field_(c, 1, type, path, pcb_strdup(sdesc), 0); + nat = pcb_conf_reg_field_(c, 1, type, path, rnd_strdup(sdesc), 0); if (nat == NULL) { free(c); rnd_message(PCB_MSG_ERROR, "drc_query: failed to register conf node '%s'\n", path); Index: trunk/src_plugins/drc_query/drc_query_stat.c =================================================================== --- trunk/src_plugins/drc_query/drc_query_stat.c (revision 30941) +++ trunk/src_plugins/drc_query/drc_query_stat.c (revision 30942) @@ -33,7 +33,7 @@ return st; st = calloc(sizeof(pcb_drcq_stat_t), 1); - st->name = pcb_strdup(name); + st->name = rnd_strdup(name); htsp_set(&pcb_drcq_stat, (char *)st->name, st); return st; } Index: trunk/src_plugins/export_bom/bom.c =================================================================== --- trunk/src_plugins/export_bom/bom.c (revision 30941) +++ trunk/src_plugins/export_bom/bom.c (revision 30942) @@ -109,11 +109,11 @@ } newlist->next = NULL; - newlist->descr = pcb_strdup(descr); - newlist->value = pcb_strdup(value); + newlist->descr = rnd_strdup(descr); + newlist->value = rnd_strdup(value); newlist->num = 1; vts0_init(&newlist->refdes); - vts0_append(&newlist->refdes, pcb_strdup(refdes)); + vts0_append(&newlist->refdes, rnd_strdup(refdes)); return newlist; } @@ -122,7 +122,7 @@ while(cur != NULL) { if ((PCB_NSTRCMP(descr, cur->descr) == 0) && (PCB_NSTRCMP(value, cur->value) == 0)) { cur->num++; - vts0_append(&cur->refdes, pcb_strdup(refdes)); + vts0_append(&cur->refdes, rnd_strdup(refdes)); break; } prev = cur; @@ -138,11 +138,11 @@ prev->next = newlist; newlist->next = NULL; - newlist->descr = pcb_strdup(descr); - newlist->value = pcb_strdup(value); + newlist->descr = rnd_strdup(descr); + newlist->value = rnd_strdup(value); newlist->num = 1; vts0_init(&newlist->refdes); - vts0_append(&newlist->refdes, pcb_strdup(refdes)); + vts0_append(&newlist->refdes, rnd_strdup(refdes)); } return bom; @@ -186,7 +186,7 @@ FILE *fp; pcb_bom_list_t *bom = NULL; - pcb_print_utc(utcTime, sizeof(utcTime), 0); + rnd_print_utc(utcTime, sizeof(utcTime), 0); PCB_SUBC_LOOP(PCB->Data); { Index: trunk/src_plugins/export_dsn/dsn.c =================================================================== --- trunk/src_plugins/export_dsn/dsn.c (revision 30941) +++ trunk/src_plugins/export_dsn/dsn.c (revision 30942) @@ -128,7 +128,7 @@ for (group = 0; group < pcb_max_group(PCB); group++) { htsp_entry_t *e; pcb_layergrp_t *g = &PCB->LayerGroups.grp[group]; - char *layeropts = pcb_strdup("(type signal)"); + char *layeropts = rnd_strdup("(type signal)"); if (!(g->ltype & PCB_LYT_COPPER)) continue; @@ -184,9 +184,9 @@ res = pcb_subc_get_origin(subc, &ox, &oy); assert(res == 0); if (subc->refdes != NULL) - ename = pcb_strdup(subc->refdes); + ename = rnd_strdup(subc->refdes); else - ename = pcb_strdup("null"); + ename = rnd_strdup("null"); pcb_fprintf(fp, " (component %d\n", subc->ID); pcb_fprintf(fp, " (place \"%s\" %.6mm %.6mm %s 0 (PN 0))\n", ename, ox, PCB->hidlib.size_y - oy, side); pcb_fprintf(fp, " )\n"); Index: trunk/src_plugins/export_dxf/dxf_draw.c =================================================================== --- trunk/src_plugins/export_dxf/dxf_draw.c (revision 30941) +++ trunk/src_plugins/export_dxf/dxf_draw.c (revision 30942) @@ -45,7 +45,7 @@ if (ctx->enable_force_thin && ctx->force_thin) fprintf(ctx->f, "370\n1\n"); else - fprintf(ctx->f, "370\n%d\n", (int)pcb_round(PCB_COORD_TO_MM(gc->width)*100.0)); + fprintf(ctx->f, "370\n%d\n", (int)rnd_round(PCB_COORD_TO_MM(gc->width)*100.0)); } static void dxf_hatch_pre(dxf_ctx_t *ctx, pcb_hid_gc_t gc, int n_coords) Index: trunk/src_plugins/export_excellon/excellon.c =================================================================== --- trunk/src_plugins/export_excellon/excellon.c (revision 30941) +++ trunk/src_plugins/export_excellon/excellon.c (revision 30942) @@ -433,7 +433,7 @@ if (radius <= 0) return; - radius = 50 * pcb_round(radius / 50.0); + radius = 50 * rnd_round(radius / 50.0); use_gc(gc, radius); if (!finding_apertures) pcb_drill_new_pending(get_drill_ctx(), cx, cy, cx, cy, radius * 2); Index: trunk/src_plugins/export_fidocadj/fidocadj.c =================================================================== --- trunk/src_plugins/export_fidocadj/fidocadj.c (revision 30941) +++ trunk/src_plugins/export_fidocadj/fidocadj.c (revision 30942) @@ -105,7 +105,7 @@ } *line = '\0'; fgets(line, sizeof(line), f); - if (pcb_strncasecmp(line, "[FIDOLIB PCB Footprints]", 24) != 0) { + if (rnd_strncasecmp(line, "[FIDOLIB PCB Footprints]", 24) != 0) { rnd_message(PCB_MSG_ERROR, "'%s' doesn't have the fidocadj lib header\n", fn); fclose(f); return -1; @@ -120,7 +120,7 @@ end = strchr(s, ' '); if (end != NULL) { *end = '\0'; - htsi_set(ht, pcb_strdup(s), 1); + htsi_set(ht, rnd_strdup(s), 1); } } fclose(f); @@ -129,7 +129,7 @@ static long int crd(rnd_coord_t c) { - return pcb_round((double)PCB_COORD_TO_MIL(c) / 5.0); + return rnd_round((double)PCB_COORD_TO_MIL(c) / 5.0); } static int layer_map(unsigned int lflg, int *fidoly_next, const char *lyname) @@ -270,7 +270,7 @@ TODO("textrot: can we exprot rotation with %f?") fprintf(f, "TY %ld %ld %ld %ld %d 1 %d * ", /* 1 = bold */ crd(x0), crd(y0), crd(glyphy), crd(glyphx), - (int)pcb_round(text->rot), fidoly); + (int)rnd_round(text->rot), fidoly); for(s = text->TextString; *s != '\0'; s++) { if (*s == ' ') fprintf(f, "++"); Index: trunk/src_plugins/export_gerber/gerber.c =================================================================== --- trunk/src_plugins/export_gerber/gerber.c (revision 30941) +++ trunk/src_plugins/export_gerber/gerber.c (revision 30942) @@ -542,7 +542,7 @@ fprintf(f, "G04 start of page %d for group %ld layer_idx %ld *\r\n", pagecount, group, layer); /* Create a portable timestamp. */ - pcb_print_utc(utcTime, sizeof(utcTime), 0); + rnd_print_utc(utcTime, sizeof(utcTime), 0); /* Print a cute file header at the beginning of each file. */ fprintf(f, "G04 Title: %s, %s *\r\n", PCB_UNKNOWN(PCB->hidlib.name), PCB_UNKNOWN(group_name)); @@ -562,7 +562,7 @@ /* build a legal identifier. */ if (layername) free(layername); - layername = pcb_strdup(filesuff); + layername = rnd_strdup(filesuff); if (strrchr(layername, '.')) *strrchr(layername, '.') = 0; @@ -958,7 +958,7 @@ if (radius <= 0) return; if (is_drill) - radius = 50 * pcb_round(radius / 50.0); + radius = 50 * rnd_round(radius / 50.0); use_gc(gc, radius); if (!f) return; Index: trunk/src_plugins/export_ipcd356/ipcd356.c =================================================================== --- trunk/src_plugins/export_ipcd356/ipcd356.c (revision 30941) +++ trunk/src_plugins/export_ipcd356/ipcd356.c (revision 30942) @@ -73,7 +73,7 @@ { char *val = rnd_attribute_get(&o->Attributes, key); if (val == NULL) return 0; - if (pcb_strcasecmp(val, "yes") == 0) return 1; + if (rnd_strcasecmp(val, "yes") == 0) return 1; return 0; } @@ -120,7 +120,7 @@ { char utc[64]; - pcb_print_utc(utc, sizeof(utc), 0); + rnd_print_utc(utc, sizeof(utc), 0); fprintf(ctx->f, "C IPC-D-356 Netlist generated by pcb-rnd " PCB_VERSION "\n"); fprintf(ctx->f, "C \n"); Index: trunk/src_plugins/export_lpr/lpr.c =================================================================== --- trunk/src_plugins/export_lpr/lpr.c (revision 30941) +++ trunk/src_plugins/export_lpr/lpr.c (revision 30942) @@ -51,7 +51,7 @@ * new one based on how a user fills out a print dialog. */ if (base_lpr_options[HA_lprcommand].default_val.str == NULL) { - base_lpr_options[HA_lprcommand].default_val.str = pcb_strdup("lpr"); + base_lpr_options[HA_lprcommand].default_val.str = rnd_strdup("lpr"); } if (lpr_options == 0) { Index: trunk/src_plugins/export_openems/excitation.c =================================================================== --- trunk/src_plugins/export_openems/excitation.c (revision 30941) +++ trunk/src_plugins/export_openems/excitation.c (revision 30942) @@ -114,7 +114,7 @@ hv.dbl = strtod(orig, &end); if (*end != '\0') { while(isspace(*end)) end++; - if (pcb_strcasecmp(end, "hz") != 0) { + if (rnd_strcasecmp(end, "hz") != 0) { rnd_message(PCB_MSG_ERROR, "Invalid real value (Hz) in board attribute '%s': '%s'\n", attrkey, orig); hv.dbl = 0; } @@ -302,7 +302,7 @@ static char *exc_user_get(int idx) { - return pcb_strdup(rnd_attribute_get(&PCB->Attributes, AEPREFIX "user-defined::script")); + return rnd_strdup(rnd_attribute_get(&PCB->Attributes, AEPREFIX "user-defined::script")); } static void exc_user_ser(int idx, int save) @@ -529,7 +529,7 @@ { if ((exc_ctx.selected < 0) || (exc_ctx.selected >= sizeof(excitations)/sizeof(excitations[0]))) { rnd_message(PCB_MSG_ERROR, "No excitation selected\n"); - return pcb_strdup("%% ERROR: no excitation selected\n"); + return rnd_strdup("%% ERROR: no excitation selected\n"); } return excitations[exc_ctx.selected].get(exc_ctx.selected); } Index: trunk/src_plugins/export_openems/export_openems.c =================================================================== --- trunk/src_plugins/export_openems/export_openems.c (revision 30941) +++ trunk/src_plugins/export_openems/export_openems.c (revision 30942) @@ -170,12 +170,12 @@ } TODO(": when export dialogs change into DAD, this hack to convert the strings to allocated ones will not be needed anymore") - openems_attribute_list[HA_def_copper_cond].default_val.str = pcb_strdup(openems_attribute_list[HA_def_copper_cond].default_val.str); - openems_attribute_list[HA_def_subst_epsilon].default_val.str = pcb_strdup(openems_attribute_list[HA_def_subst_epsilon].default_val.str); - openems_attribute_list[HA_def_subst_mue].default_val.str = pcb_strdup(openems_attribute_list[HA_def_subst_mue].default_val.str); - openems_attribute_list[HA_def_subst_kappa].default_val.str = pcb_strdup(openems_attribute_list[HA_def_subst_kappa].default_val.str); - openems_attribute_list[HA_def_subst_sigma].default_val.str = pcb_strdup(openems_attribute_list[HA_def_subst_sigma].default_val.str); - openems_attribute_list[HA_void_name].default_val.str = pcb_strdup(openems_attribute_list[HA_void_name].default_val.str); + openems_attribute_list[HA_def_copper_cond].default_val.str = rnd_strdup(openems_attribute_list[HA_def_copper_cond].default_val.str); + openems_attribute_list[HA_def_subst_epsilon].default_val.str = rnd_strdup(openems_attribute_list[HA_def_subst_epsilon].default_val.str); + openems_attribute_list[HA_def_subst_mue].default_val.str = rnd_strdup(openems_attribute_list[HA_def_subst_mue].default_val.str); + openems_attribute_list[HA_def_subst_kappa].default_val.str = rnd_strdup(openems_attribute_list[HA_def_subst_kappa].default_val.str); + openems_attribute_list[HA_def_subst_sigma].default_val.str = rnd_strdup(openems_attribute_list[HA_def_subst_sigma].default_val.str); + openems_attribute_list[HA_void_name].default_val.str = rnd_strdup(openems_attribute_list[HA_void_name].default_val.str); if (n) *n = NUM_OPTIONS; @@ -362,7 +362,7 @@ static void openems_vport_write(wctx_t *ctx, pcb_any_obj_t *o, rnd_coord_t x, rnd_coord_t y, pcb_layergrp_id_t gid1, pcb_layergrp_id_t gid2, const char *port_name) { - char *end, *s, *safe_name = pcb_strdup(port_name); + char *end, *s, *safe_name = rnd_strdup(port_name); const char *att; double resistance = ctx->options[HA_def_port_res].dbl; int act = 1; @@ -380,9 +380,9 @@ att = rnd_attribute_get(&o->Attributes, "openems::active"); if (att != NULL) { - if (pcb_strcasecmp(att, "true") == 0) + if (rnd_strcasecmp(att, "true") == 0) act = 1; - else if (pcb_strcasecmp(att, "false") == 0) + else if (rnd_strcasecmp(att, "false") == 0) act = 0; else rnd_message(PCB_MSG_WARNING, "Ignoring invalid openems::active value for port %s: '%s' (must be true or false)\n", port_name, att); Index: trunk/src_plugins/export_openems/mesh.c =================================================================== --- trunk/src_plugins/export_openems/mesh.c (revision 30941) +++ trunk/src_plugins/export_openems/mesh.c (revision 30942) @@ -635,19 +635,19 @@ else if (grp->ltype & PCB_LYT_SUBSTRATE) { rnd_coord_t d, t = mesh->def_subs_thick; double dens = (double)t/(double)lns; - bottom_dens = pcb_round(dens); + bottom_dens = rnd_round(dens); if (lns != 0) { for(n = 0; n <= lns; n++) { if (n == 0) { if (first) { ytop = y; - top_dens = pcb_round(dens); + top_dens = rnd_round(dens); first = 0; } else continue; } - d = pcb_round((double)y+dens*(double)n); + d = rnd_round((double)y+dens*(double)n); mesh_add_result(mesh, PCB_MESH_Z, d); } } @@ -977,7 +977,7 @@ if (default_file != NULL) { free(default_file); - default_file = pcb_strdup(fname); + default_file = rnd_strdup(fname); } f = pcb_fopen_askovr(&PCB->hidlib, fname, "w", NULL); @@ -1007,7 +1007,7 @@ if (default_file != NULL) { free(default_file); - default_file = pcb_strdup(fname); + default_file = rnd_strdup(fname); } f = pcb_fopen(&PCB->hidlib, fname, "r"); @@ -1039,7 +1039,7 @@ free(mesh.ui_name_xy); free((char *)mesh.ui_layer_xy->name); /* we have strdup'd it */ mesh.ui_name_xy = pcb_strdup_printf("mesh 0: %s", mesh.layer->name); - mesh.ui_layer_xy->name = pcb_strdup(mesh.ui_name_xy); + mesh.ui_layer_xy->name = rnd_strdup(mesh.ui_name_xy); pcb_event(&PCB->hidlib, PCB_EVENT_LAYERS_CHANGED, NULL); pcb_gui->invalidate_all(pcb_gui); Index: trunk/src_plugins/export_openscad/export_openscad.c =================================================================== --- trunk/src_plugins/export_openscad/export_openscad.c (revision 30941) +++ trunk/src_plugins/export_openscad/export_openscad.c (revision 30942) @@ -509,7 +509,7 @@ cap_style = "rc"; pcb_fprintf(f, " pcb_line_%s(%mm, %mm, %mm, %f, %mm, %f);\n", cap_style, - x1, y1, (rnd_coord_t)pcb_round(length), angle * PCB_RAD_TO_DEG, gc->width, effective_layer_thickness); + x1, y1, (rnd_coord_t)rnd_round(length), angle * PCB_RAD_TO_DEG, gc->width, effective_layer_thickness); } static void openscad_draw_rect(pcb_hid_gc_t gc, rnd_coord_t x1, rnd_coord_t y1, rnd_coord_t x2, rnd_coord_t y2) Index: trunk/src_plugins/export_openscad/scad_models.c =================================================================== --- trunk/src_plugins/export_openscad/scad_models.c (revision 30941) +++ trunk/src_plugins/export_openscad/scad_models.c (revision 30942) @@ -36,7 +36,7 @@ fin = pcb_fopen_first(&PCB->hidlib, &conf_core.rc.library_search_paths, name, "r", &full_path, pcb_true); if (fin != NULL) { - char *s, *safe_name = pcb_strdup(name); + char *s, *safe_name = rnd_strdup(name); for(s = safe_name; *s != '\0'; s++) if (!isalnum(*s)) *s = '_'; @@ -63,7 +63,7 @@ } fclose(fin); pcb_snprintf(buff, sizeof(buff), "pcb_part_%s", safe_name); - htsp_set(models, (char *)name, pcb_strdup(buff)); + htsp_set(models, (char *)name, rnd_strdup(buff)); free(safe_name); } else { Index: trunk/src_plugins/export_png/png.c =================================================================== --- trunk/src_plugins/export_png/png.c (revision 30941) +++ trunk/src_plugins/export_png/png.c (revision 30942) @@ -68,7 +68,7 @@ #define PNG_SCALE_HACK1 0 #include -#define pcb_hack_round(d) pcb_round(d) +#define pcb_hack_round(d) rnd_round(d) #define CRASH(func) fprintf(stderr, "HID error: pcb called unimplemented PNG function %s.\n", func); abort() @@ -89,7 +89,7 @@ static rnd_coord_t y_shift = 0; static int show_solder_side; static long png_drawn_objs = 0; -#define SCALE(w) ((int)pcb_round((w)/scale)) +#define SCALE(w) ((int)rnd_round((w)/scale)) #define SCALE_X(x) ((int)pcb_hack_round(((x) - x_shift)/scale)) #define SCALE_Y(y) ((int)pcb_hack_round(((show_solder_side ? (PCB->hidlib.size_y-(y)) : (y)) - y_shift)/scale)) #define SWAP_IF_SOLDER(a,b) do { int c; if (show_solder_side) { c=a; a=b; b=c; }} while (0) @@ -680,8 +680,8 @@ /* a scale of 1 means 1 pixel is 1 inch a scale of 10 means 1 pixel is 10 inches */ scale = PCB_INCH_TO_COORD(1) / dpi; - w = pcb_round(w / scale) - PNG_SCALE_HACK1; - h = pcb_round(h / scale) - PNG_SCALE_HACK1; + w = rnd_round(w / scale) - PNG_SCALE_HACK1; + h = rnd_round(h / scale) - PNG_SCALE_HACK1; } else if (xmax == 0 && ymax == 0) { fprintf(stderr, "ERROR: You may not set both xmax, ymax," "and xy-max to zero\n"); Index: trunk/src_plugins/export_png/png_photo2.c =================================================================== --- trunk/src_plugins/export_png/png_photo2.c (revision 30941) +++ trunk/src_plugins/export_png/png_photo2.c (revision 30942) @@ -320,7 +320,7 @@ blend(&cop, 0.7, &cop, &white); } /*FIXME: old code...can be removed after validation. rgb(&cop, 140, 150, 160); - r = (pcb_rand() % 5 - 2) * 2; + r = (rnd_rand() % 5 - 2) * 2; cop.r += r; cop.g += r; cop.b += r; */ Index: trunk/src_plugins/export_ps/ps.c =================================================================== --- trunk/src_plugins/export_ps/ps.c (revision 30941) +++ trunk/src_plugins/export_ps/ps.c (revision 30942) @@ -1365,7 +1365,7 @@ } if (ps_calib_attribute_list[0].val.str == NULL) { - ps_calib_attribute_list[0].val.str = pcb_strdup("lpr"); + ps_calib_attribute_list[0].val.str = rnd_strdup("lpr"); } if (pcb_attribute_dialog("ps_calibrate", ps_calib_attribute_list, 1, "Print Calibration Page", NULL)) Index: trunk/src_plugins/export_stat/stat.c =================================================================== --- trunk/src_plugins/export_stat/stat.c (revision 30941) +++ trunk/src_plugins/export_stat/stat.c (revision 30942) @@ -164,7 +164,7 @@ } pcb_board_count_holes(PCB, &hp, &hup, NULL); - pcb_print_utc(buff, sizeof(buff), 0); + rnd_print_utc(buff, sizeof(buff), 0); fprintf(f, "ha:pcb-rnd-board-stats-v2 {\n"); fprintf(f, " ha:meta {\n"); @@ -415,8 +415,8 @@ stat_hid.usage = stat_usage; - stat_attribute_list[HA_first_ver].default_val.str = pcb_strdup(PCB_VERSION); - stat_attribute_list[HA_license].default_val.str = pcb_strdup("proprietary/private"); + stat_attribute_list[HA_first_ver].default_val.str = rnd_strdup(PCB_VERSION); + stat_attribute_list[HA_license].default_val.str = rnd_strdup("proprietary/private"); pcb_hid_register_hid(&stat_hid); Index: trunk/src_plugins/export_svg/svg.c =================================================================== --- trunk/src_plugins/export_svg/svg.c (revision 30941) +++ trunk/src_plugins/export_svg/svg.c (revision 30942) @@ -553,7 +553,7 @@ if ((gc->color != NULL) && (strcmp(gc->color, name) == 0)) return; free(gc->color); - gc->color = pcb_strdup(name); + gc->color = rnd_strdup(name); } static void svg_set_line_cap(pcb_hid_gc_t gc, pcb_cap_style_t style) @@ -771,10 +771,10 @@ ea = start_angle + delta_angle; /* calculate the endpoints */ - x2 = pcb_round((double)cx + ((double)width * cos(sa * M_PI / 180))); - y2 = pcb_round((double)cy + ((double)width * sin(sa * M_PI / 180))); - x1 = pcb_round((double)cx + ((double)width * cos(ea * M_PI / 180))+diff); - y1 = pcb_round((double)cy + ((double)width * sin(ea * M_PI / 180))+diff); + x2 = rnd_round((double)cx + ((double)width * cos(sa * M_PI / 180))); + y2 = rnd_round((double)cy + ((double)width * sin(sa * M_PI / 180))); + x1 = rnd_round((double)cx + ((double)width * cos(ea * M_PI / 180))+diff); + y1 = rnd_round((double)cy + ((double)width * sin(ea * M_PI / 180))+diff); pcb_arc_draw(gc, x1, y1, width, x2, y2, gc->width, (fabs(delta_angle) > 180), (delta_angle < 0.0)); } Index: trunk/src_plugins/export_xy/xy.c =================================================================== --- trunk/src_plugins/export_xy/xy.c (revision 30941) +++ trunk/src_plugins/export_xy/xy.c (revision 30942) @@ -127,7 +127,7 @@ memcpy(id, li->name, len); id[len] = '\0'; vts0_append(&fmt_names, (char *)li->payload); - vts0_append(&fmt_ids, pcb_strdup(id)); + vts0_append(&fmt_ids, rnd_strdup(id)); } if (fmt_names.used == 0) { @@ -676,7 +676,7 @@ ctx.count = 0; - pcb_print_utc(ctx.utcTime, sizeof(ctx.utcTime), 0); + rnd_print_utc(ctx.utcTime, sizeof(ctx.utcTime), 0); find_origin(&ctx, format_name); Index: trunk/src_plugins/extedit/extedit.c =================================================================== --- trunk/src_plugins/extedit/extedit.c (revision 30941) +++ trunk/src_plugins/extedit/extedit.c (revision 30942) @@ -122,7 +122,7 @@ fc = pcb_popen(&PCB->hidlib, cmd, "r"); if (pcb_gui != NULL) { - int fd = pcb_fileno(fc); + int fd = rnd_fileno(fc); if (fd > 0) { int n = 0; pcb_hidval_t hd; @@ -137,7 +137,7 @@ n++; pcb_hid_progress(50+sin((double)n/10.0)*40, 100, "Invoked external editor. Please edit, save and close there to finish this operation"); } - pcb_ms_sleep(50); + rnd_ms_sleep(50); } } else @@ -148,7 +148,7 @@ if (pcb_gui != NULL) { pcb_hid_progress(50, 100, "Invoked external editor. Please edit, save and close there to finish this operation"); - pcb_ms_sleep(1000); /* ugly hack: give the GUI some time to flush */ + rnd_ms_sleep(1000); /* ugly hack: give the GUI some time to flush */ } while(!(feof(fc))) { char tmp[128]; @@ -184,7 +184,7 @@ rnd_PCB_ACT_MAY_CONVARG(2, FGW_STR, extedit, method = argv[2].val.str); /* pick up the object to edit */ - if ((cmd == NULL) || (pcb_strcasecmp(cmd, "object") == 0)) { + if ((cmd == NULL) || (rnd_strcasecmp(cmd, "object") == 0)) { rnd_coord_t x, y; rnd_hid_get_coords("Click on object to edit", &x, &y, 0); type = pcb_search_screen(x, y, EXTEDIT_TYPES, &ptr1, &ptr2, &ptr3); @@ -197,7 +197,7 @@ } paste = 1; } - else if ((argc > 1) && (pcb_strcasecmp(cmd, "selected") == 0)) { + else if ((argc > 1) && (rnd_strcasecmp(cmd, "selected") == 0)) { pcb_buffer_set_number(bn); pcb_buffer_clear(PCB, PCB_PASTEBUFFER); pcb_buffer_add_selected(PCB, PCB_PASTEBUFFER, pcb_crosshair.X, pcb_crosshair.Y, pcb_false, pcb_false); @@ -210,7 +210,7 @@ goto quit0; } } - else if ((argc > 1) && (pcb_strcasecmp(cmd, "buffer") == 0)) { + else if ((argc > 1) && (rnd_strcasecmp(cmd, "buffer") == 0)) { load_bn = bn = conf_core.editor.buffer_number; if (pcb_data_is_empty(PCB_PASTEBUFFER->Data)) { rnd_message(PCB_MSG_WARNING, "Nothing in current buffer, can't ext-edit selection\n"); @@ -226,7 +226,7 @@ /* determine the method */ if (argc > 2) { for(mth = methods; mth->name != NULL; mth++) { - if (pcb_strcasecmp(mth->name, method) == 0) + if (rnd_strcasecmp(mth->name, method) == 0) break; } if (mth->name == NULL) { Index: trunk/src_plugins/extedit/extedit_dad.c =================================================================== --- trunk/src_plugins/extedit/extedit_dad.c (revision 30941) +++ trunk/src_plugins/extedit/extedit_dad.c (revision 30942) @@ -39,7 +39,7 @@ { PCB_DAD_SET_VALUE(ee->dlg_hid_ctx, ee->wmethod, lng, ee->mthi); PCB_DAD_SET_VALUE(ee->dlg_hid_ctx, ee->wfmt, lng, methods[ee->mthi].fmt); - PCB_DAD_SET_VALUE(ee->dlg_hid_ctx, ee->wcmd, str, pcb_strdup(methods[ee->mthi].command)); + PCB_DAD_SET_VALUE(ee->dlg_hid_ctx, ee->wcmd, str, rnd_strdup(methods[ee->mthi].command)); /* we have only one format, so disable the combo box for selecting it */ pcb_gui->attr_dlg_widget_state(ee->dlg_hid_ctx, ee->wfmt, pcb_false); @@ -68,7 +68,7 @@ if (lock) return; - methods[ee->mthi].command = pcb_strdup(ee->dlg[ee->wcmd].val.str); + methods[ee->mthi].command = rnd_strdup(ee->dlg[ee->wcmd].val.str); lock = 1; ee_data2dialog(ee); Index: trunk/src_plugins/exto_std/cord.c =================================================================== --- trunk/src_plugins/exto_std/cord.c (revision 30941) +++ trunk/src_plugins/exto_std/cord.c (revision 30942) @@ -147,8 +147,8 @@ /* B(t)=(1-t)^3 * P0 + 3*(1-t)^2 * t * P1 + 3 * (1-t)*t^2 * P2 + t^3*P3 */ - x = pcb_round(it3*e1->x + 3*it2*t*a1->X + 3*it*t2*a2->X + t3*e2->x); - y = pcb_round(it3*e1->y + 3*it2*t*a1->Y + 3*it*t2*a2->Y + t3*e2->y); + x = rnd_round(it3*e1->x + 3*it2*t*a1->X + 3*it*t2*a2->X + t3*e2->x); + y = rnd_round(it3*e1->y + 3*it2*t*a1->Y + 3*it*t2*a2->Y + t3*e2->y); l = pcb_line_new(lyr, lx, ly, x, y, PCB_MM_TO_COORD(0.25), 0, pcb_flag_make(0)); @@ -434,7 +434,7 @@ dl->is_bound = 1; dl->type = PCB_OBJ_LAYER; memcpy(&dl->meta.bound, &sl->meta.bound, sizeof(sl->meta.bound)); - dl->name = pcb_strdup(sl->name); + dl->name = rnd_strdup(sl->name); dl->comb = sl->comb; if (dl->meta.bound.real != NULL) pcb_layer_link_trees(dl, dl->meta.bound.real); Index: trunk/src_plugins/exto_std/dimension.c =================================================================== --- trunk/src_plugins/exto_std/dimension.c (revision 30941) +++ trunk/src_plugins/exto_std/dimension.c (revision 30942) @@ -168,10 +168,10 @@ ly = &subc->data->Layer[LID_TARGET]; /* endpoints of the displaced baseline */ - x1 = pcb_round(dim->x1 + dim->displace * -dim->dy); - y1 = pcb_round(dim->y1 + dim->displace * +dim->dx); - x2 = pcb_round(dim->x2 + dim->displace * -dim->dy); - y2 = pcb_round(dim->y2 + dim->displace * +dim->dx); + x1 = rnd_round(dim->x1 + dim->displace * -dim->dy); + y1 = rnd_round(dim->y1 + dim->displace * +dim->dx); + x2 = rnd_round(dim->x2 + dim->displace * -dim->dy); + y2 = rnd_round(dim->y2 + dim->displace * +dim->dx); /* endpoints of the extended-displaced baseline */ dispe = PCB_MM_TO_COORD(0.5); @@ -179,10 +179,10 @@ dispe = -dispe; dispe = dim->displace + dispe; - x1e = pcb_round(dim->x1 + dispe * -dim->dy); - y1e = pcb_round(dim->y1 + dispe * +dim->dx); - x2e = pcb_round(dim->x2 + dispe * -dim->dy); - y2e = pcb_round(dim->y2 + dispe * +dim->dx); + x1e = rnd_round(dim->x1 + dispe * -dim->dy); + y1e = rnd_round(dim->y1 + dispe * +dim->dx); + x2e = rnd_round(dim->x2 + dispe * -dim->dy); + y2e = rnd_round(dim->y2 + dispe * +dim->dx); /* main dim line */ flt = linelist_first(&subc->data->Layer[LID_TARGET].Line); @@ -274,8 +274,8 @@ dimension_unpack(subc); dim = subc->extobj_data; - fx = pcb_round((double)(fline->Point1.X + fline->Point2.X)/2.0); - fy = pcb_round((double)(fline->Point1.Y + fline->Point2.Y)/2.0); + fx = rnd_round((double)(fline->Point1.X + fline->Point2.X)/2.0); + fy = rnd_round((double)(fline->Point1.Y + fline->Point2.Y)/2.0); memset(&bline, 0, sizeof(bline)); bline.Point1.X = dim->x1; bline.Point1.Y = dim->y1; Index: trunk/src_plugins/exto_std/line_of_vias.c =================================================================== --- trunk/src_plugins/exto_std/line_of_vias.c (revision 30941) +++ trunk/src_plugins/exto_std/line_of_vias.c (revision 30942) @@ -100,11 +100,11 @@ pcb_rtree_box_t qbox; pcb_pstk_t *cl; int skip = 0; - rnd_coord_t rx = pcb_round(x), ry = pcb_round(y); + rnd_coord_t rx = rnd_round(x), ry = rnd_round(y); /* skip if there's a via too close */ - qbox.x1 = pcb_round(rx - qbox_bloat); qbox.y1 = pcb_round(ry - qbox_bloat); - qbox.x2 = pcb_round(rx + qbox_bloat); qbox.y2 = pcb_round(ry + qbox_bloat); + qbox.x1 = rnd_round(rx - qbox_bloat); qbox.y1 = rnd_round(ry - qbox_bloat); + qbox.x2 = rnd_round(rx + qbox_bloat); qbox.y2 = rnd_round(ry + qbox_bloat); if ((pcb != NULL) && (pcb->Data->padstack_tree != NULL)) { for(cl = pcb_rtree_first(&it, pcb->Data->padstack_tree, &qbox); cl != NULL; cl = pcb_rtree_next(&it)) { Index: trunk/src_plugins/fp_board/fp_board.c =================================================================== --- trunk/src_plugins/fp_board/fp_board.c (revision 30941) +++ trunk/src_plugins/fp_board/fp_board.c (revision 30942) @@ -92,7 +92,7 @@ return NULL; /* split file name and ID */ - fpath = pcb_strdup(name + strlen(REQUIRE_PATH_PREFIX)); + fpath = rnd_strdup(name + strlen(REQUIRE_PATH_PREFIX)); ids = strchr(fpath, '@'); if (ids == NULL) goto err; Index: trunk/src_plugins/fp_fs/fp_fs.c =================================================================== --- trunk/src_plugins/fp_fs/fp_fs.c (revision 30941) +++ trunk/src_plugins/fp_fs/fp_fs.c (revision 30942) @@ -79,8 +79,8 @@ pointer: pcb_lib_menu_new(&Library) calls realloc()! Build a list of directories to be visited later, instead. */ d = malloc(sizeof(list_dir_t)); - d->subdir = pcb_strdup(name); - d->parent = pcb_strdup(subdir); + d->subdir = rnd_strdup(name); + d->parent = rnd_strdup(subdir); d->next = l->subdirs; d->children = children; l->subdirs = d; @@ -315,9 +315,9 @@ if ((strncmp(ctx->target, name, ctx->target_len) == 0) && ((! !ctx->parametric) == (type == PCB_FP_PARAMETRIC))) { const char *suffix = name + ctx->target_len; /* ugly heuristics: footprint names may end in .fp or .ele or .subc.lht or .lht */ - if ((*suffix == '\0') || (pcb_strcasecmp(suffix, ".fp") == 0) || (pcb_strcasecmp(suffix, ".ele") == 0) || (pcb_strcasecmp(suffix, ".subc.lht") == 0) || (pcb_strcasecmp(suffix, ".lht") == 0)) { - ctx->path = pcb_strdup(subdir); - ctx->real_name = pcb_strdup(name); + if ((*suffix == '\0') || (rnd_strcasecmp(suffix, ".fp") == 0) || (rnd_strcasecmp(suffix, ".ele") == 0) || (rnd_strcasecmp(suffix, ".subc.lht") == 0) || (rnd_strcasecmp(suffix, ".lht") == 0)) { + ctx->path = rnd_strdup(subdir); + ctx->real_name = rnd_strdup(name); return 1; } } @@ -332,7 +332,7 @@ fp_search_t ctx; if (rnd_is_path_abs(basename)) - return pcb_strdup(basename); + return rnd_strdup(basename); ctx.target = basename; ctx.target_len = strlen(ctx.target); @@ -361,7 +361,7 @@ free(ctx.real_name); /* fprintf(" found '%s'\n", path);*/ free(fpath); - return pcb_strdup(path); + return rnd_strdup(path); } free(fpath); if (end == NULL) Index: trunk/src_plugins/fp_wget/edakrill.c =================================================================== --- trunk/src_plugins/fp_wget/edakrill.c (revision 30941) +++ trunk/src_plugins/fp_wget/edakrill.c (revision 30942) @@ -111,7 +111,7 @@ tag_add_(NULL); l = pcb_fp_append_entry(l, fn, PCB_FP_FILE, krill.tags); fn[-1] = '/'; - l->data.fp.loc_info = pcb_strdup(vpath->array); + l->data.fp.loc_info = rnd_strdup(vpath->array); krill.tags = NULL; krill.tags_used = 0; @@ -202,7 +202,7 @@ *end = '\0'; if (*line == 'f') { krill_flush(ctx, &vpath, vpath_base_len); - krill.name = pcb_strdup(line+2); + krill.name = rnd_strdup(line+2); } if (strncmp(line, "t type=", 7) == 0) { if (strcmp(line+7, "footprint") == 0) @@ -225,7 +225,7 @@ end += 7; *end = '\0'; end++; - krill.fname = pcb_strdup(line+2); + krill.fname = rnd_strdup(line+2); krill.date = strtol(end, NULL, 10); } } Index: trunk/src_plugins/fp_wget/gedasymbols.c =================================================================== --- trunk/src_plugins/fp_wget/gedasymbols.c (revision 30941) +++ trunk/src_plugins/fp_wget/gedasymbols.c (revision 30942) @@ -138,7 +138,7 @@ l = pcb_fp_mkdir_p(vpath.array); l = pcb_fp_append_entry(l, fn, PCB_FP_FILE, NULL); fn[-1] = '/'; - l->data.fp.loc_info = pcb_strdup(vpath.array); + l->data.fp.loc_info = rnd_strdup(vpath.array); } fp_wget_close(&f, &fctx); Index: trunk/src_plugins/fp_wget/tester.c =================================================================== --- trunk/src_plugins/fp_wget/tester.c (revision 30941) +++ trunk/src_plugins/fp_wget/tester.c (revision 30942) @@ -4,7 +4,7 @@ #include "gedasymbols.h" #undef strdup -char *pcb_strdup(const char *s) { return strdup(s); } +char *rnd_strdup(const char *s) { return strdup(s); } pcb_plug_fp_t *pcb_plug_fp_chain = NULL; Index: trunk/src_plugins/fp_wget/wget_common.c =================================================================== --- trunk/src_plugins/fp_wget/wget_common.c (revision 30941) +++ trunk/src_plugins/fp_wget/wget_common.c (revision 30942) @@ -151,7 +151,7 @@ if ((*s == '\0') || (isspace(*s))) { if ((s - sum) == 32) { *s = '\0'; - return pcb_strdup(sum); + return rnd_strdup(sum); } else return NULL; Index: trunk/src_plugins/hid_batch/batch.c =================================================================== --- trunk/src_plugins/hid_batch/batch.c (revision 30941) +++ trunk/src_plugins/hid_batch/batch.c (revision 30942) @@ -73,10 +73,10 @@ else prompt = hidlib->filename; if (prompt != NULL) - prompt = pcb_strdup(prompt); + prompt = rnd_strdup(prompt); } else - prompt = pcb_strdup("no-board"); + prompt = rnd_strdup("no-board"); } static void log_append(pcb_logline_t *line) Index: trunk/src_plugins/hid_gtk2_gdk/gtkhid-gdk.c =================================================================== --- trunk/src_plugins/hid_gtk2_gdk/gtkhid-gdk.c (revision 30941) +++ trunk/src_plugins/hid_gtk2_gdk/gtkhid-gdk.c (revision 30942) @@ -706,14 +706,14 @@ start_angle -= 360; gdk_draw_arc(priv->out_pixel, priv->pixel_gc, 0, - pcb_round(Vxd(cx) - Vzd(xradius) + 0.5), pcb_round(Vyd(cy) - Vzd(yradius) + 0.5), - pcb_round(vrx2), pcb_round(vry2), + rnd_round(Vxd(cx) - Vzd(xradius) + 0.5), rnd_round(Vyd(cy) - Vzd(yradius) + 0.5), + rnd_round(vrx2), rnd_round(vry2), (start_angle + 180) * 64, delta_angle * 64); if (priv->out_clip != NULL) gdk_draw_arc(priv->out_clip, priv->clip_gc, 0, - pcb_round(Vxd(cx) - Vzd(xradius) + 0.5), pcb_round(Vyd(cy) - Vzd(yradius) + 0.5), - pcb_round(vrx2), pcb_round(vry2), + rnd_round(Vxd(cx) - Vzd(xradius) + 0.5), rnd_round(Vyd(cy) - Vzd(yradius) + 0.5), + rnd_round(vrx2), rnd_round(vry2), (start_angle + 180) * 64, delta_angle * 64); } Index: trunk/src_plugins/hid_lesstif/dialogs.c =================================================================== --- trunk/src_plugins/hid_lesstif/dialogs.c (revision 30941) +++ trunk/src_plugins/hid_lesstif/dialogs.c (revision 30942) @@ -202,7 +202,7 @@ break; case PCB_HATT_STRING: free((char *)ctx->attrs[widx].val.str); - ctx->attrs[widx].val.str = pcb_strdup(XmTextGetString(ctx->wl[widx])); + ctx->attrs[widx].val.str = rnd_strdup(XmTextGetString(ctx->wl[widx])); return; /* can't rely on central copy because of the allocation */ case PCB_HATT_ENUM: { @@ -523,7 +523,7 @@ break; case PCB_HATT_STRING: XtVaSetValues(ctx->wl[idx], XmNvalue, XmStrCast(val->str), NULL); - ctx->attrs[idx].val.str = pcb_strdup(val->str); + ctx->attrs[idx].val.str = rnd_strdup(val->str); copied = 1; break; case PCB_HATT_INTEGER: @@ -645,7 +645,7 @@ ctx->close_cb = button_cb; ctx->close_cb_called = 0; ctx->widget_destroyed = 0; - ctx->id = pcb_strdup(id); + ctx->id = rnd_strdup(id); ctx->wl = (Widget *) calloc(n_attrs, sizeof(Widget)); ctx->wltop = (Widget *)calloc(n_attrs, sizeof(Widget)); @@ -850,15 +850,15 @@ { const char *a = ""; rnd_PCB_ACT_MAY_CONVARG(1, FGW_STR, DoWindows, a = argv[1].val.str); - if (strcmp(a, "1") == 0 || pcb_strcasecmp(a, "Layout") == 0) { + if (strcmp(a, "1") == 0 || rnd_strcasecmp(a, "Layout") == 0) { } - else if (strcmp(a, "2") == 0 || pcb_strcasecmp(a, "Library") == 0) { + else if (strcmp(a, "2") == 0 || rnd_strcasecmp(a, "Library") == 0) { lesstif_show_library(); } - else if (strcmp(a, "3") == 0 || pcb_strcasecmp(a, "Log") == 0) { + else if (strcmp(a, "3") == 0 || rnd_strcasecmp(a, "Log") == 0) { rnd_actionva(ltf_hidlib, "LogDialog", NULL); } - else if (strcmp(a, "4") == 0 || pcb_strcasecmp(a, "Netlist") == 0) { + else if (strcmp(a, "4") == 0 || rnd_strcasecmp(a, "Netlist") == 0) { lesstif_show_netlist(); } else { Index: trunk/src_plugins/hid_lesstif/dlg_attr_misc.c =================================================================== --- trunk/src_plugins/hid_lesstif/dlg_attr_misc.c (revision 30941) +++ trunk/src_plugins/hid_lesstif/dlg_attr_misc.c (revision 30942) @@ -344,7 +344,7 @@ Widget wtxt = ctx->wl[idx]; if (how & PCB_HID_TEXT_MARKUP) { - char *orig, *tmp = pcb_strdup(txt); + char *orig, *tmp = rnd_strdup(txt); pcb_markup_state_t st = 0; char *seg; long seglen; @@ -380,7 +380,7 @@ char *ltf_text_get_text(pcb_hid_attribute_t *attrib, void *hid_ctx) { char *orig = ltf_text_get_text_(attrib, hid_ctx); - char *s = pcb_strdup(orig); + char *s = rnd_strdup(orig); XtFree(orig); return s; } Index: trunk/src_plugins/hid_lesstif/dlg_fileselect.c =================================================================== --- trunk/src_plugins/hid_lesstif/dlg_fileselect.c (revision 30941) +++ trunk/src_plugins/hid_lesstif/dlg_fileselect.c (revision 30942) @@ -57,7 +57,7 @@ XtGetValues(pctx->dialog, stdarg_args, stdarg_n); XmStringGetLtoR(xmname, XmFONTLIST_DEFAULT_TAG, &name); - res = pcb_strdup(name); + res = rnd_strdup(name); XtFree(name); return res; } Index: trunk/src_plugins/hid_lesstif/main.c =================================================================== --- trunk/src_plugins/hid_lesstif/main.c (revision 30941) +++ trunk/src_plugins/hid_lesstif/main.c (revision 30942) @@ -1367,7 +1367,7 @@ { KeySym key; - if (pcb_strcasecmp(desc, "enter") == 0) desc = "Return"; + if (rnd_strcasecmp(desc, "enter") == 0) desc = "Return"; key = XStringToKeysym(desc); if (key == NoSymbol && len > 1) { @@ -1867,7 +1867,7 @@ /* listen on standard input for actions */ if (stdin_listen) { - XtAppAddInput(app_context, pcb_fileno(stdin), (XtPointer) XtInputReadMask, lesstif_listener_cb, NULL); + XtAppAddInput(app_context, rnd_fileno(stdin), (XtPointer) XtInputReadMask, lesstif_listener_cb, NULL); } return 0; } @@ -2901,8 +2901,8 @@ { viewbox->X1 = view_left_x; viewbox->Y1 = view_top_y; - viewbox->X2 = pcb_round(view_left_x + view_width * view_zoom); - viewbox->Y2 = pcb_round(view_top_y + view_height * view_zoom); + viewbox->X2 = rnd_round(view_left_x + view_width * view_zoom); + viewbox->Y2 = rnd_round(view_top_y + view_height * view_zoom); } static void ltf_open_command(pcb_hid_t *hid) Index: trunk/src_plugins/hid_lesstif/menu.c =================================================================== --- trunk/src_plugins/hid_lesstif/menu.c (revision 30941) +++ trunk/src_plugins/hid_lesstif/menu.c (revision 30942) @@ -439,7 +439,7 @@ } v = node->name; - stdarg(XmNlabelString, XmStringCreatePCB(pcb_strdup(v))); + stdarg(XmNlabelString, XmStringCreatePCB(rnd_strdup(v))); set_ins_after(menu, ins_after); md = menu_data_alloc(); @@ -450,7 +450,7 @@ lht_node_t *submenu_node = pcb_hid_cfg_menu_field(node, PCB_MF_SUBMENU, &field_name); stdarg(XmNtearOffModel, XmTEAR_OFF_ENABLED); - md->sub = XmCreatePulldownMenu(menu, pcb_strdup(v), stdarg_args + nn, stdarg_n - nn); + md->sub = XmCreatePulldownMenu(menu, rnd_strdup(v), stdarg_args + nn, stdarg_n - nn); node->user_data = md; stdarg_n = nn; stdarg(XmNsubMenuId, md->sub); Index: trunk/src_plugins/hid_lesstif/netlist.c =================================================================== --- trunk/src_plugins/hid_lesstif/netlist.c (revision 30941) +++ trunk/src_plugins/hid_lesstif/netlist.c (revision 30942) @@ -53,7 +53,7 @@ if (net_name == NULL) last_pick = NULL; else - last_pick = pcb_strdup(net_name); + last_pick = rnd_strdup(net_name); if (netnode_strings) free(netnode_strings); /* XXX leaked all XmStrings??? */ @@ -200,7 +200,7 @@ const char *name = menu->Entry[cbs->item_position - 1].ListEntry; char *ename, *pname; - ename = pcb_strdup(name); + ename = rnd_strdup(name); pname = strchr(ename, '-'); if (!pname) { free(ename); Index: trunk/src_plugins/hid_lesstif/wt_preview.c =================================================================== --- trunk/src_plugins/hid_lesstif/wt_preview.c (revision 30941) +++ trunk/src_plugins/hid_lesstif/wt_preview.c (revision 30942) @@ -75,11 +75,11 @@ if (pcbhl_conf.editor.view.flip_x) px = pd->v_width - px; - x = pcb_round((double)px * pd->zoom + (double)pd->x1); + x = rnd_round((double)px * pd->zoom + (double)pd->x1); if (pcbhl_conf.editor.view.flip_y) py = pd->v_height - py; - y = pcb_round((double)py * pd->zoom + (double)pd->y1); + y = rnd_round((double)py * pd->zoom + (double)pd->y1); *dst_x = x; *dst_y = y; Index: trunk/src_plugins/hid_lesstif/wt_xpm.c =================================================================== --- trunk/src_plugins/hid_lesstif/wt_xpm.c (revision 30941) +++ trunk/src_plugins/hid_lesstif/wt_xpm.c (revision 30942) @@ -110,7 +110,7 @@ if (!XAllocColor(display, colormap, &c)) goto error; } - else if (pcb_strcasecmp(x, "None") == 0) { + else if (rnd_strcasecmp(x, "None") == 0) { /* c.red = hex_raw((bgcolor & 0xff0000) >> 16); c.green = hex_raw((bgcolor & 0x00ff00) >> 8); c.blue = hex_raw(bgcolor & 0x0000ff); Index: trunk/src_plugins/import_calay/calay.c =================================================================== --- trunk/src_plugins/import_calay/calay.c (revision 30941) +++ trunk/src_plugins/import_calay/calay.c (revision 30942) @@ -82,7 +82,7 @@ next++; } free(curr); - curr = pcb_strdup(s); + curr = rnd_strdup(s); s = next; } Index: trunk/src_plugins/import_fpcb_nl/fpcb_nl.c =================================================================== --- trunk/src_plugins/import_fpcb_nl/fpcb_nl.c (revision 30941) +++ trunk/src_plugins/import_fpcb_nl/fpcb_nl.c (revision 30942) @@ -80,13 +80,13 @@ /* parse directive */ if (*line == '*') { - if (pcb_strcasecmp(line, "*END*") == 0) + if (rnd_strcasecmp(line, "*END*") == 0) break; - else if (pcb_strcasecmp(line, "*PART*") == 0) + else if (rnd_strcasecmp(line, "*PART*") == 0) mode = MODE_PART; - else if (pcb_strcasecmp(line, "*NET*") == 0) + else if (rnd_strcasecmp(line, "*NET*") == 0) mode = MODE_NET; - else if (pcb_strncasecmp(line, "*SIGNAL*", 8) == 0) { + else if (rnd_strncasecmp(line, "*SIGNAL*", 8) == 0) { *signame = '\0'; if ((mode == MODE_NET) || (mode == MODE_SIGNAL)) { int len; Index: trunk/src_plugins/import_ipcd356/ipcd356.c =================================================================== --- trunk/src_plugins/import_ipcd356/ipcd356.c (revision 30941) +++ trunk/src_plugins/import_ipcd356/ipcd356.c (revision 30942) @@ -95,7 +95,7 @@ d = d / 10.0; else d = d / 1000.0; - *dst = pcb_round(d); + *dst = rnd_round(d); return 0; } Index: trunk/src_plugins/import_ltspice/ltspice.c =================================================================== --- trunk/src_plugins/import_ltspice/ltspice.c (revision 30941) +++ trunk/src_plugins/import_ltspice/ltspice.c (revision 30942) @@ -117,7 +117,7 @@ s+=9; ltrim(s); free(sattr.refdes); - sattr.refdes = pcb_strdup(s); + sattr.refdes = rnd_strdup(s); /* figure out if device is passive or not, as this affects subsequent parsing of the "SYMATTR VALUE .... " line */ if (strncmp(s, "R", 1) != 0 && strncmp(s, "L", 1) != 0 && @@ -138,7 +138,7 @@ ltrim(s); free(sattr.value); if (isPassive) { - sattr.value = pcb_strdup(s); + sattr.value = rnd_strdup(s); } else { char *fp; @@ -145,7 +145,7 @@ /*s+=6;*/ fp = strstr(s, ".pcb-rnd-"); if (fp != NULL) { - sattr.value = pcb_strdup(fp); + sattr.value = rnd_strdup(fp); s = fp; fp += 9; if (*fp == '"') { @@ -156,7 +156,7 @@ *end = '\0'; } free(sattr.footprint); - sattr.footprint = pcb_strdup(fp); + sattr.footprint = rnd_strdup(fp); } } } @@ -179,7 +179,7 @@ if (strncmp(fp, "pcb-rnd-", 8) == 0) fp += 8; free(sattr.footprint); - sattr.footprint = pcb_strdup(fp); + sattr.footprint = rnd_strdup(fp); } } /* nothing stops a user inserting @@ -188,7 +188,7 @@ s+=10; ltrim(s); free(sattr.footprint); - sattr.footprint = pcb_strdup(s); + sattr.footprint = rnd_strdup(s); } } } @@ -273,12 +273,12 @@ end = strrchr(fname, '.'); if (end != NULL) { if (strcmp(end, ".net") == 0) - fname_base = pcb_strndup(fname, end - fname); + fname_base = rnd_strndup(fname, end - fname); else if (strcmp(end, ".asc") == 0) - fname_base = pcb_strndup(fname, end - fname); + fname_base = rnd_strndup(fname, end - fname); } if (fname_base == NULL) - fname_base = pcb_strdup(fname); + fname_base = rnd_strdup(fname); *fname_net = pcb_strdup_printf("%s.net", fname_base); *fname_asc = pcb_strdup_printf("%s.asc", fname_base); Index: trunk/src_plugins/import_mentor_sch/netlist_helper.c =================================================================== --- trunk/src_plugins/import_mentor_sch/netlist_helper.c (revision 30941) +++ trunk/src_plugins/import_mentor_sch/netlist_helper.c (revision 30942) @@ -149,8 +149,8 @@ r->prio = prio; r->key = kr; r->val = vr; - r->new_key = pcb_strdup(argv[3]); - r->new_val = pcb_strdup(argv[4]); + r->new_key = rnd_strdup(argv[3]); + r->new_val = rnd_strdup(argv[4]); r->next = nhctx->part_rules; nhctx->part_rules = r; @@ -191,7 +191,7 @@ else prealloc->alloced = 0; prealloc->nhctx = nhctx; - prealloc->id = pcb_strdup(id); + prealloc->id = rnd_strdup(id); htsp_init(&prealloc->attr, strhash, strkeyeq); return prealloc; } @@ -198,12 +198,12 @@ void nethlp_elem_refdes(nethlp_elem_ctx_t *ectx, const char *refdes) { - htsp_set(&ectx->nhctx->id2refdes, pcb_strdup(ectx->id), pcb_strdup(refdes)); + htsp_set(&ectx->nhctx->id2refdes, rnd_strdup(ectx->id), rnd_strdup(refdes)); } void nethlp_elem_attr(nethlp_elem_ctx_t *ectx, const char *key, const char *val) { - htsp_set(&ectx->attr, pcb_strdup(key), pcb_strdup(val)); + htsp_set(&ectx->attr, rnd_strdup(key), rnd_strdup(val)); } static void elem_map_apply(nethlp_elem_ctx_t *ectx, nethlp_rule_t *r) @@ -211,7 +211,7 @@ char *dst; re_se_backref(r->val, &dst, r->new_val); /* printf("Map add: '%s' -> '%s'\n", r->new_key, dst);*/ - htsp_set(&ectx->attr, pcb_strdup(r->new_key), pcb_strdup(dst)); + htsp_set(&ectx->attr, rnd_strdup(r->new_key), rnd_strdup(dst)); } void nethlp_elem_done(rnd_hidlib_t *hl, nethlp_elem_ctx_t *ectx) @@ -284,7 +284,7 @@ prealloc->alloced = 0; prealloc->nhctx = nhctx; - prealloc->netname = pcb_strdup(netname); + prealloc->netname = rnd_strdup(netname); return prealloc; } Index: trunk/src_plugins/import_mucs/mucs.c =================================================================== --- trunk/src_plugins/import_mucs/mucs.c (revision 30941) +++ trunk/src_plugins/import_mucs/mucs.c (revision 30942) @@ -87,7 +87,7 @@ } if (fname && *fname) - default_file = pcb_strdup(fname); + default_file = rnd_strdup(fname); } fi = pcb_fopen(&PCB->hidlib, fname, "r"); Index: trunk/src_plugins/import_net_cmd/import_net_cmd.c =================================================================== --- trunk/src_plugins/import_net_cmd/import_net_cmd.c (revision 30941) +++ trunk/src_plugins/import_net_cmd/import_net_cmd.c (revision 30942) @@ -74,8 +74,8 @@ if (verbose) rnd_message(PCB_MSG_DEBUG, "import_net_cmd: running cmd: '%s' outfn='%s'\n", cmdline, outfn); - pcb_setenv("IMPORT_NET_CMD_PCB", PCB->hidlib.filename, 1); - pcb_setenv("IMPORT_NET_CMD_OUT", outfn, 1); + rnd_setenv("IMPORT_NET_CMD_PCB", PCB->hidlib.filename, 1); + rnd_setenv("IMPORT_NET_CMD_OUT", outfn, 1); res = pcb_system(&PCB->hidlib, cmdline); if (res == 0) { if (verbose) Index: trunk/src_plugins/import_sch2/import_sch_dlg.c =================================================================== --- trunk/src_plugins/import_sch2/import_sch_dlg.c (revision 30941) +++ trunk/src_plugins/import_sch2/import_sch_dlg.c (revision 30942) @@ -147,7 +147,7 @@ if (tname != NULL) { for(n = 0; n < isch_ctx.len; n++) { - if (pcb_strcasecmp(isch_ctx.inames[n], tname) == 0) { + if (rnd_strcasecmp(isch_ctx.inames[n], tname) == 0) { tab = n; break; } @@ -278,7 +278,7 @@ qsort(pa, len, sizeof(pcb_plug_import_t *), isch_cmp); for(n = 0; n < len; n++) - isch_ctx.inames[n] = pcb_strdup(pa[n]->name); + isch_ctx.inames[n] = rnd_strdup(pa[n]->name); isch_ctx.inames[n] = NULL; isch_ctx.len = len; Index: trunk/src_plugins/import_tinycad/tinycad.c =================================================================== --- trunk/src_plugins/import_tinycad/tinycad.c (revision 30941) +++ trunk/src_plugins/import_tinycad/tinycad.c (revision 30942) @@ -127,17 +127,17 @@ else if ((argc > 1) && (strcmp(argv[0], "COMPONENT") == 0)) { sym_flush(&sattr); free(sattr.refdes); - sattr.refdes = pcb_strdup(argv[1]); + sattr.refdes = rnd_strdup(argv[1]); } else if ((argc > 3) && (strcmp(argv[0], "OPTION") == 0)) { if (strcmp(argv[3], "..") != 0) { if (strcmp(argv[1], "Package") == 0) { free(sattr.footprint); - sattr.footprint = pcb_strdup(argv[3]); + sattr.footprint = rnd_strdup(argv[3]); } else if (strcmp(argv[1], "Value") == 0) { free(sattr.value); - sattr.value = pcb_strdup(argv[3]); + sattr.value = rnd_strdup(argv[3]); } } } Index: trunk/src_plugins/io_autotrax/read.c =================================================================== --- trunk/src_plugins/io_autotrax/read.c (revision 30941) +++ trunk/src_plugins/io_autotrax/read.c (revision 30942) @@ -447,7 +447,7 @@ Drill = PCB_MM_TO_COORD(0.300); /* start with something sane */ - name = pcb_strdup("unnamed"); + name = rnd_strdup("unnamed"); if (fgetline(line, sizeof(line), FP, st->lineno) != NULL) { int argc; @@ -818,9 +818,9 @@ st->protel_to_stackup[10] = pcb_layer_create(st->pcb, g - st->pcb->LayerGroups.grp, "Power", 0); g = pcb_get_grp_new_intern(st->pcb, -1); - g->name = pcb_strdup("outline"); /* equivalent to keepout = layer 12 in autotrax */ + g->name = rnd_strdup("outline"); /* equivalent to keepout = layer 12 in autotrax */ g->ltype = PCB_LYT_BOUNDARY; /* and includes cutouts */ - pcb_layergrp_set_purpose__(g, pcb_strdup("uroute"), 0); + pcb_layergrp_set_purpose__(g, rnd_strdup("uroute"), 0); st->protel_to_stackup[12] = autotrax_reg_layer(st, "outline", PCB_LYT_BOUNDARY); pcb_layergrp_inhibit_dec(); @@ -850,7 +850,7 @@ if (fgetline(line, sizeof(line), FP, st->lineno) != NULL) { s = line; rtrim(s); - netname = pcb_strdup(line); + netname = rnd_strdup(line); } else { rnd_message(PCB_MSG_ERROR, "Empty netlist name found, %s:%d\n", st->Filename, st->lineno); @@ -876,28 +876,28 @@ rtrim(s); sym_flush(&st->pcb->hidlib, &sattr); free(sattr.refdes); - sattr.refdes = pcb_strdup(line); + sattr.refdes = rnd_strdup(line); } if (fgetline(line, sizeof(line), FP, st->lineno) == NULL) { rnd_message(PCB_MSG_ERROR, "Empty NETDEF package, %s:%d\n", st->Filename, st->lineno); free(sattr.footprint); - sattr.footprint = pcb_strdup("unknown"); + sattr.footprint = rnd_strdup("unknown"); } else { s = line; rtrim(s); free(sattr.footprint); - sattr.footprint = pcb_strdup(line); + sattr.footprint = rnd_strdup(line); } if (fgetline(line, sizeof(line), FP, st->lineno) == NULL) { free(sattr.value); - sattr.value = pcb_strdup("value"); + sattr.value = rnd_strdup("value"); } else { s = line; rtrim(s); free(sattr.value); - sattr.value = pcb_strdup(line); + sattr.value = rnd_strdup(line); } } while(fgetline(line, sizeof(line), FP, st->lineno) == NULL) { Index: trunk/src_plugins/io_bxl/bxl_lex.c =================================================================== --- trunk/src_plugins/io_bxl/bxl_lex.c (revision 30941) +++ trunk/src_plugins/io_bxl/bxl_lex.c (revision 30942) @@ -515,7 +515,7 @@ return UREGLEX_NOP; case 2:{ #line 53 "bxl_lex.ul" - lval->un.s = pcb_strdup(ULX_BUF); + lval->un.s = rnd_strdup(ULX_BUF); return T_ID; } @@ -522,7 +522,7 @@ return UREGLEX_NOP; case 3:{ #line 59 "bxl_lex.ul" - lval->un.s = pcb_strndup(ULX_TAGP(1), ULX_TAGL(1)); + lval->un.s = rnd_strndup(ULX_TAGP(1), ULX_TAGL(1)); return T_QSTR; } @@ -540,7 +540,7 @@ } return UREGLEX_NOP; case 6:{ - lval->un.s = pcb_strdup(ULX_BUF); return T_ID; + lval->un.s = rnd_strdup(ULX_BUF); return T_ID; } return UREGLEX_NOP; case 7:{ Index: trunk/src_plugins/io_bxl/io_bxl.c =================================================================== --- trunk/src_plugins/io_bxl/io_bxl.c (revision 30941) +++ trunk/src_plugins/io_bxl/io_bxl.c (revision 30942) @@ -43,7 +43,7 @@ int io_bxl_fmt(pcb_plug_io_t *ctx, pcb_plug_iot_t typ, int wr, const char *fmt) { - if ((strcmp(ctx->description, fmt) != 0) && (pcb_strcasecmp(fmt, "bxl") != 0)) /* format name mismatch */ + if ((strcmp(ctx->description, fmt) != 0) && (rnd_strcasecmp(fmt, "bxl") != 0)) /* format name mismatch */ return 0; if ((typ & (~(PCB_IOT_FOOTPRINT))) != 0) /* support only footprints */ Index: trunk/src_plugins/io_bxl/read.c =================================================================== --- trunk/src_plugins/io_bxl/read.c (revision 30941) +++ trunk/src_plugins/io_bxl/read.c (revision 30942) @@ -148,7 +148,7 @@ pcb_layer_t *ly; ly = pcb_subc_get_layer(ctx->subc, lm->lyt, lm->comb, 1, layer_name, pcb_true); - htsp_set(&ctx->layer_name2ly, pcb_strdup(layer_name), ly); + htsp_set(&ctx->layer_name2ly, rnd_strdup(layer_name), ly); ctx->state.layer = ly; } else @@ -163,15 +163,15 @@ void pcb_bxl_set_justify(pcb_bxl_ctx_t *ctx, const char *str) { /* special case for single center */ - if (pcb_strcasecmp(str, "center") == 0) { ctx->state.hjust = ctx->state.vjust = PCB_BXL_JUST_CENTER; return; } + if (rnd_strcasecmp(str, "center") == 0) { ctx->state.hjust = ctx->state.vjust = PCB_BXL_JUST_CENTER; return; } - if (pcb_strncasecmp(str, "lower", 5) == 0) { ctx->state.vjust = PCB_BXL_JUST_BOTTOM; str+=5; } - else if (pcb_strncasecmp(str, "upper", 5) == 0) { ctx->state.vjust = PCB_BXL_JUST_TOP; str+=5; } - else if (pcb_strncasecmp(str, "center", 6) == 0) { ctx->state.vjust = PCB_BXL_JUST_CENTER; str+=6; } + if (rnd_strncasecmp(str, "lower", 5) == 0) { ctx->state.vjust = PCB_BXL_JUST_BOTTOM; str+=5; } + else if (rnd_strncasecmp(str, "upper", 5) == 0) { ctx->state.vjust = PCB_BXL_JUST_TOP; str+=5; } + else if (rnd_strncasecmp(str, "center", 6) == 0) { ctx->state.vjust = PCB_BXL_JUST_CENTER; str+=6; } - if (pcb_strncasecmp(str, "left", 4) == 0) ctx->state.hjust = PCB_BXL_JUST_LEFT; - else if (pcb_strncasecmp(str, "right", 5) == 0) ctx->state.hjust = PCB_BXL_JUST_RIGHT; - else if (pcb_strncasecmp(str, "center", 6) == 0) ctx->state.hjust = PCB_BXL_JUST_CENTER; + if (rnd_strncasecmp(str, "left", 4) == 0) ctx->state.hjust = PCB_BXL_JUST_LEFT; + else if (rnd_strncasecmp(str, "right", 5) == 0) ctx->state.hjust = PCB_BXL_JUST_RIGHT; + else if (rnd_strncasecmp(str, "center", 6) == 0) ctx->state.hjust = PCB_BXL_JUST_CENTER; } void pcb_bxl_add_property(pcb_bxl_ctx_t *ctx, pcb_any_obj_t *obj, const char *keyval) @@ -192,7 +192,7 @@ return; } - tmp = pcb_strdup(keyval); + tmp = rnd_strdup(keyval); tmp[sep-keyval] = '\0'; val = tmp+(sep-keyval)+1; rnd_attribute_put(&obj->Attributes, tmp, val); @@ -274,9 +274,9 @@ void pcb_bxl_padstack_begin_shape(pcb_bxl_ctx_t *ctx, const char *name) { - if (pcb_strcasecmp(name, "rectangle") == 0) ctx->state.shape_type = 1; - else if (pcb_strcasecmp(name, "square") == 0) ctx->state.shape_type = 1; - else if (pcb_strcasecmp(name, "round") == 0) ctx->state.shape_type = 2; + if (rnd_strcasecmp(name, "rectangle") == 0) ctx->state.shape_type = 1; + else if (rnd_strcasecmp(name, "square") == 0) ctx->state.shape_type = 1; + else if (rnd_strcasecmp(name, "round") == 0) ctx->state.shape_type = 2; else { rnd_message(PCB_MSG_WARNING, "bxl footprint error: unknown padstack shape '%s' in '%s' - omitting shape\n", name, ctx->state.proto.name); return; @@ -427,7 +427,7 @@ SKIP; if (!ctx->state.is_text && (ctx->state.attr_key != NULL)) { - int is_refdes = (pcb_strcasecmp(ctx->state.attr_key, "refdes") == 0); + int is_refdes = (rnd_strcasecmp(ctx->state.attr_key, "refdes") == 0); if (is_refdes) { strcpy(ctx->state.attr_key, "refdes"); @@ -435,7 +435,7 @@ /* make sure the text object is created properly */ flg = PCB_FLAG_FLOATER | PCB_FLAG_DYNTEXT; free(ctx->state.text_str); - ctx->state.text_str = pcb_strdup("%a.parent.refdes%"); + ctx->state.text_str = rnd_strdup("%a.parent.refdes%"); ctx->state.is_visible = 1; } rnd_attribute_put(&ctx->subc->Attributes, ctx->state.attr_key, ctx->state.attr_val); Index: trunk/src_plugins/io_dsn/io_dsn.c =================================================================== --- trunk/src_plugins/io_dsn/io_dsn.c (revision 30941) +++ trunk/src_plugins/io_dsn/io_dsn.c (revision 30942) @@ -52,7 +52,7 @@ if (strcmp(ctx->description, fmt) == 0) return 200; - if ((pcb_strcasecmp(fmt, "dsn") != 0) || + if ((rnd_strcasecmp(fmt, "dsn") != 0) || ((typ & (~(PCB_IOT_PCB))) != 0)) return 0; Index: trunk/src_plugins/io_dsn/read.c =================================================================== --- trunk/src_plugins/io_dsn/read.c (revision 30941) +++ trunk/src_plugins/io_dsn/read.c (revision 30942) @@ -81,7 +81,7 @@ /* check if node is named name and if so, save the node in nname for later reference; assumes node->str is not NULL */ #define if_save_uniq(node, name) \ - if (pcb_strcasecmp(node->str, #name) == 0) { \ + if (rnd_strcasecmp(node->str, #name) == 0) { \ if (n ## name != NULL) { \ rnd_message(PCB_MSG_ERROR, "Multiple " #name " nodes where only one is expected (at %ld:%ld)\n", (long)node->line, (long)node->col); \ return -1; \ @@ -162,7 +162,7 @@ gsxl_node_t *n; for(n = nd; n != NULL; n = n->next) { - if ((n->str != NULL) && ((pcb_strcasecmp(n->str, "unit") == 0) || (pcb_strcasecmp(n->str, "resolution") == 0))) { + if ((n->str != NULL) && ((rnd_strcasecmp(n->str, "unit") == 0) || (rnd_strcasecmp(n->str, "resolution") == 0))) { old_unit = push_unit(ctx, n); break; } @@ -230,7 +230,7 @@ { if ((rule == NULL) || (rule->str == NULL)) return 0; - if (pcb_strcasecmp(rule->str, "width") == 0) + if (rnd_strcasecmp(rule->str, "width") == 0) conf_set_design("design/min_wid", "%$mS", COORD(ctx, rule->children)); /* the rest of the rules do not have a direct mapping in the current DRC code */ return 0; @@ -249,12 +249,12 @@ for(bnd = bnd->children; bnd != NULL; bnd = bnd->next) { if (bnd->str == NULL) continue; - if (pcb_strcasecmp(bnd->str, "path") == 0) { + if (rnd_strcasecmp(bnd->str, "path") == 0) { rnd_coord_t x, y, lx, ly, fx, fy, aper; int len; b = gsxl_children(bnd); - if (!do_bbox && (pcb_strcasecmp(STRE(b), "pcb") == 0)) { + if (!do_bbox && (rnd_strcasecmp(STRE(b), "pcb") == 0)) { rnd_message(PCB_MSG_ERROR, "PCB boundary shall be a rect, not a path;\naccepting the path, but other software may choke on this file\n"); ctx->has_pcb_boundary = 1; } @@ -293,7 +293,7 @@ if (!do_bbox && (x != fx) && (y != fy)) /* close the boundary */ boundary_line(oly, lx, ly, x, y, aper); } - else if (pcb_strcasecmp(bnd->str, "rect") == 0) { + else if (rnd_strcasecmp(bnd->str, "rect") == 0) { rnd_box_t box; b = gsxl_children(bnd); @@ -301,7 +301,7 @@ rnd_message(PCB_MSG_ERROR, "not enough arguments for boundary rect (at %ld:%ld)\n", (long)b->line, (long)b->col); return -1; } - if (pcb_strcasecmp(STRE(b), "pcb") == 0) + if (rnd_strcasecmp(STRE(b), "pcb") == 0) ctx->has_pcb_boundary = 1; if (dsn_parse_rect(ctx, &box, b->next, do_bbox) != 0) return -1; @@ -345,9 +345,9 @@ static int parse_layer_type(dsn_read_t *ctx, pcb_layergrp_t *grp, const char *ty) { - if ((pcb_strcasecmp(ty, "signal") == 0) || (pcb_strcasecmp(ty, "jumper") == 0)) + if ((rnd_strcasecmp(ty, "signal") == 0) || (rnd_strcasecmp(ty, "jumper") == 0)) return 0; /* nothig special to do */ - if ((pcb_strcasecmp(ty, "power") == 0) || (pcb_strcasecmp(ty, "mixed") == 0)) { + if ((rnd_strcasecmp(ty, "power") == 0) || (rnd_strcasecmp(ty, "mixed") == 0)) { rnd_attribute_put(&grp->Attributes, "plane", ty); return 0; } @@ -401,7 +401,7 @@ for(n = str->children; n != NULL; n = n->next) { if (n->str == NULL) continue; - else if (pcb_strcasecmp(n->str, "layer") == 0) { + else if (rnd_strcasecmp(n->str, "layer") == 0) { pcb_layer_t *ly; if (botcop != NULL) { @@ -423,11 +423,11 @@ if (n->children != NULL) { for(i = n->children->next; i != NULL; i = i->next) { - if (pcb_strcasecmp(i->str, "type") == 0) { + if (rnd_strcasecmp(i->str, "type") == 0) { if (parse_layer_type(ctx, botcop, STRE(i->children)) != 0) return -1; } - else if (pcb_strcasecmp(i->str, "property") == 0) { + else if (rnd_strcasecmp(i->str, "property") == 0) { parse_attribute(ctx, &botcop->Attributes, i->children); } } @@ -473,11 +473,11 @@ for(n = str->children; n != NULL; n = n->next) { if (n->str == NULL) continue; - else if (pcb_strcasecmp(n->str, "boundary") == 0) { + else if (rnd_strcasecmp(n->str, "boundary") == 0) { if (dsn_parse_boundary(ctx, n) != 0) return -1; } - else if (pcb_strcasecmp(n->str, "rule") == 0) { + else if (rnd_strcasecmp(n->str, "rule") == 0) { if (dsn_parse_rule(ctx, n->children) != 0) return -1; } @@ -630,7 +630,7 @@ { if ((plt->children == NULL) || (plt->children->str == NULL)) return 0; - if (pcb_strcasecmp(plt->children->str, "plated") == 0) + if (rnd_strcasecmp(plt->children->str, "plated") == 0) prt->hplated = 1; return 0; } @@ -642,23 +642,23 @@ rnd_message(PCB_MSG_ERROR, "Invalid padstack shape (at %ld:%ld)\n", (long)sn->line, (long)sn->col); return -1; } - if (pcb_strcasecmp(sn->str, "circle") == 0) { + if (rnd_strcasecmp(sn->str, "circle") == 0) { if (dsn_parse_pstk_shape_circle(ctx, sn, shp) != 0) return -1; } - else if (pcb_strcasecmp(sn->str, "rect") == 0) { + else if (rnd_strcasecmp(sn->str, "rect") == 0) { if (dsn_parse_pstk_shape_rect(ctx, sn, shp) != 0) return -1; } - else if ((pcb_strcasecmp(sn->str, "polygon") == 0) || (pcb_strcasecmp(sn->str, "poly") == 0)) { + else if ((rnd_strcasecmp(sn->str, "polygon") == 0) || (rnd_strcasecmp(sn->str, "poly") == 0)) { if (dsn_parse_pstk_shape_poly(ctx, sn, shp) != 0) return -1; } - else if (pcb_strcasecmp(sn->str, "path") == 0) { + else if (rnd_strcasecmp(sn->str, "path") == 0) { if (dsn_parse_pstk_shape_path(ctx, sn, shp) != 0) return -1; } - else if (pcb_strcasecmp(sn->str, "qarc") == 0) { + else if (rnd_strcasecmp(sn->str, "qarc") == 0) { rnd_message(PCB_MSG_ERROR, "Unsupported padstack shape %s (at %ld:%ld)\n", sn->str, (long)sn->line, (long)sn->col); return -1; } @@ -676,7 +676,7 @@ const char *nname= STRE(net); pcb_layer_t *ly; - if ((pcb_strcasecmp(nname, "signal") == 0) || (pcb_strcasecmp(nname, "power") == 0)) + if ((rnd_strcasecmp(nname, "signal") == 0) || (rnd_strcasecmp(nname, "power") == 0)) return 0; ly = htsp_get(&ctx->name2layer, nname); \ @@ -743,7 +743,7 @@ prt = calloc(sizeof(pcb_pstk_proto_t), 1); pcb_vtpadstack_tshape_alloc_append(&prt->tr, 1); - prt->name = pcb_strdup(wrr->children->str); + prt->name = rnd_strdup(wrr->children->str); old_unit = dsn_set_old_unit(ctx, wrr->children->next); @@ -750,7 +750,7 @@ for(n = wrr->children; n != NULL; n = n->next) { if (n->str == NULL) continue; - if (pcb_strcasecmp(n->str, "shape") == 0) { + if (rnd_strcasecmp(n->str, "shape") == 0) { pcb_pstk_shape_t shp; pcb_layer_type_t lyt; @@ -763,7 +763,7 @@ dsn_pstk_set_shape(prt, lyt, &shp, n); } - else if (pcb_strcasecmp(n->str, "hole") == 0) { + else if (rnd_strcasecmp(n->str, "hole") == 0) { pcb_pstk_shape_t shp; if (has_hole) { @@ -781,15 +781,15 @@ has_hole = 1; } } - else if (pcb_strcasecmp(n->str, "antipad") == 0) { + else if (rnd_strcasecmp(n->str, "antipad") == 0) { /* silently not supported */ } - else if (pcb_strcasecmp(n->str, "plating") == 0) { + else if (rnd_strcasecmp(n->str, "plating") == 0) { if (dsn_parse_pstk_shape_plating(ctx, n, prt) != 0) goto err; } - else if ((pcb_strcasecmp(n->str, "rotate") == 0) || (pcb_strcasecmp(n->str, "absolute") == 0)) { - if (pcb_strcasecmp(STRE(n->children), "off") == 0) { + else if ((rnd_strcasecmp(n->str, "rotate") == 0) || (rnd_strcasecmp(n->str, "absolute") == 0)) { + if (rnd_strcasecmp(STRE(n->children), "off") == 0) { rnd_message(PCB_MSG_WARNING, "unhandled padstack flag %s (at %ld:%ld) - this property will be ignored\n", n->str, (long)n->line, (long)n->col); } } @@ -887,7 +887,7 @@ DSN_LOAD_COORDS_FMT(crd, ncoord, "XY", goto err_coord); nrot = ncoord->next->next; - if ((nrot != NULL) && (nrot->str != NULL) && (pcb_strcasecmp(nrot->str, "rotate") == 0)) { + if ((nrot != NULL) && (nrot->str != NULL) && (rnd_strcasecmp(nrot->str, "rotate") == 0)) { char *end; rotang = strtod(STRE(nrot->children), &end); if (*end != '\0') { @@ -1000,39 +1000,39 @@ for(imr = imr->children->next; imr != NULL; imr = imr->next) { if (imr->str == NULL) continue; - if (pcb_strcasecmp(imr->str, "outline") == 0) { + if (rnd_strcasecmp(imr->str, "outline") == 0) { if (dsn_parse_img_outline(ctx, imr, subc) != 0) return -1; } - else if (pcb_strcasecmp(imr->str, "pin") == 0) { + else if (rnd_strcasecmp(imr->str, "pin") == 0) { if (dsn_parse_img_pin(ctx, imr, subc) != 0) return -1; } - else if (pcb_strcasecmp(imr->str, "conductor") == 0) { + else if (rnd_strcasecmp(imr->str, "conductor") == 0) { if (dsn_parse_img_conductor(ctx, imr, subc) != 0) return -1; } - else if (pcb_strcasecmp(imr->str, "via") == 0) { + else if (rnd_strcasecmp(imr->str, "via") == 0) { if (dsn_parse_img_via(ctx, imr, subc) != 0) return -1; } - else if (pcb_strcasecmp(imr->str, "keepout") == 0) { + else if (rnd_strcasecmp(imr->str, "keepout") == 0) { if (dsn_parse_img_keepout(ctx, imr, "all", subc) != 0) return -1; } - else if (pcb_strcasecmp(imr->str, "wire_keepout") == 0) { + else if (rnd_strcasecmp(imr->str, "wire_keepout") == 0) { if (dsn_parse_img_keepout(ctx, imr, "copper", subc) != 0) return -1; } - else if (pcb_strcasecmp(imr->str, "place_keepout") == 0) { + else if (rnd_strcasecmp(imr->str, "place_keepout") == 0) { if (dsn_parse_img_keepout(ctx, imr, "subc", subc) != 0) return -1; } - else if (pcb_strcasecmp(imr->str, "via_keepout") == 0) { + else if (rnd_strcasecmp(imr->str, "via_keepout") == 0) { if (dsn_parse_img_keepout(ctx, imr, "via", subc) != 0) return -1; } - else if (pcb_strcasecmp(imr->str, "property") == 0) { + else if (rnd_strcasecmp(imr->str, "property") == 0) { if (dsn_parse_img_property(ctx, imr, subc) != 0) return -1; } @@ -1055,7 +1055,7 @@ old_unit = dsn_set_old_unit(ctx, wrr->children); for(n = wrr->children; n != NULL; n = n->next) { - if ((n->str != NULL) && (pcb_strcasecmp(n->str, "padstack") == 0)) { + if ((n->str != NULL) && (rnd_strcasecmp(n->str, "padstack") == 0)) { if (dsn_parse_lib_padstack(ctx, n) != 0) return -1; } @@ -1064,11 +1064,11 @@ for(n = wrr->children; n != NULL; n = n->next) { if (n->str == NULL) continue; - if (pcb_strcasecmp(n->str, "image") == 0) { + if (rnd_strcasecmp(n->str, "image") == 0) { if (dsn_parse_lib_image(ctx, n) != 0) return -1; } - else if ((pcb_strcasecmp(n->str, "jumper") == 0) || (pcb_strcasecmp(n->str, "via_array_template") == 0) || (pcb_strcasecmp(n->str, "directory") == 0)) { + else if ((rnd_strcasecmp(n->str, "jumper") == 0) || (rnd_strcasecmp(n->str, "via_array_template") == 0) || (rnd_strcasecmp(n->str, "directory") == 0)) { rnd_message(PCB_MSG_WARNING, "unhandled library item %s (at %ld:%ld) - please send the dsn file as a bugreport\n", n->str, (long)n->line, (long)n->col); } } @@ -1175,8 +1175,8 @@ pcb_polo_offs((double)aper / dv, p, len); for(n = 0; n < len; n++) { - poly->Points[n].X = pcb_round(p[n].x); - poly->Points[n].Y = pcb_round(p[n].y); + poly->Points[n].X = rnd_round(p[n].x); + poly->Points[n].Y = rnd_round(p[n].y); } free(p); } @@ -1221,7 +1221,7 @@ } n = net->next; - r = pcb_round((double)COORD(ctx, n) / 2.0); + r = rnd_round((double)COORD(ctx, n) / 2.0); n = n->next; if (n != NULL) DSN_LOAD_COORDS_FMT(cent, n, (subc == NULL) ? "xy" : "XY", goto err_cent); @@ -1231,8 +1231,8 @@ for(a = 0; a < 2*M_PI; a += astep) { rnd_coord_t x, y; - x = pcb_round(cos(a) * (double)r + (double)cent[0]); - y = pcb_round(sin(a) * (double)r + (double)cent[1]); + x = rnd_round(cos(a) * (double)r + (double)cent[0]); + y = rnd_round(sin(a) * (double)r + (double)cent[1]); pcb_poly_point_new(poly, x, y); } pcb_add_poly_on_layer(ly, poly); @@ -1352,13 +1352,13 @@ for(wrr = wrr->children; wrr != NULL; wrr = wrr->next) { if (wrr->str == NULL) continue; - if (pcb_strcasecmp(wrr->str, "type")) { } - else if (pcb_strcasecmp(wrr->str, "attr") == 0) { } - else if (pcb_strcasecmp(wrr->str, "net") == 0) { } - else if (pcb_strcasecmp(wrr->str, "turret") == 0) { } - else if (pcb_strcasecmp(wrr->str, "shield") == 0) { } - else if (pcb_strcasecmp(wrr->str, "connect") == 0) { } - else if (pcb_strcasecmp(wrr->str, "supply") == 0) { } + if (rnd_strcasecmp(wrr->str, "type")) { } + else if (rnd_strcasecmp(wrr->str, "attr") == 0) { } + else if (rnd_strcasecmp(wrr->str, "net") == 0) { } + else if (rnd_strcasecmp(wrr->str, "turret") == 0) { } + else if (rnd_strcasecmp(wrr->str, "shield") == 0) { } + else if (rnd_strcasecmp(wrr->str, "connect") == 0) { } + else if (rnd_strcasecmp(wrr->str, "supply") == 0) { } } */ @@ -1366,23 +1366,23 @@ for(wrr = wrr->children; wrr != NULL; wrr = wrr->next) { if (wrr->str == NULL) continue; - if ((pcb_strcasecmp(wrr->str, "polygon") == 0) || (pcb_strcasecmp(wrr->str, "poly") == 0)) { + if ((rnd_strcasecmp(wrr->str, "polygon") == 0) || (rnd_strcasecmp(wrr->str, "poly") == 0)) { if (dsn_parse_wire_poly(ctx, wrr, subc, force_ly) != 0) return -1; } - else if (pcb_strcasecmp(wrr->str, "path") == 0) { + else if (rnd_strcasecmp(wrr->str, "path") == 0) { if (dsn_parse_wire_path(ctx, wrr, subc, force_ly) != 0) return -1; } - else if (pcb_strcasecmp(wrr->str, "qarc") == 0) { + else if (rnd_strcasecmp(wrr->str, "qarc") == 0) { if (dsn_parse_wire_qarc(ctx, wrr, subc, force_ly) != 0) return -1; } - else if (pcb_strcasecmp(wrr->str, "rect") == 0) { + else if (rnd_strcasecmp(wrr->str, "rect") == 0) { if (dsn_parse_wire_rect(ctx, wrr, subc, force_ly) != 0) return -1; } - else if (pcb_strcasecmp(wrr->str, "circle") == 0) { + else if (rnd_strcasecmp(wrr->str, "circle") == 0) { if (dsn_parse_wire_circle(ctx, wrr, subc, force_ly) != 0) return -1; } @@ -1435,10 +1435,10 @@ rnd_message(PCB_MSG_ERROR, "Testpoint without side (at %ld:%ld)\n", (long)tnd->line, (long)tnd->col); return -1; } - if (pcb_strcasecmp(side->str, "front") == 0) { + if (rnd_strcasecmp(side->str, "front") == 0) { back = 0; } - else if (pcb_strcasecmp(side->str, "back") == 0) { + else if (rnd_strcasecmp(side->str, "back") == 0) { back = 1; } else { @@ -1467,7 +1467,7 @@ shp->layer_mask = PCB_LYT_TOP | PCB_LYT_MASK; shp->comb = PCB_LYC_SUB | PCB_LYC_AUTO; shp->shape = PCB_PSSH_CIRC; - shp->data.circ.dia = pcb_round((double)conf_core.design.min_wid * 1.05); + shp->data.circ.dia = rnd_round((double)conf_core.design.min_wid * 1.05); ctx->testpoint = pcb_pstk_proto_insert_dup(ctx->pcb->Data, &tpp, 1, 0); ctx->has_testpoint = 1; @@ -1499,19 +1499,19 @@ for(wrr = wrr->children; wrr != NULL; wrr = wrr->next) { if (wrr->str == NULL) continue; - if (pcb_strcasecmp(wrr->str, "wire") == 0) { + if (rnd_strcasecmp(wrr->str, "wire") == 0) { if (dsn_parse_wire(ctx, wrr, NULL, NULL) != 0) return -1; } - else if (pcb_strcasecmp(wrr->str, "via") == 0) { + else if (rnd_strcasecmp(wrr->str, "via") == 0) { if (dsn_parse_via(ctx, wrr) != 0) return -1; } - else if (pcb_strcasecmp(wrr->str, "point") == 0) { + else if (rnd_strcasecmp(wrr->str, "point") == 0) { if (dsn_parse_point(ctx, wrr) != 0) return -1; } - else if ((pcb_strcasecmp(wrr->str, "bond") == 0) || (pcb_strcasecmp(wrr->str, "supply_pin") == 0)) { + else if ((rnd_strcasecmp(wrr->str, "bond") == 0) || (rnd_strcasecmp(wrr->str, "supply_pin") == 0)) { rnd_message(PCB_MSG_WARNING, "unhandled wiring: '%s' (at %ld:%ld) - please send the dsn file as a bugreport\n", wrr->str, (long)wrr->line, (long)wrr->col); } } @@ -1549,9 +1549,9 @@ rnd_message(PCB_MSG_ERROR, "Invalid placement side (at %ld:%ld)\n", (long)n->line, (long)n->col); return -1; } - if (pcb_strcasecmp(side->str, "front") == 0) + if (rnd_strcasecmp(side->str, "front") == 0) need_mirror = 0; - else if (pcb_strcasecmp(side->str, "back") == 0) + else if (rnd_strcasecmp(side->str, "back") == 0) need_mirror = 1; else { rnd_message(PCB_MSG_ERROR, "Invalid placement side '%s' (at %ld:%ld)\n", side->str, (long)n->line, (long)n->col); @@ -1597,17 +1597,17 @@ for(plr = plr->children; plr != NULL; plr = plr->next) { if (plr->str == NULL) continue; - if (pcb_strcasecmp(plr->str, "place_control") == 0) { - if (pcb_strcasecmp(STRE(plr->children), "flip_style") == 0) { - if (pcb_strcasecmp(STRE(plr->children->children), "mirror_first") == 0) + if (rnd_strcasecmp(plr->str, "place_control") == 0) { + if (rnd_strcasecmp(STRE(plr->children), "flip_style") == 0) { + if (rnd_strcasecmp(STRE(plr->children->children), "mirror_first") == 0) mirror_first = 1; - else if (pcb_strcasecmp(STRE(plr->children->children), "mirror_first") == 0) + else if (rnd_strcasecmp(STRE(plr->children->children), "mirror_first") == 0) mirror_first = 0; else rnd_message(PCB_MSG_WARNING, "invalid flip_style: '%s' (at %ld:%ld) - subcircuits may be misplaced - please send the dsn file as a bugreport\n", STRE(plr->children->children), (long)plr->line, (long)plr->col); } } - else if (pcb_strcasecmp(plr->str, "component") == 0) { + else if (rnd_strcasecmp(plr->str, "component") == 0) { if (dsn_parse_place_component(ctx, plr, mirror_first) != 0) return -1; } @@ -1636,12 +1636,12 @@ for(nwr = nwr->children->next; nwr != NULL; nwr = nwr->next) { if (nwr->str == NULL) continue; - if (pcb_strcasecmp(nwr->str, "pins") == 0) { + if (rnd_strcasecmp(nwr->str, "pins") == 0) { gsxl_node_t *n; for(n = nwr->children; n != NULL; n = n->next) rnd_actionva(&ctx->pcb->hidlib, "Netlist", "Add", netname, n->str, NULL); } - else if (pcb_strcasecmp(nwr->str, "property") == 0) { + else if (rnd_strcasecmp(nwr->str, "property") == 0) { parse_attribute(ctx, &net->Attributes, nwr->children); } } @@ -1657,7 +1657,7 @@ for(nwr = nwr->children; nwr != NULL; nwr = nwr->next) { if (nwr->str == NULL) continue; - if (pcb_strcasecmp(nwr->str, "net") == 0) { + if (rnd_strcasecmp(nwr->str, "net") == 0) { if (dsn_parse_net(ctx, nwr) != 0) return -1; } @@ -1679,7 +1679,7 @@ ctx->unit = get_unit_struct("inch"); free(ctx->pcb->hidlib.name); - ctx->pcb->hidlib.name = pcb_strdup(STRE(root->children)); + ctx->pcb->hidlib.name = rnd_strdup(STRE(root->children)); for(n = root->children->next; n != NULL; n = n->next) { if (n->str == NULL) @@ -1840,7 +1840,7 @@ gsxl_compact_tree(&rdctx.dom); rn = rdctx.dom.root; - if ((rn == NULL) || (rn->str == NULL) || (pcb_strcasecmp(rn->str, "pcb") != 0)) { + if ((rn == NULL) || (rn->str == NULL) || (rnd_strcasecmp(rn->str, "pcb") != 0)) { rnd_message(PCB_MSG_ERROR, "Root node should be pcb, got %s instead\n", rn->str); goto error; } Index: trunk/src_plugins/io_eagle/egb_tree.c =================================================================== --- trunk/src_plugins/io_eagle/egb_tree.c (revision 30941) +++ trunk/src_plugins/io_eagle/egb_tree.c (revision 30942) @@ -63,7 +63,7 @@ { if (node->props.table == NULL) htss_init(&node->props, strhash, strkeyeq); - htss_set(&node->props, pcb_strdup(key), pcb_strdup(val)); + htss_set(&node->props, rnd_strdup(key), rnd_strdup(val)); } char *egb_node_prop_get(egb_node_t *node, const char *key) Index: trunk/src_plugins/io_eagle/read.c =================================================================== --- trunk/src_plugins/io_eagle/read.c (revision 30941) +++ trunk/src_plugins/io_eagle/read.c (revision 30942) @@ -676,8 +676,8 @@ nx = -sidey / sidelen; ny = sidex / sidelen; r = (sidelen / 2) / tan(curvang / PCB_RAD_TO_DEG / 2.0); - cx = pcb_round(midx + nx * r); - cy = pcb_round(midy + ny * r); + cx = rnd_round(midx + nx * r); + cy = rnd_round(midy + ny * r); /* pcb_trace("curve mid: %mm;%mm center: %mm;%mm\n", midx, midy, cx, cy);*/ dx = x1 - cx; Index: trunk/src_plugins/io_hyp/hyp_l.c =================================================================== --- trunk/src_plugins/io_hyp/hyp_l.c (revision 30941) +++ trunk/src_plugins/io_hyp/hyp_l.c (revision 30942) @@ -2205,7 +2205,7 @@ #line 28 "hyp_l.l" #include -char *pcb_strdup(const char *s); /* from #include */ +char *rnd_strdup(const char *s); /* from #include */ #include "hyp_y.h" @@ -3492,7 +3492,7 @@ case 127: YY_RULE_SETUP #line 328 "hyp_l.l" -{ yyless(0); BEGIN INITIAL; hyylval.strval = pcb_strdup(""); return H_STRING; } /* emit empty string and reprocess */ +{ yyless(0); BEGIN INITIAL; hyylval.strval = rnd_strdup(""); return H_STRING; } /* emit empty string and reprocess */ YY_BREAK case 128: YY_RULE_SETUP @@ -3506,7 +3506,7 @@ REJECT else { - char *s = pcb_strdup(hyytext); + char *s = rnd_strdup(hyytext); BEGIN INITIAL; @@ -3573,7 +3573,7 @@ else { BEGIN INITIAL; - hyylval.strval = pcb_strdup(hyytext); + hyylval.strval = rnd_strdup(hyytext); return H_STRING; } } Index: trunk/src_plugins/io_hyp/hyp_l.l =================================================================== --- trunk/src_plugins/io_hyp/hyp_l.l (revision 30941) +++ trunk/src_plugins/io_hyp/hyp_l.l (revision 30942) @@ -27,7 +27,7 @@ %{ #include -char *pcb_strdup(const char *s); /* from #include */ +char *rnd_strdup(const char *s); /* from #include */ #include "hyp_y.h" @@ -324,7 +324,7 @@ */ { -{EMPTY_STRING} { yyless(0); BEGIN INITIAL; hyylval.strval = pcb_strdup(""); return H_STRING; } /* emit empty string and reprocess */ +{EMPTY_STRING} { yyless(0); BEGIN INITIAL; hyylval.strval = rnd_strdup(""); return H_STRING; } /* emit empty string and reprocess */ {STRING_W_SPACES} { /* @@ -335,7 +335,7 @@ REJECT else { - char *s = pcb_strdup(hyytext); + char *s = rnd_strdup(hyytext); BEGIN INITIAL; @@ -382,7 +382,7 @@ else { BEGIN INITIAL; - hyylval.strval = pcb_strdup(hyytext); + hyylval.strval = rnd_strdup(hyytext); return H_STRING; } } Index: trunk/src_plugins/io_hyp/parser.c =================================================================== --- trunk/src_plugins/io_hyp/parser.c (revision 30941) +++ trunk/src_plugins/io_hyp/parser.c (revision 30942) @@ -1029,7 +1029,7 @@ rnd_message(PCB_MSG_ERROR, "error: negative arc precision\n"); /* A full circle is drawn using 'segments' segments; a 90 degree arc using segments/4. */ - poly_points = pcb_round(segments * fabs(beta - alpha) / (2 * M_PI)); + poly_points = rnd_round(segments * fabs(beta - alpha) / (2 * M_PI)); /* Sanity checks */ if (poly_points < 1) @@ -1621,25 +1621,25 @@ /* add device to list */ new_device = calloc(sizeof(device_t), 1); - new_device->ref = pcb_strdup(h->ref); + new_device->ref = rnd_strdup(h->ref); new_device->name = NULL; if (h->name_set) - new_device->name = pcb_strdup(h->name); + new_device->name = rnd_strdup(h->name); new_device->value = NULL; if (h->value_string_set) - new_device->value = pcb_strdup(h->value_string); + new_device->value = rnd_strdup(h->value_string); else if (h->value_float_set) { /* convert double to string */ pcb_snprintf(value, sizeof(value), "%f", h->value_float); - new_device->value = pcb_strdup(value); + new_device->value = rnd_strdup(value); } new_device->layer_name = NULL; if (h->layer_name_set) - new_device->layer_name = pcb_strdup(h->layer_name); + new_device->layer_name = rnd_strdup(h->layer_name); new_device->next = device_head; device_head = new_device; @@ -1730,7 +1730,7 @@ current_pstk = malloc(sizeof(padstack_t)); if (current_pstk == NULL) return 1; /*malloc failed */ - current_pstk->name = pcb_strdup(h->padstack_name); + current_pstk->name = rnd_strdup(h->padstack_name); current_pstk->drill_size = xy2coord(h->drill_size); current_pstk_element = malloc(sizeof(padstack_element_t)); current_pstk->padstack = current_pstk_element; @@ -1745,7 +1745,7 @@ /* fill in values */ - current_pstk_element->layer_name = pcb_strdup(h->layer_name); + current_pstk_element->layer_name = rnd_strdup(h->layer_name); current_pstk_element->pad_shape = h->pad_shape; current_pstk_element->pad_sx = xy2coord(h->pad_sx); current_pstk_element->pad_sy = xy2coord(h->pad_sy); @@ -1893,11 +1893,11 @@ if (ref != NULL) { char *dot; /* reference has format 'device_name.pin_name' */ - device_name = pcb_strdup(ref); + device_name = rnd_strdup(ref); dot = strrchr(device_name, '.'); if (dot != NULL) { *dot = '\0'; - pin_name = pcb_strdup(dot + 1); + pin_name = rnd_strdup(dot + 1); } /* make sure device and pin name have valid values, even if reference has wrong format */ @@ -1943,7 +1943,7 @@ if (hyp_debug) rnd_message(PCB_MSG_DEBUG, "net: net_name = \"%s\"\n", h->net_name); - net_name = pcb_strdup(h->net_name); + net_name = rnd_strdup(h->net_name); net_clearance = -1; return 0; Index: trunk/src_plugins/io_hyp/write.c =================================================================== --- trunk/src_plugins/io_hyp/write.c (revision 30941) +++ trunk/src_plugins/io_hyp/write.c (revision 30942) @@ -94,7 +94,7 @@ if (dup) name = pcb_strdup_printf("%s___%d", name, n); else - name = pcb_strdup(name); + name = rnd_strdup(name); htpp_set(&wr->grp_names, grp, (char *)name); } return name; @@ -129,7 +129,7 @@ { char dt[128]; - pcb_print_utc(dt, sizeof(dt), 0); + rnd_print_utc(dt, sizeof(dt), 0); fprintf(wr->f, "* %s exported by pcb-rnd " PCB_VERSION " (" PCB_REVISION ") on %s\n", wr->pcb->hidlib.filename, dt); fprintf(wr->f, "* Board: %s\n", wr->pcb->hidlib.name); Index: trunk/src_plugins/io_kicad/read.c =================================================================== --- trunk/src_plugins/io_kicad/read.c (revision 30941) +++ trunk/src_plugins/io_kicad/read.c (revision 30942) @@ -235,7 +235,7 @@ { pcb_layer_id_t id; id = pcb_layer_create(st->pcb, gid, lname, 0); - htsi_set(&st->layer_k2i, pcb_strdup(lname), id); + htsi_set(&st->layer_k2i, rnd_strdup(lname), id); if (ltype != NULL) { pcb_layer_t *ly = pcb_get_layer(st->pcb->Data, id); rnd_attribute_put(&ly->Attributes, "kicad::type", ltype); @@ -334,7 +334,7 @@ if (best == NULL) { kicad_warning(subtree, "unknown layer: %d %s %s\n", lnum, lname, ltype); remember_bad:; /* HACK/WORKAROUND: remember kicad layers for those that are unsupported */ - htsi_set(&st->layer_k2i, pcb_strdup(lname), -lnum); + htsi_set(&st->layer_k2i, rnd_strdup(lname), -lnum); return 0; } @@ -349,7 +349,7 @@ case LYACT_NEW_MISC: grp = pcb_get_grp_new_misc(st->pcb); - grp->name = pcb_strdup(lname); + grp->name = rnd_strdup(lname); grp->ltype = best->type; lid = pcb_layer_create(st->pcb, grp - st->pcb->LayerGroups.grp, lname, 0); new_grp = grp; @@ -372,9 +372,9 @@ ly->comb |= best->lyc; if ((new_grp != NULL) && (best->purpose != NULL)) - new_grp->purpose = pcb_strdup(best->purpose); + new_grp->purpose = rnd_strdup(best->purpose); - htsi_set(&st->layer_k2i, pcb_strdup(lname), lid); + htsi_set(&st->layer_k2i, rnd_strdup(lname), lid); return 0; } @@ -405,7 +405,7 @@ if (mask & PCB_LYT_MASK) ly->comb |= PCB_LYC_SUB; } - htsi_set(&st->layer_k2i, pcb_strdup(kicad_name), id); + htsi_set(&st->layer_k2i, rnd_strdup(kicad_name), id); return 0; } @@ -421,7 +421,7 @@ /* Workaround: specal case InX.Cu, where X is an integer */ char *end; long id = strtol(kicad_name + 2, &end, 10); - if ((pcb_strcasecmp(end, ".Cu") == 0) && (id >= 1) && (id <= 30)) { + if ((rnd_strcasecmp(end, ".Cu") == 0) && (id >= 1) && (id <= 30)) { if (kicad_reg_layer(st, kicad_name, PCB_LYT_COPPER | PCB_LYT_INTERN, NULL) == 0) return kicad_get_layeridx(st, kicad_name); } @@ -445,13 +445,13 @@ TODO("for In, also remember the offset"); TODO("this should use the layertab instead"); - if (pcb_strcasecmp(kicad_name, "Edge.Cuts") == 0) { lyt |= PCB_LYT_BOUNDARY; purpose = "uroute"; } + if (rnd_strcasecmp(kicad_name, "Edge.Cuts") == 0) { lyt |= PCB_LYT_BOUNDARY; purpose = "uroute"; } else if (kicad_name[1] == '.') { const char *ln = kicad_name + 2; - if (pcb_strcasecmp(ln, "SilkS") == 0) lyt |= PCB_LYT_SILK; - else if (pcb_strcasecmp(ln, "Mask") == 0) lyt |= PCB_LYT_MASK; - else if (pcb_strcasecmp(ln, "Paste") == 0) lyt |= PCB_LYT_PASTE; - else if (pcb_strcasecmp(ln, "Cu") == 0) lyt |= PCB_LYT_COPPER; + if (rnd_strcasecmp(ln, "SilkS") == 0) lyt |= PCB_LYT_SILK; + else if (rnd_strcasecmp(ln, "Mask") == 0) lyt |= PCB_LYT_MASK; + else if (rnd_strcasecmp(ln, "Paste") == 0) lyt |= PCB_LYT_PASTE; + else if (rnd_strcasecmp(ln, "Cu") == 0) lyt |= PCB_LYT_COPPER; else lyt |= PCB_LYT_VIRTUAL; } else lyt |= PCB_LYT_VIRTUAL; @@ -675,7 +675,7 @@ do { \ double __dtmp__; \ PARSE_DOUBLE(__dtmp__, missnode, node, errmsg); \ - (res) = pcb_round(PCB_MM_TO_COORD(__dtmp__)); \ + (res) = rnd_round(PCB_MM_TO_COORD(__dtmp__)); \ } while(0) \ /* parse nd->str into a pcb_layer_t in ly, either as a subc layer or if subc @@ -2521,7 +2521,7 @@ if ((mod_rot == 90) || (mod_rot == 180) || (mod_rot == 270)) { /* lossles module rotation for round steps */ - mod_rot = pcb_round(mod_rot / 90); + mod_rot = rnd_round(mod_rot / 90); pcb_subc_rotate90(subc, mod_x, mod_y, mod_rot); } else if (mod_rot != 0) Index: trunk/src_plugins/io_kicad/uniq_name.c =================================================================== --- trunk/src_plugins/io_kicad/uniq_name.c (revision 30941) +++ trunk/src_plugins/io_kicad/uniq_name.c (revision 30942) @@ -36,7 +36,7 @@ if ((orig_name == NULL) || (*orig_name == '\0')) { if (!htsp_has(&state->seen, (char *)state->unnamed)) { - name = pcb_strdup(state->unnamed); + name = rnd_strdup(state->unnamed); htsp_set(&state->seen, name, user_data); return name; } @@ -46,7 +46,7 @@ } else { if (!htsp_has(&state->seen, (char *)orig_name)) { - name = pcb_strdup(orig_name); + name = rnd_strdup(orig_name); htsp_set(&state->seen, name, user_data); return name; } Index: trunk/src_plugins/io_lihata/read.c =================================================================== --- trunk/src_plugins/io_lihata/read.c (revision 30941) +++ trunk/src_plugins/io_lihata/read.c (revision 30942) @@ -166,7 +166,7 @@ return -1; if (nd->type != LHT_TEXT) return iolht_error(nd, "expected a text node\n"); - *res = pcb_strdup(nd->data.text.value); + *res = rnd_strdup(nd->data.text.value); return 0; } @@ -357,14 +357,14 @@ *end = '\0'; - if ((strcmp(val, "1") == 0) || (pcb_strcasecmp(val, "on") == 0) || - (pcb_strcasecmp(val, "true") == 0) || (pcb_strcasecmp(val, "yes") == 0)) { + if ((strcmp(val, "1") == 0) || (rnd_strcasecmp(val, "on") == 0) || + (rnd_strcasecmp(val, "true") == 0) || (rnd_strcasecmp(val, "yes") == 0)) { *res = 1; return 0; } - if ((strcmp(val, "0") == 0) || (pcb_strcasecmp(val, "off") == 0) || - (pcb_strcasecmp(val, "false") == 0) || (pcb_strcasecmp(val, "no") == 0)) { + if ((strcmp(val, "0") == 0) || (rnd_strcasecmp(val, "off") == 0) || + (rnd_strcasecmp(val, "false") == 0) || (rnd_strcasecmp(val, "no") == 0)) { *res = 0; return 0; } @@ -954,17 +954,17 @@ if (bound) { const char *prp; ly->is_bound = 1; - ly->name = pcb_strdup(grp->name); + ly->name = rnd_strdup(grp->name); parse_int(&dt->Layer[layer_id].meta.bound.stack_offs, lht_dom_hash_get(grp, "stack_offs")); parse_layer_type(&dt->Layer[layer_id].meta.bound.type, &prp, lht_dom_hash_get(grp, "type"), "bound layer"); if (npurp != NULL) { /* use the explicit purpose if it is set */ if (npurp->type == LHT_TEXT) - dt->Layer[layer_id].meta.bound.purpose = pcb_strdup(npurp->data.text.value); + dt->Layer[layer_id].meta.bound.purpose = rnd_strdup(npurp->data.text.value); else iolht_warn(npurp, -1, "Layers purpose shall be text - ignoring this field\n"); } else if (prp != NULL) /* or the implicit one from parse_layer_type(), for old versions */ - dt->Layer[layer_id].meta.bound.purpose = pcb_strdup(prp); + dt->Layer[layer_id].meta.bound.purpose = rnd_strdup(prp); if (pcb != NULL) { dt->Layer[layer_id].meta.bound.real = pcb_layer_resolve_binding(pcb, &dt->Layer[layer_id]); @@ -979,7 +979,7 @@ else { /* real */ lht_node_t *nclr; - ly->name = pcb_strdup(grp->name); + ly->name = rnd_strdup(grp->name); nclr = hash_get(grp, "color", 1); if ((nclr != NULL) && (nclr->type != LHT_INVALID_TYPE)) { if (rdver < 5) @@ -1572,7 +1572,7 @@ sprintf(g->name, "grp_%ld", gid); } else - g->name = pcb_strdup(name->data.text.value); + g->name = rnd_strdup(name->data.text.value); parse_layer_type(&g->ltype, &prp, lht_dom_hash_get(grp, "type"), g->name); if (rdver < 6) { @@ -1585,12 +1585,12 @@ if (rdver < 6) iolht_warn(grp, -1, "Layer groups could not have a purpose field before lihata v6 - still loading the purpose,\nbut it will be ignored by older versions of pcb-rnd.\n"); if (npurp->type == LHT_TEXT) - pcb_layergrp_set_purpose__(g, pcb_strdup(npurp->data.text.value), 0); + pcb_layergrp_set_purpose__(g, rnd_strdup(npurp->data.text.value), 0); else iolht_warn(npurp, -1, "Group purpose shall be text - ignoring this field\n"); } else if (prp != NULL) /* or the implicit one returned by parse_layer_type() */ - pcb_layergrp_set_purpose__(g, pcb_strdup(prp), 0); + pcb_layergrp_set_purpose__(g, rnd_strdup(prp), 0); /* load attributes */ nattr = lht_dom_hash_get(grp, "attributes"); @@ -1750,7 +1750,7 @@ n = lht_dom_hash_get(nproto, "name"); if (n != NULL) { - dst->name = pcb_strdup(n->data.text.value); + dst->name = rnd_strdup(n->data.text.value); if (rdver < 5) iolht_warn(n, 6, "lihata board before v5 did not support padstack prototype names\n"); } Index: trunk/src_plugins/io_lihata/write.c =================================================================== --- trunk/src_plugins/io_lihata/write.c (revision 30941) +++ trunk/src_plugins/io_lihata/write.c (revision 30942) @@ -92,7 +92,7 @@ { if (io_lihata_full_tree) { lht_node_t *n = lht_dom_node_alloc(LHT_TEXT, name); - n->data.text.value = pcb_strdup(""); + n->data.text.value = rnd_strdup(""); return n; } return dummy_node(name); @@ -107,7 +107,7 @@ field = lht_dom_node_alloc(LHT_TEXT, key); if (value != NULL) - field->data.text.value = pcb_strdup(value); + field->data.text.value = rnd_strdup(value); return field; } @@ -224,7 +224,7 @@ txt = lht_dom_node_alloc(LHT_TEXT, PCB->Data->Layer[layer].name); name = io_lihata_thermal_style_old(t); if (name != NULL) - txt->data.text.value = pcb_strdup(name); + txt->data.text.value = rnd_strdup(name); else txt->data.text.value = pcb_strdup_printf("%d", t); lht_dom_hash_put(lst, txt); Index: trunk/src_plugins/io_mentor_cell/read.c =================================================================== --- trunk/src_plugins/io_mentor_cell/read.c (revision 30941) +++ trunk/src_plugins/io_mentor_cell/read.c (revision 30942) @@ -578,7 +578,7 @@ tmp = find_nth(attr->first_child, "FONT", 0); if (tmp != NULL) { - if (pcb_strncasecmp(tmp->argv[1], "VeriBest Gerber ", 16) != 0) + if (rnd_strncasecmp(tmp->argv[1], "VeriBest Gerber ", 16) != 0) hkp_error(tmp, "Unknown font (%s). Text will be rendered, but it may not have a correct size.\n", tmp->argv[1]); font_id = strtol(tmp->argv[1]+16, &tmp_char, 10); if (*tmp_char != '\0') @@ -998,7 +998,7 @@ if (subc != NULL) { ly = pcb_subc_get_layer(subc, lyt, lyc, 1, name, (purpose != NULL)); if ((purpose != NULL) && (ly->meta.bound.purpose == NULL)) /* newly created bound layer */ - ly->meta.bound.purpose = pcb_strdup(purpose); + ly->meta.bound.purpose = rnd_strdup(purpose); } else { pcb_layer_id_t lid; @@ -1355,7 +1355,7 @@ int level; long lineno = 0; - tree->filename = pcb_strdup(fn); + tree->filename = rnd_strdup(fn); tree->curr = tree->root = calloc(sizeof(node_t), 1); gds_init(&vline); Index: trunk/src_plugins/io_pcb/attribs.c =================================================================== --- trunk/src_plugins/io_pcb/attribs.c (revision 30941) +++ trunk/src_plugins/io_pcb/attribs.c (revision 30942) @@ -115,7 +115,7 @@ if (nv == NULL) continue; if (nv->type == CFN_LIST) { - char *tmp = pcb_strdup(pcb->Attributes.List[n].value); + char *tmp = rnd_strdup(pcb->Attributes.List[n].value); char *next, *curr; for(curr = tmp; curr != NULL; curr = next) { next = strstr(curr, LISTSEP); Index: trunk/src_plugins/io_pcb/file.c =================================================================== --- trunk/src_plugins/io_pcb/file.c (revision 30941) +++ trunk/src_plugins/io_pcb/file.c (revision 30942) @@ -583,12 +583,12 @@ /* The old PCB format encodes some properties in layer names - have to alter the real layer name before save to get the same effect */ if (PCB_LAYER_IS_OUTLINE(lflg, purpi)) { - if (pcb_strcasecmp(name, "outline") == 0) + if (rnd_strcasecmp(name, "outline") == 0) return name; return "Outline"; } if (lflg & PCB_LYT_SILK) { - if (pcb_strcasecmp(name, "silk") == 0) + if (rnd_strcasecmp(name, "silk") == 0) return name; return "silk"; } @@ -866,7 +866,7 @@ if (pcb->Data->LayerN >= PCB_MAX_LAYER) return -1; lid = pcb->Data->LayerN; - pcb->Data->Layer[lid].name = pcb_strdup(name); + pcb->Data->Layer[lid].name = rnd_strdup(name); pcb->Data->Layer[lid].parent.data = pcb->Data; pcb->Data->Layer[lid].parent_type = PCB_PARENT_DATA; pcb->Data->Layer[lid].type = PCB_OBJ_LAYER; @@ -894,7 +894,7 @@ for(lid = 0; lid < PCB_MAX_LAYER; lid++) { if (pcb->Data->Layer[lid].meta.real.grp == 0) { free((char *)pcb->Data->Layer[lid].name); - pcb->Data->Layer[lid].name = pcb_strdup(name); + pcb->Data->Layer[lid].name = rnd_strdup(name); pcb->Data->Layer[lid].parent.data = pcb->Data; pcb->Data->Layer[lid].parent_type = PCB_PARENT_DATA; pcb->Data->Layer[lid].type = PCB_OBJ_LAYER; @@ -929,7 +929,7 @@ else { if (*pcb->Data->Layer[lid].name == '\0') { free((char *)pcb->Data->Layer[lid].name); - pcb->Data->Layer[lid].name = pcb_strdup("anonymous"); + pcb->Data->Layer[lid].name = rnd_strdup("anonymous"); } if (lid == 0) pcb_layergrp_list(PCB, PCB_LYT_TOP | PCB_LYT_COPPER, &gid, 1); Index: trunk/src_plugins/io_pcb/parse_l.c =================================================================== --- trunk/src_plugins/io_pcb/parse_l.c (revision 30941) +++ trunk/src_plugins/io_pcb/parse_l.c (revision 30942) @@ -1484,7 +1484,7 @@ case 47: YY_RULE_SETUP #line 160 "parse_l.l" -{ pcb_lval.integer = pcb_round (strtod (yytext, NULL)); return INTEGER; } +{ pcb_lval.integer = rnd_round(strtod (yytext, NULL)); return INTEGER; } YY_BREAK case 48: YY_RULE_SETUP @@ -2901,7 +2901,7 @@ /* printf("tag:%s=%s:\n", key,val); */ if (strcmp(key, "name") == 0) { free(yyFont->name); - yyFont->name = pcb_strdup(val); + yyFont->name = rnd_strdup(val); } } } Index: trunk/src_plugins/io_pcb/parse_l.l =================================================================== --- trunk/src_plugins/io_pcb/parse_l.l (revision 30941) +++ trunk/src_plugins/io_pcb/parse_l.l (revision 30942) @@ -156,7 +156,7 @@ return(CHAR_CONST); } {FLOATING} { return parse_number(); } -{INTEGER} { pcb_lval.integer = pcb_round (strtod (yytext, NULL)); return INTEGER; } +{INTEGER} { pcb_lval.integer = rnd_round(strtod (yytext, NULL)); return INTEGER; } {HEX} { unsigned n; sscanf((char *) yytext, "%x", &n); @@ -518,7 +518,7 @@ /* printf("tag:%s=%s:\n", key,val); */ if (strcmp(key, "name") == 0) { free(yyFont->name); - yyFont->name = pcb_strdup(val); + yyFont->name = rnd_strdup(val); } } } Index: trunk/src_plugins/io_pcb/parse_y.c =================================================================== --- trunk/src_plugins/io_pcb/parse_y.c (revision 30941) +++ trunk/src_plugins/io_pcb/parse_y.c (revision 30942) @@ -1894,13 +1894,13 @@ if (yyElemFixLayers) { yyData->LayerN = 2; free((char *)yyData->Layer[0].name); - yyData->Layer[0].name = pcb_strdup("top-silk"); + yyData->Layer[0].name = rnd_strdup("top-silk"); yyData->Layer[0].parent_type = PCB_PARENT_DATA; yyData->Layer[0].parent.data = yyData; yyData->Layer[0].is_bound = 1; yyData->Layer[0].meta.bound.type = PCB_LYT_SILK | PCB_LYT_TOP; free((char *)yyData->Layer[1].name); - yyData->Layer[1].name = pcb_strdup("bottom-silk"); + yyData->Layer[1].name = rnd_strdup("bottom-silk"); yyData->Layer[1].parent_type = PCB_PARENT_DATA; yyData->Layer[1].parent.data = yyData; yyData->Layer[1].is_bound = 1; @@ -3297,7 +3297,7 @@ do_measure (PLMeasure *m, rnd_coord_t i, double d, int u) { m->ival = i; - m->bval = pcb_round (d); + m->bval = rnd_round(d); m->dval = d; m->has_units = u; } @@ -3317,7 +3317,7 @@ return m.bval; if (m.ival != 0) pcb_io_pcb_usty_seen |= PCB_USTY_CMIL; /* ... because we can't save in mil */ - return pcb_round (PCB_MIL_TO_COORD (m.ival)); + return rnd_round(PCB_MIL_TO_COORD (m.ival)); } static rnd_coord_t @@ -3328,7 +3328,7 @@ if (m.dval != 0) pcb_io_pcb_usty_seen |= PCB_USTY_CMIL; /* if there's no unit m.dval already contains the converted value */ - return pcb_round (m.dval); + return rnd_round(m.dval); } /* This converts old flag bits (from saved PCB files) to new format. */ Index: trunk/src_plugins/io_pcb/parse_y.y =================================================================== --- trunk/src_plugins/io_pcb/parse_y.y (revision 30941) +++ trunk/src_plugins/io_pcb/parse_y.y (revision 30942) @@ -234,13 +234,13 @@ if (yyElemFixLayers) { yyData->LayerN = 2; free((char *)yyData->Layer[0].name); - yyData->Layer[0].name = pcb_strdup("top-silk"); + yyData->Layer[0].name = rnd_strdup("top-silk"); yyData->Layer[0].parent_type = PCB_PARENT_DATA; yyData->Layer[0].parent.data = yyData; yyData->Layer[0].is_bound = 1; yyData->Layer[0].meta.bound.type = PCB_LYT_SILK | PCB_LYT_TOP; free((char *)yyData->Layer[1].name); - yyData->Layer[1].name = pcb_strdup("bottom-silk"); + yyData->Layer[1].name = rnd_strdup("bottom-silk"); yyData->Layer[1].parent_type = PCB_PARENT_DATA; yyData->Layer[1].parent.data = yyData; yyData->Layer[1].is_bound = 1; @@ -1393,7 +1393,7 @@ do_measure (PLMeasure *m, rnd_coord_t i, double d, int u) { m->ival = i; - m->bval = pcb_round (d); + m->bval = rnd_round(d); m->dval = d; m->has_units = u; } @@ -1413,7 +1413,7 @@ return m.bval; if (m.ival != 0) pcb_io_pcb_usty_seen |= PCB_USTY_CMIL; /* ... because we can't save in mil */ - return pcb_round (PCB_MIL_TO_COORD (m.ival)); + return rnd_round(PCB_MIL_TO_COORD (m.ival)); } static rnd_coord_t @@ -1424,7 +1424,7 @@ if (m.dval != 0) pcb_io_pcb_usty_seen |= PCB_USTY_CMIL; /* if there's no unit m.dval already contains the converted value */ - return pcb_round (m.dval); + return rnd_round(m.dval); } /* This converts old flag bits (from saved PCB files) to new format. */ Index: trunk/src_plugins/io_tedax/footprint.c =================================================================== --- trunk/src_plugins/io_tedax/footprint.c (revision 30941) +++ trunk/src_plugins/io_tedax/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: trunk/src_plugins/io_tedax/io_tedax.c =================================================================== --- trunk/src_plugins/io_tedax/io_tedax.c (revision 30941) +++ trunk/src_plugins/io_tedax/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: trunk/src_plugins/io_tedax/parse.c =================================================================== --- trunk/src_plugins/io_tedax/parse.c (revision 30941) +++ trunk/src_plugins/io_tedax/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: trunk/src_plugins/io_tedax/stackup.c =================================================================== --- trunk/src_plugins/io_tedax/stackup.c (revision 30941) +++ trunk/src_plugins/io_tedax/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: trunk/src_plugins/io_tedax/tboard.c =================================================================== --- trunk/src_plugins/io_tedax/tboard.c (revision 30941) +++ trunk/src_plugins/io_tedax/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: trunk/src_plugins/io_tedax/tlayer.c =================================================================== --- trunk/src_plugins/io_tedax/tlayer.c (revision 30941) +++ trunk/src_plugins/io_tedax/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: trunk/src_plugins/io_tedax/tnetlist.c =================================================================== --- trunk/src_plugins/io_tedax/tnetlist.c (revision 30941) +++ trunk/src_plugins/io_tedax/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; Index: trunk/src_plugins/lib_compat_help/pstk_compat.c =================================================================== --- trunk/src_plugins/lib_compat_help/pstk_compat.c (revision 30941) +++ trunk/src_plugins/lib_compat_help/pstk_compat.c (revision 30942) @@ -46,28 +46,28 @@ pcb_poly_square_pin_factors(style, xm, ym); - dst->x[7] = x0 + pcb_round(rx * 0.5) * xm[7]; - dst->y[7] = y0 + pcb_round(ry * PCB_TAN_22_5_DEGREE_2) * ym[7]; - dst->x[6] = x0 + pcb_round(rx * PCB_TAN_22_5_DEGREE_2) * xm[6]; - dst->y[6] = y0 + pcb_round(ry * 0.5) * ym[6]; - dst->x[5] = x0 - pcb_round(rx * PCB_TAN_22_5_DEGREE_2) * xm[5]; - dst->y[5] = y0 + pcb_round(ry * 0.5) * ym[5]; - dst->x[4] = x0 - pcb_round(rx * 0.5) * xm[4]; - dst->y[4] = y0 + pcb_round(ry * PCB_TAN_22_5_DEGREE_2) * ym[4]; - dst->x[3] = x0 - pcb_round(rx * 0.5) * xm[3]; - dst->y[3] = y0 - pcb_round(ry * PCB_TAN_22_5_DEGREE_2) * ym[3]; - dst->x[2] = x0 - pcb_round(rx * PCB_TAN_22_5_DEGREE_2) * xm[2]; - dst->y[2] = y0 - pcb_round(ry * 0.5) * ym[2]; - dst->x[1] = x0 + pcb_round(rx * PCB_TAN_22_5_DEGREE_2) * xm[1]; - dst->y[1] = y0 - pcb_round(ry * 0.5) * ym[1]; - dst->x[0] = x0 + pcb_round(rx * 0.5) * xm[0]; - dst->y[0] = y0 - pcb_round(ry * PCB_TAN_22_5_DEGREE_2) * ym[0]; + dst->x[7] = x0 + rnd_round(rx * 0.5) * xm[7]; + dst->y[7] = y0 + rnd_round(ry * PCB_TAN_22_5_DEGREE_2) * ym[7]; + dst->x[6] = x0 + rnd_round(rx * PCB_TAN_22_5_DEGREE_2) * xm[6]; + dst->y[6] = y0 + rnd_round(ry * 0.5) * ym[6]; + dst->x[5] = x0 - rnd_round(rx * PCB_TAN_22_5_DEGREE_2) * xm[5]; + dst->y[5] = y0 + rnd_round(ry * 0.5) * ym[5]; + dst->x[4] = x0 - rnd_round(rx * 0.5) * xm[4]; + dst->y[4] = y0 + rnd_round(ry * PCB_TAN_22_5_DEGREE_2) * ym[4]; + dst->x[3] = x0 - rnd_round(rx * 0.5) * xm[3]; + dst->y[3] = y0 - rnd_round(ry * PCB_TAN_22_5_DEGREE_2) * ym[3]; + dst->x[2] = x0 - rnd_round(rx * PCB_TAN_22_5_DEGREE_2) * xm[2]; + dst->y[2] = y0 - rnd_round(ry * 0.5) * ym[2]; + dst->x[1] = x0 + rnd_round(rx * PCB_TAN_22_5_DEGREE_2) * xm[1]; + dst->y[1] = y0 - rnd_round(ry * 0.5) * ym[1]; + dst->x[0] = x0 + rnd_round(rx * 0.5) * xm[0]; + dst->y[0] = y0 - rnd_round(ry * PCB_TAN_22_5_DEGREE_2) * ym[0]; } /* emulate the old 'square flag' feature */ static void square_shape(pcb_pstk_poly_t *dst, rnd_coord_t x0, rnd_coord_t y0, rnd_coord_t radius, int style) { - rnd_coord_t r2 = pcb_round(radius * 0.5); + rnd_coord_t r2 = rnd_round(radius * 0.5); pcb_pstk_shape_alloc_poly(dst, 4); @@ -126,7 +126,7 @@ /* in PCB hole means unplated with clearance; emulate this by placing a zero diameter copper circle on all layers and set clearance large enough to cover the hole too */ - clearance = pcb_round((double)clearance + (double)drill_dia/2.0); + clearance = rnd_round((double)clearance + (double)drill_dia/2.0); pad_dia = 0.0; } @@ -223,7 +223,7 @@ return PCB_PSTK_COMPAT_INVALID; /* found a valid square */ - *dia = pcb_round(sqrt(sq / 2.0)); + *dia = rnd_round(sqrt(sq / 2.0)); return PCB_PSTK_COMPAT_SQUARE; } @@ -305,7 +305,7 @@ } } if (found) { - *dia = pcb_round(sqrt((sqr(minx) + sqr(miny)) / 2.0)); + *dia = rnd_round(sqrt((sqr(minx) + sqr(miny)) / 2.0)); return shi; } } Index: trunk/src_plugins/lib_gtk_common/coord_conv.h =================================================================== --- trunk/src_plugins/lib_gtk_common/coord_conv.h (revision 30941) +++ trunk/src_plugins/lib_gtk_common/coord_conv.h (revision 30942) @@ -10,7 +10,7 @@ rv = (ghidgui->port.view.ctx->hidlib->size_x - x - ghidgui->port.view.x0) / ghidgui->port.view.coord_per_px + 0.5; else rv = (x - ghidgui->port.view.x0) / ghidgui->port.view.coord_per_px + 0.5; - return pcb_round(rv); + return rnd_round(rv); } static inline int Vy(rnd_coord_t y) @@ -20,12 +20,12 @@ rv = (ghidgui->port.view.ctx->hidlib->size_y - y - ghidgui->port.view.y0) / ghidgui->port.view.coord_per_px + 0.5; else rv = (y - ghidgui->port.view.y0) / ghidgui->port.view.coord_per_px + 0.5; - return pcb_round(rv); + return rnd_round(rv); } static inline int Vz(rnd_coord_t z) { - return pcb_round((double)z / ghidgui->port.view.coord_per_px + 0.5); + return rnd_round((double)z / ghidgui->port.view.coord_per_px + 0.5); } static inline double Vxd(rnd_coord_t x) Index: trunk/src_plugins/lib_gtk_common/dlg_attribute.c =================================================================== --- trunk/src_plugins/lib_gtk_common/dlg_attribute.c (revision 30941) +++ trunk/src_plugins/lib_gtk_common/dlg_attribute.c (revision 30942) @@ -110,7 +110,7 @@ return; free((char *)dst->val.str); - dst->val.str = pcb_strdup(gtk_entry_get_text(entry)); + dst->val.str = rnd_strdup(gtk_entry_get_text(entry)); change_cb(ctx, dst); } @@ -636,7 +636,7 @@ if (strcmp(s, nv) == 0) goto nochg; gtk_entry_set_text(GTK_ENTRY(ctx->wl[idx]), val->str); - ctx->attrs[idx].val.str = pcb_strdup(val->str); + ctx->attrs[idx].val.str = rnd_strdup(val->str); *copied = 1; } break; @@ -791,7 +791,7 @@ ctx->caller_data = caller_data; ctx->close_cb_called = 0; ctx->close_cb = button_cb; - ctx->id = pcb_strdup(id); + ctx->id = rnd_strdup(id); ctx->modal = modal; pcb_event(gctx->hidlib, PCB_EVENT_DAD_NEW_DIALOG, "psp", ctx, ctx->id, plc); Index: trunk/src_plugins/lib_gtk_common/dlg_fileselect.c =================================================================== --- trunk/src_plugins/lib_gtk_common/dlg_fileselect.c (revision 30941) +++ trunk/src_plugins/lib_gtk_common/dlg_fileselect.c (revision 30942) @@ -68,7 +68,7 @@ for(n = 0; (n < MAX_HIST) && (hi->fn[n] != NULL); n++) { if (strcmp(hi->fn[n], path) == 0) { shift_history(hi, 0, n); - hi->fn[0] = pcb_strdup(path); + hi->fn[0] = rnd_strdup(path); return; } } @@ -75,7 +75,7 @@ /* else move everything down and insert in front */ shift_history(hi, 0, MAX_HIST-1); - hi->fn[0] = pcb_strdup(path); + hi->fn[0] = rnd_strdup(path); } typedef struct { @@ -100,11 +100,11 @@ gchar *gp = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(pctx->dialog)); res->type = PCB_EVARG_STR; if (gp != NULL) { - res->d.s = pcb_strdup(gp); + res->d.s = rnd_strdup(gp); g_free(gp); } else - res->d.s = pcb_strdup(""); + res->d.s = rnd_strdup(""); return 0; } @@ -135,7 +135,7 @@ hi = htsp_get(&history, history_tag); if (hi == NULL) { hi = calloc(sizeof(file_history_t), 1); - htsp_set(&history, pcb_strdup(history_tag), hi); + htsp_set(&history, rnd_strdup(history_tag), hi); } } @@ -246,7 +246,7 @@ return NULL; /* can't return something that needs g_free, have to copy */ - result = pcb_strdup(res); + result = rnd_strdup(res); g_free(res); return result; } Index: trunk/src_plugins/lib_gtk_common/glue_common.c =================================================================== --- trunk/src_plugins/lib_gtk_common/glue_common.c (revision 30941) +++ trunk/src_plugins/lib_gtk_common/glue_common.c (revision 30942) @@ -54,7 +54,7 @@ char *cache, *cmd, *s; /* set up gdk pixmap modules - without this XPMs won't be loaded */ cache = pcb_concat(pcb_w32_cachedir, "\\gdk-pixmap-loaders.cache", NULL); - pcb_setenv("GDK_PIXBUF_MODULE_FILE", cache, 1); + rnd_setenv("GDK_PIXBUF_MODULE_FILE", cache, 1); for(s = cache; *s != '\0'; s++) if (*s == '\\') Index: trunk/src_plugins/lib_gtk_common/glue_hid.c =================================================================== --- trunk/src_plugins/lib_gtk_common/glue_hid.c (revision 30941) +++ trunk/src_plugins/lib_gtk_common/glue_hid.c (revision 30942) @@ -479,8 +479,8 @@ pcb_gtk_t *gctx = hid->hid_data; viewbox->X1 = gctx->port.view.x0; viewbox->Y1 = gctx->port.view.y0; - viewbox->X2 = pcb_round((double)gctx->port.view.x0 + (double)gctx->port.view.canvas_width * gctx->port.view.coord_per_px); - viewbox->Y2 = pcb_round((double)gctx->port.view.y0 + (double)gctx->port.view.canvas_height * gctx->port.view.coord_per_px); + viewbox->X2 = rnd_round((double)gctx->port.view.x0 + (double)gctx->port.view.canvas_width * gctx->port.view.coord_per_px); + viewbox->Y2 = rnd_round((double)gctx->port.view.y0 + (double)gctx->port.view.canvas_height * gctx->port.view.coord_per_px); } static void ghid_open_command(pcb_hid_t *hid) Index: trunk/src_plugins/lib_gtk_common/in_keyboard.c =================================================================== --- trunk/src_plugins/lib_gtk_common/in_keyboard.c (revision 30941) +++ trunk/src_plugins/lib_gtk_common/in_keyboard.c (revision 30942) @@ -135,7 +135,7 @@ { guint key; - if (pcb_strcasecmp(desc, "enter") == 0) + if (rnd_strcasecmp(desc, "enter") == 0) desc = "Return"; key = gdk_keyval_from_name(desc); Index: trunk/src_plugins/lib_gtk_common/ui_zoompan.c =================================================================== --- trunk/src_plugins/lib_gtk_common/ui_zoompan.c (revision 30941) +++ trunk/src_plugins/lib_gtk_common/ui_zoompan.c (revision 30942) @@ -99,8 +99,8 @@ rnd_bool pcb_gtk_coords_event2pcb(const pcb_gtk_view_t *v, int event_x, int event_y, rnd_coord_t * pcb_x, rnd_coord_t * pcb_y) { - *pcb_x = pcb_round(EVENT_TO_PCB_X(v, event_x)); - *pcb_y = pcb_round(EVENT_TO_PCB_Y(v, event_y)); + *pcb_x = rnd_round(EVENT_TO_PCB_X(v, event_x)); + *pcb_y = rnd_round(EVENT_TO_PCB_Y(v, event_y)); return pcb_true; } @@ -201,8 +201,8 @@ void pcb_gtk_pan_view_abs(pcb_gtk_view_t *v, rnd_coord_t pcb_x, rnd_coord_t pcb_y, double widget_x, double widget_y) { - v->x0 = pcb_round((double)SIDE_X(v, pcb_x) - (double)widget_x * v->coord_per_px); - v->y0 = pcb_round((double)SIDE_Y(v, pcb_y) - (double)widget_y * v->coord_per_px); + v->x0 = rnd_round((double)SIDE_X(v, pcb_x) - (double)widget_x * v->coord_per_px); + v->y0 = rnd_round((double)SIDE_Y(v, pcb_y) - (double)widget_y * v->coord_per_px); uiz_pan_common(v); } Index: trunk/src_plugins/lib_gtk_common/ui_zoompan.h =================================================================== --- trunk/src_plugins/lib_gtk_common/ui_zoompan.h (revision 30941) +++ trunk/src_plugins/lib_gtk_common/ui_zoompan.h (revision 30942) @@ -40,8 +40,8 @@ #define DRAW_X(view, x) (gint)((SIDE_X((view), x) - (view)->x0) / (view)->coord_per_px) #define DRAW_Y(view, y) (gint)((SIDE_Y((view), y) - (view)->y0) / (view)->coord_per_px) -#define EVENT_TO_PCB_X_(hidlib, view, x) (rnd_coord_t)pcb_round(SIDE_X_((hidlib), (double)(x) * (view)->coord_per_px + (double)(view)->x0)) -#define EVENT_TO_PCB_Y_(hidlib, view, y) (rnd_coord_t)pcb_round(SIDE_Y_((hidlib), (double)(y) * (view)->coord_per_px + (double)(view)->y0)) +#define EVENT_TO_PCB_X_(hidlib, view, x) (rnd_coord_t)rnd_round(SIDE_X_((hidlib), (double)(x) * (view)->coord_per_px + (double)(view)->x0)) +#define EVENT_TO_PCB_Y_(hidlib, view, y) (rnd_coord_t)rnd_round(SIDE_Y_((hidlib), (double)(y) * (view)->coord_per_px + (double)(view)->y0)) #define EVENT_TO_PCB_X(view, x) EVENT_TO_PCB_X_((view)->ctx->hidlib, view, (x)) #define EVENT_TO_PCB_Y(view, y) EVENT_TO_PCB_Y_((view)->ctx->hidlib, view, (y)) Index: trunk/src_plugins/lib_gtk_common/util_listener.c =================================================================== --- trunk/src_plugins/lib_gtk_common/util_listener.c (revision 30941) +++ trunk/src_plugins/lib_gtk_common/util_listener.c (revision 30942) @@ -93,7 +93,7 @@ void pcb_gtk_create_listener(pcb_gtk_t *gctx) { GIOChannel *channel; - int fd = pcb_fileno(stdin); + int fd = rnd_fileno(stdin); channel = g_io_channel_unix_new(fd); g_io_add_watch(channel, G_IO_IN, ghid_listener_cb, gctx); Index: trunk/src_plugins/lib_hid_common/act_dad.c =================================================================== --- trunk/src_plugins/lib_hid_common/act_dad.c (revision 30941) +++ trunk/src_plugins/lib_hid_common/act_dad.c (revision 30942) @@ -83,7 +83,7 @@ } dad = calloc(sizeof(dad_t), 1); - dad->name = pcb_strdup(name); + dad->name = rnd_strdup(name); dad->row_domain = dad->name; dad->hidlib = hl; htsp_set(&dads, dad->name, dad); @@ -210,13 +210,13 @@ RND_PCB_ACT_CONVARG(1, FGW_STR, dad, dlgname = argv[1].val.str); RND_PCB_ACT_CONVARG(2, FGW_STR, dad, cmd = argv[2].val.str); - if (pcb_strcasecmp(cmd, "new") == 0) { + if (rnd_strcasecmp(cmd, "new") == 0) { RND_ACT_IRES(dad_new(RND_ACT_HIDLIB, dlgname)); return 0; } dad = htsp_get(&dads, dlgname); - if (pcb_strcasecmp(cmd, "exists") == 0) { + if (rnd_strcasecmp(cmd, "exists") == 0) { RND_ACT_IRES(dad != NULL); return 0; } @@ -228,19 +228,19 @@ } - if (pcb_strcasecmp(cmd, "label") == 0) { + if (rnd_strcasecmp(cmd, "label") == 0) { if (dad->running) goto cant_chg; RND_PCB_ACT_CONVARG(3, FGW_STR, dad, txt = argv[3].val.str); PCB_DAD_LABEL(dad->dlg, txt); rv = PCB_DAD_CURRENT(dad->dlg); } - else if (pcb_strcasecmp(cmd, "button") == 0) { + else if (rnd_strcasecmp(cmd, "button") == 0) { if (dad->running) goto cant_chg; RND_PCB_ACT_CONVARG(3, FGW_STR, dad, txt = argv[3].val.str); PCB_DAD_BUTTON(dad->dlg, tmp_str_dup(dad, txt)); rv = PCB_DAD_CURRENT(dad->dlg); } - else if (pcb_strcasecmp(cmd, "button_closes") == 0) { + else if (rnd_strcasecmp(cmd, "button_closes") == 0) { int n, ret; if (dad->running) goto cant_chg; @@ -258,7 +258,7 @@ } PCB_DAD_END(dad->dlg); } - else if (pcb_strcasecmp(cmd, "bool") == 0) { + else if (rnd_strcasecmp(cmd, "bool") == 0) { if (dad->running) goto cant_chg; txt = ""; rnd_PCB_ACT_MAY_CONVARG(3, FGW_STR, dad, txt = argv[3].val.str); @@ -265,7 +265,7 @@ PCB_DAD_BOOL(dad->dlg, txt); rv = PCB_DAD_CURRENT(dad->dlg); } - else if (pcb_strcasecmp(cmd, "integer") == 0) { + else if (rnd_strcasecmp(cmd, "integer") == 0) { long vmin, vmax; if (dad->running) goto cant_chg; txt = ""; @@ -276,7 +276,7 @@ PCB_DAD_MINMAX(dad->dlg, vmin, vmax); rv = PCB_DAD_CURRENT(dad->dlg); } - else if (pcb_strcasecmp(cmd, "real") == 0) { + else if (rnd_strcasecmp(cmd, "real") == 0) { double vmin, vmax; if (dad->running) goto cant_chg; txt = ""; @@ -287,7 +287,7 @@ PCB_DAD_MINMAX(dad->dlg, vmin, vmax); rv = PCB_DAD_CURRENT(dad->dlg); } - else if (pcb_strcasecmp(cmd, "coord") == 0) { + else if (rnd_strcasecmp(cmd, "coord") == 0) { rnd_coord_t vmin, vmax; if (dad->running) goto cant_chg; txt = ""; @@ -298,17 +298,17 @@ PCB_DAD_MINMAX(dad->dlg, vmin, vmax); rv = PCB_DAD_CURRENT(dad->dlg); } - else if (pcb_strcasecmp(cmd, "string") == 0) { + else if (rnd_strcasecmp(cmd, "string") == 0) { if (dad->running) goto cant_chg; PCB_DAD_STRING(dad->dlg); rv = PCB_DAD_CURRENT(dad->dlg); } - else if (pcb_strcasecmp(cmd, "progress") == 0) { + else if (rnd_strcasecmp(cmd, "progress") == 0) { if (dad->running) goto cant_chg; PCB_DAD_PROGRESS(dad->dlg); rv = PCB_DAD_CURRENT(dad->dlg); } - else if ((pcb_strcasecmp(cmd, "enum") == 0) || (pcb_strcasecmp(cmd, "begin_tabbed") == 0)) { + else if ((rnd_strcasecmp(cmd, "enum") == 0) || (rnd_strcasecmp(cmd, "begin_tabbed") == 0)) { char **values = tmp_new_strlist(dad); if (dad->running) goto cant_chg; @@ -327,7 +327,7 @@ else rv = -1; } - else if (pcb_strcasecmp(cmd, "tree") == 0) { + else if (rnd_strcasecmp(cmd, "tree") == 0) { int cols, istree; char **values = tmp_new_strlist(dad); @@ -347,7 +347,7 @@ else rv = -1; } - else if ((pcb_strcasecmp(cmd, "tree_append") == 0) || (pcb_strcasecmp(cmd, "tree_append_under") == 0) || (pcb_strcasecmp(cmd, "tree_insert") == 0)) { + else if ((rnd_strcasecmp(cmd, "tree_append") == 0) || (rnd_strcasecmp(cmd, "tree_append_under") == 0) || (rnd_strcasecmp(cmd, "tree_insert") == 0)) { void *row, *nrow = NULL; char **values = tmp_new_strlist(dad); @@ -377,31 +377,31 @@ fgw_ptr_reg(&rnd_fgw, res, dad->row_domain, FGW_PTR, nrow); return 0; } - else if (pcb_strcasecmp(cmd, "begin_hbox") == 0) { + else if (rnd_strcasecmp(cmd, "begin_hbox") == 0) { if (dad->running) goto cant_chg; PCB_DAD_BEGIN_HBOX(dad->dlg); dad->level++; rv = PCB_DAD_CURRENT(dad->dlg); } - else if (pcb_strcasecmp(cmd, "begin_vbox") == 0) { + else if (rnd_strcasecmp(cmd, "begin_vbox") == 0) { if (dad->running) goto cant_chg; PCB_DAD_BEGIN_VBOX(dad->dlg); dad->level++; rv = PCB_DAD_CURRENT(dad->dlg); } - else if (pcb_strcasecmp(cmd, "begin_hpane") == 0) { + else if (rnd_strcasecmp(cmd, "begin_hpane") == 0) { if (dad->running) goto cant_chg; PCB_DAD_BEGIN_HPANE(dad->dlg); dad->level++; rv = PCB_DAD_CURRENT(dad->dlg); } - else if (pcb_strcasecmp(cmd, "begin_vpane") == 0) { + else if (rnd_strcasecmp(cmd, "begin_vpane") == 0) { if (dad->running) goto cant_chg; PCB_DAD_BEGIN_VPANE(dad->dlg); dad->level++; rv = PCB_DAD_CURRENT(dad->dlg); } - else if (pcb_strcasecmp(cmd, "begin_table") == 0) { + else if (rnd_strcasecmp(cmd, "begin_table") == 0) { int cols; if (dad->running) goto cant_chg; @@ -411,7 +411,7 @@ dad->level++; rv = PCB_DAD_CURRENT(dad->dlg); } - else if (pcb_strcasecmp(cmd, "end") == 0) { + else if (rnd_strcasecmp(cmd, "end") == 0) { if (dad->running) goto cant_chg; PCB_DAD_END(dad->dlg); @@ -418,7 +418,7 @@ dad->level--; rv = PCB_DAD_CURRENT(dad->dlg); } - else if (pcb_strcasecmp(cmd, "flags") == 0) { + else if (rnd_strcasecmp(cmd, "flags") == 0) { int n; pcb_hatt_compflags_t tmp, flg = 0; @@ -436,13 +436,13 @@ PCB_DAD_COMPFLAG(dad->dlg, flg); rv = PCB_DAD_CURRENT(dad->dlg); } - else if (pcb_strcasecmp(cmd, "onchange") == 0) { + else if (rnd_strcasecmp(cmd, "onchange") == 0) { RND_PCB_ACT_CONVARG(3, FGW_STR, dad, txt = argv[3].val.str); PCB_DAD_CHANGE_CB(dad->dlg, dad_change_cb); vts0_set(&dad->change_cb, PCB_DAD_CURRENT(dad->dlg), tmp_str_dup(dad, txt)); rv = 0; } - else if (pcb_strcasecmp(cmd, "set") == 0) { + else if (rnd_strcasecmp(cmd, "set") == 0) { int wid, i; double d; rnd_coord_t c; @@ -487,7 +487,7 @@ } rv = 0; } - else if (pcb_strcasecmp(cmd, "get") == 0) { + else if (rnd_strcasecmp(cmd, "get") == 0) { int wid; pcb_hid_attr_type_t wtype; @@ -536,7 +536,7 @@ return FGW_ERR_NOT_FOUND; } return 0; - } else if ((pcb_strcasecmp(cmd, "run") == 0) || (pcb_strcasecmp(cmd, "run_modal") == 0)) { + } else if ((rnd_strcasecmp(cmd, "run") == 0) || (rnd_strcasecmp(cmd, "run_modal") == 0)) { if (dad->running) goto cant_chg; RND_PCB_ACT_CONVARG(3, FGW_STR, dad, txt = argv[3].val.str); Index: trunk/src_plugins/lib_hid_common/dlg_comm_m.c =================================================================== --- trunk/src_plugins/lib_hid_common/dlg_comm_m.c (revision 30941) +++ trunk/src_plugins/lib_hid_common/dlg_comm_m.c (revision 30942) @@ -61,7 +61,7 @@ PCB_DAD_LABEL(dlg, label); PCB_DAD_STRING(dlg); ws = PCB_DAD_CURRENT(dlg); - dlg[ws].val.str = pcb_strdup(default_str == NULL ? "" : default_str); + dlg[ws].val.str = rnd_strdup(default_str == NULL ? "" : default_str); PCB_DAD_ENTER_CB(dlg, prompt_enter_cb); dlg[ws].user_data = &dlg_ret_override; PCB_DAD_BUTTON_CLOSES(dlg, clbtn); @@ -81,7 +81,7 @@ } res->type = FGW_STR | FGW_DYN; - res->val.str = pcb_strdup(dlg[ws].val.str); + res->val.str = rnd_strdup(dlg[ws].val.str); PCB_DAD_FREE(dlg); return 0; Index: trunk/src_plugins/lib_hid_common/menu_helper.c =================================================================== --- trunk/src_plugins/lib_hid_common/menu_helper.c (revision 30941) +++ trunk/src_plugins/lib_hid_common/menu_helper.c (revision 30942) @@ -280,7 +280,7 @@ if (rel_level <= 1) { /* creating a main menu */ - char *end, *name = pcb_strdup(path); + char *end, *name = rnd_strdup(path); for(end = name; *end == '/'; end++) ; end = strchr(end, '/'); *end = '\0'; Index: trunk/src_plugins/lib_hid_common/place.c =================================================================== --- trunk/src_plugins/lib_hid_common/place.c (revision 30941) +++ trunk/src_plugins/lib_hid_common/place.c (revision 30942) @@ -74,7 +74,7 @@ wg.y = y; wg.w = w; wg.h = h; - htsw_set(&wingeo, pcb_strdup(id), wg); + htsw_set(&wingeo, rnd_strdup(id), wg); } @@ -112,7 +112,7 @@ static vtp0_t cleanup_later; static char *str_cleanup_later(const char *path) { - char *s = pcb_strdup(path); + char *s = rnd_strdup(path); vtp0_append(&cleanup_later, s); return s; } Index: trunk/src_plugins/lib_hid_common/zoompan.c =================================================================== --- trunk/src_plugins/lib_hid_common/zoompan.c (revision 30941) +++ trunk/src_plugins/lib_hid_common/zoompan.c (revision 30942) @@ -72,7 +72,7 @@ return 0; } - if (pcb_strcasecmp(argv[1].val.str, "get") == 0) { + if (rnd_strcasecmp(argv[1].val.str, "get") == 0) { res->type = FGW_DOUBLE; res->val.nat_double = pcb_gui->coord_per_pix; return 0; @@ -151,13 +151,13 @@ RND_PCB_ACT_CONVARG(1, FGW_STR, Scroll, op = argv[1].val.str); rnd_PCB_ACT_MAY_CONVARG(2, FGW_DOUBLE, Scroll, pixels = argv[2].val.nat_double); - if (pcb_strcasecmp(op, "up") == 0) + if (rnd_strcasecmp(op, "up") == 0) dy = -pcb_gui->coord_per_pix * pixels; - else if (pcb_strcasecmp(op, "down") == 0) + else if (rnd_strcasecmp(op, "down") == 0) dy = pcb_gui->coord_per_pix * pixels; - else if (pcb_strcasecmp(op, "right") == 0) + else if (rnd_strcasecmp(op, "right") == 0) dx = pcb_gui->coord_per_pix * pixels; - else if (pcb_strcasecmp(op, "left") == 0) + else if (rnd_strcasecmp(op, "left") == 0) dx = -pcb_gui->coord_per_pix * pixels; else RND_ACT_FAIL(Scroll); Index: trunk/src_plugins/lib_hid_pcbui/act.c =================================================================== --- trunk/src_plugins/lib_hid_pcbui/act.c (revision 30941) +++ trunk/src_plugins/lib_hid_pcbui/act.c (revision 30942) @@ -59,7 +59,7 @@ RND_PCB_ACT_CONVARG(1, FGW_STR, Zoom, vp = argv[1].val.str); - if (pcb_strcasecmp(vp, "selected") == 0) { + if (rnd_strcasecmp(vp, "selected") == 0) { rnd_box_t sb; if (pcb_get_selection_bbox(&sb, PCB->Data) > 0) pcb_gui->zoom_win(pcb_gui, sb.X1, sb.Y1, sb.X2, sb.Y2, 1); @@ -68,7 +68,7 @@ return 0; } - if (pcb_strcasecmp(vp, "found") == 0) { + if (rnd_strcasecmp(vp, "found") == 0) { rnd_box_t sb; if (pcb_get_found_bbox(&sb, PCB->Data) > 0) pcb_gui->zoom_win(pcb_gui, sb.X1, sb.Y1, sb.X2, sb.Y2, 1); @@ -175,7 +175,7 @@ pcb_draw_inhibit_dec(); /*pcb_trace("-jump-> %mm;%mm -> %mm;%mm\n", x, y, (rnd_coord_t)(x + xoffs), (rnd_coord_t)(y + yoffs));*/ - pcb_gui->pan(pcb_gui, pcb_round(x + xoffs), pcb_round(y + yoffs), 0); + pcb_gui->pan(pcb_gui, rnd_round(x + xoffs), rnd_round(y + yoffs), 0); pcb_gui->set_crosshair(pcb_gui, x, y, HID_SC_PAN_VIEWPORT); pcb_gui->invalidate_all(pcb_gui); @@ -277,8 +277,8 @@ RND_PCB_ACT_CONVARG(1, FGW_LAYER, LayerHotkey, ly = fgw_layer(&argv[1])); RND_PCB_ACT_CONVARG(2, FGW_STR, LayerHotkey, op = argv[2].val.str); - if (pcb_strcasecmp(op, "select") == 0) { key = "pcb-rnd::key::select"; title = "set layer selection hotkey"; } - else if (pcb_strcasecmp(op, "vis") == 0) { key = "pcb-rnd::key::vis"; title = "set layer visibility hotkey"; } + if (rnd_strcasecmp(op, "select") == 0) { key = "pcb-rnd::key::select"; title = "set layer selection hotkey"; } + else if (rnd_strcasecmp(op, "vis") == 0) { key = "pcb-rnd::key::vis"; title = "set layer visibility hotkey"; } else RND_ACT_FAIL(LayerHotkey); msg = Index: trunk/src_plugins/lib_hid_pcbui/routest_dlg.c =================================================================== --- trunk/src_plugins/lib_hid_pcbui/routest_dlg.c (revision 30941) +++ trunk/src_plugins/lib_hid_pcbui/routest_dlg.c (revision 30942) @@ -98,8 +98,8 @@ for(a = rst->attr.List, n = 0; n < rst->attr.Number; a++,n++) { char *cell[3]= {NULL}; - cell[0] = pcb_strdup(a->name); - cell[1] = pcb_strdup(a->value); + cell[0] = rnd_strdup(a->name); + cell[1] = rnd_strdup(a->value); pcb_dad_tree_append(attr, NULL, cell); } @@ -178,12 +178,12 @@ PCB_DAD_STRING(dlg); wkey = PCB_DAD_CURRENT(dlg); if (*key != NULL) - PCB_DAD_DEFAULT_PTR(dlg, pcb_strdup(*key)); + PCB_DAD_DEFAULT_PTR(dlg, rnd_strdup(*key)); PCB_DAD_LABEL(dlg, "value"); PCB_DAD_STRING(dlg); wval = PCB_DAD_CURRENT(dlg); if (*val != NULL) - PCB_DAD_DEFAULT_PTR(dlg, pcb_strdup(*val)); + PCB_DAD_DEFAULT_PTR(dlg, rnd_strdup(*val)); PCB_DAD_BUTTON_CLOSES(dlg, clbtn); PCB_DAD_END(dlg); @@ -190,8 +190,8 @@ PCB_DAD_NEW("route_style_attr", dlg, "Edit route style attribute", NULL, pcb_true, NULL); res = PCB_DAD_RUN(dlg); if (res == 0) { - *key = pcb_strdup(dlg[wkey].val.str); - *val = pcb_strdup(dlg[wval].val.str); + *key = rnd_strdup(dlg[wkey].val.str); + *val = rnd_strdup(dlg[wval].val.str); } PCB_DAD_FREE(dlg); return res; Index: trunk/src_plugins/lib_polyhelp/polyhelp.c =================================================================== --- trunk/src_plugins/lib_polyhelp/polyhelp.c (revision 30941) +++ trunk/src_plugins/lib_polyhelp/polyhelp.c (revision 30942) @@ -444,7 +444,7 @@ RND_PCB_ACT_CONVARG(1, FGW_STR, PolyHatch, op = argv[1].val.str); rnd_PCB_ACT_MAY_CONVARG(2, FGW_STR, PolyHatch, arg = argv[2].val.str); - if (pcb_strcasecmp(op, "interactive") == 0) { + if (rnd_strcasecmp(op, "interactive") == 0) { if (polyhatch_gui(&period, &dir, &flg, &want_contour) != 0) { RND_ACT_IRES(1); return 0; Index: trunk/src_plugins/lib_vfs/lib_vfs.c =================================================================== --- trunk/src_plugins/lib_vfs/lib_vfs.c (revision 30941) +++ trunk/src_plugins/lib_vfs/lib_vfs.c (revision 30942) @@ -68,7 +68,7 @@ *next= '\0'; /*pcb_trace(" dir '%s'\n", path->array);*/ if (!htsp_has(seen, path->array)) { - htsp_set(seen, pcb_strdup(path->array), ctx); + htsp_set(seen, rnd_strdup(path->array), ctx); cb(ctx, path->array, 1); } *next= '/'; Index: trunk/src_plugins/loghid/loghid.c =================================================================== --- trunk/src_plugins/loghid/loghid.c (revision 30941) +++ trunk/src_plugins/loghid/loghid.c (revision 30942) @@ -102,7 +102,7 @@ static pcb_export_opt_t *loghid_get_export_options(pcb_hid_t *hid, int *n) { -/* loghid_attribute_list[HA_psfile] = pcb_strdup("default?");*/ +/* loghid_attribute_list[HA_psfile] = rnd_strdup("default?");*/ if (n) *n = (sizeof(loghid_attribute_list)/sizeof(loghid_attribute_list[0])); Index: trunk/src_plugins/mincut/pcb-mincut/load.c =================================================================== --- trunk/src_plugins/mincut/pcb-mincut/load.c (revision 30941) +++ trunk/src_plugins/mincut/pcb-mincut/load.c (revision 30942) @@ -116,7 +116,7 @@ if (htsi_has(name2node, (char *)id)) return htsi_get(name2node, (char *)id); if (alloc) { - node2name[num_nodes] = pcb_strdup(id); + node2name[num_nodes] = rnd_strdup(id); htsi_set(name2node, node2name[num_nodes], num_nodes); return num_nodes++; } @@ -189,8 +189,8 @@ } name2node = htsi_alloc(keyhash, strkeyeq); - node2name[0] = pcb_strdup("(S)"); htsi_set(name2node, node2name[0], 0); - node2name[1] = pcb_strdup("(T)"); htsi_set(name2node, node2name[1], 1); + node2name[0] = rnd_strdup("(S)"); htsi_set(name2node, node2name[0], 0); + node2name[1] = rnd_strdup("(T)"); htsi_set(name2node, node2name[1], 1); num_nodes = 2; nn_net[0] = 0; nn_net[1] = 0; Index: trunk/src_plugins/mincut/pcb-mincut/main.c =================================================================== --- trunk/src_plugins/mincut/pcb-mincut/main.c (revision 30941) +++ trunk/src_plugins/mincut/pcb-mincut/main.c (revision 30942) @@ -9,8 +9,8 @@ #undef strdup -char *pcb_strdup(const char *s) { return strdup(s); } -int pcb_rand() { return rand(); } +char *rnd_strdup(const char *s) { return strdup(s); } +int rnd_rand() { return rand(); } int main() { Index: trunk/src_plugins/mincut/pcb-mincut/solve.c =================================================================== --- trunk/src_plugins/mincut/pcb-mincut/solve.c (revision 30941) +++ trunk/src_plugins/mincut/pcb-mincut/solve.c (revision 30942) @@ -44,7 +44,7 @@ static int pick_del(sstate_t *st) { int idx, ret, size; - idx = pcb_rand() % st->num_avail; + idx = rnd_rand() % st->num_avail; ret = st->avail[idx]; size = (st->num_avail-idx-1) * sizeof(int); if (size > 0) @@ -66,7 +66,7 @@ } if (num_neigh == 0) return -1; - return st->neigh[pcb_rand() % num_neigh]; + return st->neigh[rnd_rand() % num_neigh]; } static void retag(sstate_t *st, int from, int to) Index: trunk/src_plugins/mincut/rats_mincut.c =================================================================== --- trunk/src_plugins/mincut/rats_mincut.c (revision 30941) +++ trunk/src_plugins/mincut/rats_mincut.c (revision 30942) @@ -185,8 +185,8 @@ if (nonterms < 1) bad_gr = 1; - g->node2name[0] = pcb_strdup("S"); - g->node2name[1] = pcb_strdup("T"); + g->node2name[0] = rnd_strdup("S"); + g->node2name[1] = rnd_strdup("T"); /* calculate how many edges each node has and the max edge count */ maxedges = 0; Index: trunk/src_plugins/oldactions/oldactions.c =================================================================== --- trunk/src_plugins/oldactions/oldactions.c (revision 30941) +++ trunk/src_plugins/oldactions/oldactions.c (revision 30942) @@ -256,7 +256,7 @@ const char *rv = NULL; RND_ACT_IRES(0); rnd_PCB_ACT_MAY_CONVARG(1, FGW_STR, PCBChanged, rv = argv[1].val.str); - pcb_board_changed((rv != NULL) && (pcb_strcasecmp(rv, "revert") == 0)); + pcb_board_changed((rv != NULL) && (rnd_strcasecmp(rv, "revert") == 0)); return 0; } Index: trunk/src_plugins/order_pcbway/pcbway.c =================================================================== --- trunk/src_plugins/order_pcbway/pcbway.c (revision 30941) +++ trunk/src_plugins/order_pcbway/pcbway.c (revision 30942) @@ -67,7 +67,7 @@ static int pcbway_cahce_update_(rnd_hidlib_t *hidlib, const char *url, const char *path, int update, pcb_wget_opts_t *wopts) { - double mt, now = pcb_dtime(); + double mt, now = rnd_dtime(); mt = pcb_file_mtime(hidlib, path); if (update || (mt < 0) || ((now - mt) > CFG.cache_update_sec)) { @@ -179,7 +179,7 @@ continue; for(c = n->children; c != NULL; c = c->next) if ((c->children != NULL) && (c->children->type == XML_TEXT_NODE) && (xmlStrcmp(c->name, (xmlChar *)"CountryCode") == 0)) - vts0_append(&form->country_codes, pcb_strdup(c->children->content)); + vts0_append(&form->country_codes, rnd_strdup(c->children->content)); } xmlFreeDoc(doc); @@ -212,7 +212,7 @@ f = calloc(sizeof(pcb_order_field_t) + strlen((char *)n->name), 1); strcpy(f->name, (char *)n->name); if (note != NULL) - f->help = pcb_strdup(note); + f->help = rnd_strdup(note); if (type == NULL) { f->type = PCB_HATT_LABEL; } @@ -226,7 +226,7 @@ char *s; if ((n->type == XML_TEXT_NODE) || (xmlStrcmp(v->name, (xmlChar *)"Value") != 0) || (n->children->type != XML_TEXT_NODE)) continue; - s = pcb_strdup((char *)v->children->content); + s = rnd_strdup((char *)v->children->content); vtp0_append(&tmp, s); if ((dflt != NULL) && (strcmp(s, dflt) == 0)) di = i; @@ -254,7 +254,7 @@ else if (strcmp(type, "string") == 0) { f->type = PCB_HATT_STRING; if (dflt != NULL) - f->val.str = pcb_strdup(dflt); + f->val.str = rnd_strdup(dflt); } else { f->type = PCB_HATT_LABEL; Index: trunk/src_plugins/propedit/propdlg.c =================================================================== --- trunk/src_plugins/propedit/propdlg.c (revision 30941) +++ trunk/src_plugins/propedit/propdlg.c (revision 30942) @@ -95,7 +95,7 @@ /* remember cursor */ r = pcb_dad_tree_get_selected(attr); if (r != NULL) - cursor_path = pcb_strdup(r->path); + cursor_path = rnd_strdup(r->path); pcb_dad_tree_clear(tree); @@ -117,7 +117,7 @@ cell[4] = pcb_propsel_printval(p->type, &avg); } - cell[0] = pcb_strdup(e->key); + cell[0] = rnd_strdup(e->key); cell[1] = pcb_propsel_printval(p->type, &com); r = pcb_dad_tree_mkdirp(tree, cell[0], cell); @@ -238,7 +238,7 @@ memset(&hv, 0, sizeof(hv)); switch(p->type) { - case PCB_PROPT_STRING: hv.str = pcb_strdup(pv->string == NULL ? "" : pv->string); break; + case PCB_PROPT_STRING: hv.str = rnd_strdup(pv->string == NULL ? "" : pv->string); break; case PCB_PROPT_COORD: hv.crd = pv->coord; break; case PCB_PROPT_ANGLE: hv.dbl = pv->angle; break; case PCB_PROPT_BOOL: Index: trunk/src_plugins/propedit/propedit.c =================================================================== --- trunk/src_plugins/propedit/propedit.c (revision 30941) +++ trunk/src_plugins/propedit/propedit.c (revision 30942) @@ -126,7 +126,7 @@ } } else if (strncmp(cmd, "net:", 4) == 0) { - char *name = pcb_strdup(cmd+4); + char *name = rnd_strdup(cmd+4); if (!pe->nets_inited) { htsp_init(&pe->nets, strhash, strkeyeq); pe->nets_inited = 1; @@ -255,13 +255,13 @@ e = htprop_first(&p->values); most_common = e->key; res->type = FGW_STR | FGW_DYN; - res->val.str = pcb_strdup(out->string == NULL ? "" : out->string); + res->val.str = rnd_strdup(out->string == NULL ? "" : out->string); break; case PCB_PROPT_COORD: res->type = FGW_COORD; fgw_coord(res) = out->coord; break; case PCB_PROPT_ANGLE: res->type = FGW_DOUBLE; res->val.nat_double = out->angle; break; case PCB_PROPT_BOOL: case PCB_PROPT_INT: res->type = FGW_INT; res->val.nat_int = out->i; break; - case PCB_PROPT_COLOR: res->type = FGW_STR | FGW_DYN; res->val.str = pcb_strdup(out->clr.str); break; + case PCB_PROPT_COLOR: res->type = FGW_STR | FGW_DYN; res->val.str = rnd_strdup(out->clr.str); break; case PCB_PROPT_invalid: case PCB_PROPT_max: goto error; } Index: trunk/src_plugins/propedit/props.c =================================================================== --- trunk/src_plugins/propedit/props.c (revision 30941) +++ trunk/src_plugins/propedit/props.c (revision 30942) @@ -136,7 +136,7 @@ p = malloc(sizeof(pcb_props_t)); p->type = type; htprop_init(&p->values, prophash[type], propkeyeq[type]); - htsp_set(&ctx->props, pcb_strdup(propname), p); + htsp_set(&ctx->props, rnd_strdup(propname), p); } else { if (type != p->type) Index: trunk/src_plugins/propedit/propsel.c =================================================================== --- trunk/src_plugins/propedit/propsel.c (revision 30941) +++ trunk/src_plugins/propedit/propsel.c (revision 30942) @@ -408,11 +408,11 @@ if (strncmp(st->name, "p/board/", 8) == 0) { if ((strcmp(pn, "name") == 0) && - (pcb_board_change_name(pcb_strdup(st->s)))) DONE; + (pcb_board_change_name(rnd_strdup(st->s)))) DONE; if ((strcmp(pn, "filename") == 0)) { free(pcb->hidlib.filename); - pcb->hidlib.filename = pcb_strdup(st->s); + pcb->hidlib.filename = rnd_strdup(st->s); DONE; } @@ -443,7 +443,7 @@ if (strncmp(st->name, "p/layer/", 8) == 0) { if ((strcmp(pn, "name") == 0) && - (pcb_layer_rename_(layer, pcb_strdup(st->s), 1) == 0)) DONE0; + (pcb_layer_rename_(layer, rnd_strdup(st->s), 1) == 0)) DONE0; if ((strcmp(pn, "color") == 0) && (layer_recolor(layer, st->color.str) == 0)) DONE0; @@ -464,7 +464,7 @@ if (strncmp(st->name, "p/layer_group/", 14) == 0) { if ((strcmp(pn, "name") == 0) && - (pcb_layergrp_rename_(grp, pcb_strdup(st->s), 1) == 0)) DONE; + (pcb_layergrp_rename_(grp, rnd_strdup(st->s), 1) == 0)) DONE; if ((strcmp(pn, "purpose") == 0) && (pcb_layergrp_set_purpose(grp, st->s, 1) == 0)) DONE; @@ -644,7 +644,7 @@ } if ((strcmp(pn, "string") == 0) && - (old = pcb_chg_obj_name(PCB_OBJ_TEXT, text->parent.layer, text, NULL, pcb_strdup(st->s)))) { + (old = pcb_chg_obj_name(PCB_OBJ_TEXT, text->parent.layer, text, NULL, rnd_strdup(st->s)))) { free(old); DONE; } @@ -1002,13 +1002,13 @@ char *pcb_propsel_printval(pcb_prop_type_t type, const pcb_propval_t *val) { switch(type) { - case PCB_PROPT_STRING: return val->string == NULL ? pcb_strdup("") : pcb_strdup(val->string); + case PCB_PROPT_STRING: return val->string == NULL ? rnd_strdup("") : rnd_strdup(val->string); case PCB_PROPT_COORD: return pcb_strdup_printf("%m+%.02mS", pcbhl_conf.editor.grid_unit->allow, val->coord); case PCB_PROPT_ANGLE: return pcb_strdup_printf("%f", val->angle); case PCB_PROPT_INT: return pcb_strdup_printf("%d", val->i); - case PCB_PROPT_BOOL: return pcb_strdup(val->i ? "true" : "false"); + case PCB_PROPT_BOOL: return rnd_strdup(val->i ? "true" : "false"); case PCB_PROPT_COLOR: return pcb_strdup_printf("#%02x%02x%02x", val->clr.r, val->clr.g, val->clr.b); default: - return pcb_strdup(""); + return rnd_strdup(""); } } Index: trunk/src_plugins/query/fnc_glue.c =================================================================== --- trunk/src_plugins/query/fnc_glue.c (revision 30941) +++ trunk/src_plugins/query/fnc_glue.c (revision 30942) @@ -86,7 +86,7 @@ /* convert action result to query result */ # define FGW_TO_QRY_NUM(lst, val) res->type = PCBQ_VT_LONG; res->data.lng = val; goto fin; -# define FGW_TO_QRY_STR(lst, val) res->type = PCBQ_VT_STRING; res->data.str = pcb_strdup(val == NULL ? "" : val); goto fin; +# define FGW_TO_QRY_STR(lst, val) res->type = PCBQ_VT_STRING; res->data.str = rnd_strdup(val == NULL ? "" : val); goto fin; # define FGW_TO_QRY_NIL(lst, val) res->type = PCBQ_VT_VOID; goto fin; /* has to free idpath and idpathlist return, noone else will have the chance */ Index: trunk/src_plugins/query/fnc_list.c =================================================================== --- trunk/src_plugins/query/fnc_list.c (revision 30941) +++ trunk/src_plugins/query/fnc_list.c (revision 30942) @@ -87,7 +87,7 @@ case PCBQ_VT_DOUBLE: pcb_snprintf(buff, sizeof(buff), "%f", argv[n+1].data.dbl); break; case PCBQ_VT_STRING: str = (char *)argv[n+1].data.str; break; } - str = pcb_strdup(str == NULL ? "" : str); + str = rnd_strdup(str == NULL ? "" : str); vtp0_append(&res->data.lst, argv[n].data.obj); vtp0_append(&res->data.lst, str); vtp0_append(&ectx->autofree, str); Index: trunk/src_plugins/query/query.c =================================================================== --- trunk/src_plugins/query/query.c (revision 30941) +++ trunk/src_plugins/query/query.c (revision 30942) @@ -91,15 +91,15 @@ char *pcb_query_sprint_val(pcb_qry_val_t *val) { switch(val->type) { - case PCBQ_VT_VOID: return pcb_strdup(""); + case PCBQ_VT_VOID: return rnd_strdup(""); case PCBQ_VT_COORD: return pcb_strdup_printf("%mI=%$mH", val->data.crd, val->data.crd); case PCBQ_VT_LONG: return pcb_strdup_printf("%ld", val->data.lng, val->data.lng); case PCBQ_VT_DOUBLE: return pcb_strdup_printf("%f", val->data.dbl); case PCBQ_VT_STRING: return pcb_strdup_printf("\"%s\"", val->data.str); case PCBQ_VT_OBJ: return pcb_strdup_printf("", val->data.obj->ID); - case PCBQ_VT_LST: return pcb_strdup(""); + case PCBQ_VT_LST: return rnd_strdup(""); } - return pcb_strdup(""); + return rnd_strdup(""); } const char *pcb_qry_nodetype_name(pcb_qry_nodetype_t ntype) @@ -314,7 +314,7 @@ if (!alloc) return -1; - htsi_set(&it->names, pcb_strdup(varname), it->num_vars); + htsi_set(&it->names, rnd_strdup(varname), it->num_vars); return it->num_vars++; } @@ -353,7 +353,7 @@ if (htsp_get(qfnc, name) != NULL) return -1; - htsp_set(qfnc, pcb_strdup(name), pcb_cast_f2d((pcb_fptr_t)fnc)); + htsp_set(qfnc, rnd_strdup(name), pcb_cast_f2d((pcb_fptr_t)fnc)); return 0; } Index: trunk/src_plugins/query/query_access.c =================================================================== --- trunk/src_plugins/query/query_access.c (revision 30941) +++ trunk/src_plugins/query/query_access.c (revision 30942) @@ -464,9 +464,9 @@ case query_fields_x2: PCB_QRY_RET_COORD(res, l->Point2.X); case query_fields_y2: PCB_QRY_RET_COORD(res, l->Point2.Y); case query_fields_thickness: PCB_QRY_RET_COORD(res, l->Thickness); - case query_fields_clearance: PCB_QRY_RET_COORD(res, pcb_round((double)l->Clearance/2.0)); + case query_fields_clearance: PCB_QRY_RET_COORD(res, rnd_round((double)l->Clearance/2.0)); case query_fields_length: - PCB_QRY_RET_DBL(res, ((rnd_coord_t)pcb_round(sqrt(pcb_line_len2(l))))); + PCB_QRY_RET_DBL(res, ((rnd_coord_t)rnd_round(sqrt(pcb_line_len2(l))))); break; case query_fields_length2: PCB_QRY_RET_DBL(res, pcb_line_len2(l)); @@ -474,7 +474,7 @@ case query_fields_area: { double th = l->Thickness; - double len = pcb_round(sqrt(pcb_line_len2(l))); + double len = rnd_round(sqrt(pcb_line_len2(l))); if (PCB_FLAG_TEST(PCB_FLAG_SQUARE, l)) PCB_QRY_RET_DBL(res, (len+th) * th); else @@ -535,9 +535,9 @@ case query_fields_cy: case query_fields_y: PCB_QRY_RET_COORD(res, a->Y); case query_fields_thickness: PCB_QRY_RET_COORD(res, a->Thickness); - case query_fields_clearance: PCB_QRY_RET_COORD(res, (rnd_coord_t)pcb_round((double)a->Clearance/2.0)); + case query_fields_clearance: PCB_QRY_RET_COORD(res, (rnd_coord_t)rnd_round((double)a->Clearance/2.0)); case query_fields_length: - PCB_QRY_RET_COORD(res, ((rnd_coord_t)pcb_round(pcb_arc_len(a)))); + PCB_QRY_RET_COORD(res, ((rnd_coord_t)rnd_round(pcb_arc_len(a)))); break; case query_fields_length2: { @@ -661,7 +661,7 @@ switch(fh1) { case query_fields_clearance: if (PCB_FLAG_TEST(PCB_FLAG_CLEARPOLYPOLY, p)) - PCB_QRY_RET_COORD(res, (rnd_coord_t)pcb_round((double)p->Clearance/2.0)); + PCB_QRY_RET_COORD(res, (rnd_coord_t)rnd_round((double)p->Clearance/2.0)); else PCB_QRY_RET_INV(res); break; Index: trunk/src_plugins/query/query_act.c =================================================================== --- trunk/src_plugins/query/query_act.c (revision 30941) +++ trunk/src_plugins/query/query_act.c (revision 30942) @@ -386,7 +386,7 @@ res[idx].precomp.fld = query_fields_sphash(fname); /*pcb_trace("[%d/%d] '%s' -> %d\n", idx, len, fname, res[idx].precomp.fld);*/ if (res[idx].precomp.fld < 0) /* if compilation failed, this will need to be evaluated run-time, save as string */ - res[idx].data.str = pcb_strdup(fname); + res[idx].data.str = rnd_strdup(fname); fno = fname; if (*s == '\0') break; @@ -435,7 +435,7 @@ case PCBQ_VT_STRING: if (src->data.str != NULL) { dst->type = FGW_STR | FGW_DYN; - dst->val.str = pcb_strdup(src->data.str); + dst->val.str = rnd_strdup(src->data.str); } else { dst->type = FGW_PTR; Index: trunk/src_plugins/query/query_l.c =================================================================== --- trunk/src_plugins/query/query_l.c (revision 30941) +++ trunk/src_plugins/query/query_l.c (revision 30942) @@ -1182,13 +1182,13 @@ /* rule 1 can match eol */ YY_RULE_SETUP #line 43 "query_l.l" -{ qry_lval.s = pcb_strdup(yytext+1); qry_lval.s[strlen(qry_lval.s)-1] = '\0'; return T_QSTR; /*"*/ } +{ qry_lval.s = rnd_strdup(yytext+1); qry_lval.s[strlen(qry_lval.s)-1] = '\0'; return T_QSTR; /*"*/ } YY_BREAK case 2: /* rule 2 can match eol */ YY_RULE_SETUP #line 44 "query_l.l" -{ qry_lval.s = pcb_strdup(yytext+1); qry_lval.s[strlen(qry_lval.s)-1] = '\0'; return T_QSTR; } +{ qry_lval.s = rnd_strdup(yytext+1); qry_lval.s[strlen(qry_lval.s)-1] = '\0'; return T_QSTR; } YY_BREAK case 3: YY_RULE_SETUP @@ -1523,7 +1523,7 @@ case 69: YY_RULE_SETUP #line 121 "query_l.l" -{ qry_lval.s = pcb_strdup(yytext); return T_STR; } +{ qry_lval.s = rnd_strdup(yytext); return T_STR; } YY_BREAK case 70: YY_RULE_SETUP @@ -2580,7 +2580,7 @@ static pcb_qry_node_t *make_constant(char *str, long val) { pcb_qry_node_t *res = pcb_qry_n_alloc(PCBQ_DATA_CONST); - res->data.str = pcb_strdup(str); + res->data.str = rnd_strdup(str); res->precomp.cnst = val; return res; } @@ -2588,7 +2588,7 @@ static pcb_qry_node_t *make_const_obj(char *str, pcb_any_obj_t *o) { pcb_qry_node_t *res = pcb_qry_n_alloc(PCBQ_DATA_OBJ); - res->data.str = pcb_strdup(str); + res->data.str = rnd_strdup(str); res->precomp.obj = o; return res; } Index: trunk/src_plugins/query/query_l.l =================================================================== --- trunk/src_plugins/query/query_l.l (revision 30941) +++ trunk/src_plugins/query/query_l.l (revision 30942) @@ -40,8 +40,8 @@ %option prefix="qry_" %% -["][^"]*["] { qry_lval.s = pcb_strdup(yytext+1); qry_lval.s[strlen(qry_lval.s)-1] = '\0'; return T_QSTR; /*"*/ } -['][^']*['] { qry_lval.s = pcb_strdup(yytext+1); qry_lval.s[strlen(qry_lval.s)-1] = '\0'; return T_QSTR; } +["][^"]*["] { qry_lval.s = rnd_strdup(yytext+1); qry_lval.s[strlen(qry_lval.s)-1] = '\0'; return T_QSTR; /*"*/ } +['][^']*['] { qry_lval.s = rnd_strdup(yytext+1); qry_lval.s[strlen(qry_lval.s)-1] = '\0'; return T_QSTR; } let { return T_LET; } assert { return T_ASSERT; } @@ -118,7 +118,7 @@ [0-9]+ { qry_lval.c = strtol(yytext, NULL, 10); return T_INT; } [.][0-9]+ { qry_lval.d = strtod(yytext, NULL); return T_DBL; } [0-9]+[.][0-9]* { qry_lval.d = strtod(yytext, NULL); return T_DBL; } -[A-Za-z_][0-9A-Za-z_]* { qry_lval.s = pcb_strdup(yytext); return T_STR; } +[A-Za-z_][0-9A-Za-z_]* { qry_lval.s = rnd_strdup(yytext); return T_STR; } [$@().,<>!*+/~-] { return *yytext; } @@ -148,7 +148,7 @@ static pcb_qry_node_t *make_constant(char *str, long val) { pcb_qry_node_t *res = pcb_qry_n_alloc(PCBQ_DATA_CONST); - res->data.str = pcb_strdup(str); + res->data.str = rnd_strdup(str); res->precomp.cnst = val; return res; } @@ -156,7 +156,7 @@ static pcb_qry_node_t *make_const_obj(char *str, pcb_any_obj_t *o) { pcb_qry_node_t *res = pcb_qry_n_alloc(PCBQ_DATA_OBJ); - res->data.str = pcb_strdup(str); + res->data.str = rnd_strdup(str); res->precomp.obj = o; return res; } Index: trunk/src_plugins/query/query_y.c =================================================================== --- trunk/src_plugins/query/query_y.c (revision 30941) +++ trunk/src_plugins/query/query_y.c (revision 30942) @@ -1777,7 +1777,7 @@ case 49: #line 270 "query_y.y" /* yacc.c:1652 */ - { (yyval.n) = pcb_qry_n_alloc(PCBQ_FIELD); (yyval.n)->data.str = pcb_strdup("a"); (yyval.n)->precomp.fld = query_fields_sphash("a"); (yyval.n)->next = (yyvsp[0].n); } + { (yyval.n) = pcb_qry_n_alloc(PCBQ_FIELD); (yyval.n)->data.str = rnd_strdup("a"); (yyval.n)->precomp.fld = query_fields_sphash("a"); (yyval.n)->next = (yyvsp[0].n); } #line 1782 "query_y.c" /* yacc.c:1652 */ break; @@ -1850,7 +1850,7 @@ case 58: #line 314 "query_y.y" /* yacc.c:1652 */ - { (yyval.n) = pcb_qry_n_alloc(PCBQ_LISTVAR); (yyval.n)->data.str = pcb_strdup("@"); /* delibertely not setting iter_active, list() protects against turning it into an iterator */ } + { (yyval.n) = pcb_qry_n_alloc(PCBQ_LISTVAR); (yyval.n)->data.str = rnd_strdup("@"); /* delibertely not setting iter_active, list() protects against turning it into an iterator */ } #line 1855 "query_y.c" /* yacc.c:1652 */ break; @@ -1921,7 +1921,7 @@ case 66: #line 363 "query_y.y" /* yacc.c:1652 */ - { (yyval.n) = pcb_qry_n_alloc(PCBQ_RNAME); (yyval.n)->data.str = (const char *)pcb_strdup(""); } + { (yyval.n) = pcb_qry_n_alloc(PCBQ_RNAME); (yyval.n)->data.str = (const char *)rnd_strdup(""); } #line 1926 "query_y.c" /* yacc.c:1652 */ break; Index: trunk/src_plugins/query/query_y.y =================================================================== --- trunk/src_plugins/query/query_y.y (revision 30941) +++ trunk/src_plugins/query/query_y.y (revision 30942) @@ -267,7 +267,7 @@ | T_STR '.' fields { $$ = pcb_qry_n_alloc(PCBQ_FIELD); $$->data.str = $1; $$->precomp.fld = query_fields_sphash($1); $$->next = $3; } | T_FLD_P fields { $$ = $2; /* just ignore .p. */ } | T_FLD_P T_FLD_FLAG T_STR { $$ = make_flag_free($3); } - | T_FLD_A attribs { $$ = pcb_qry_n_alloc(PCBQ_FIELD); $$->data.str = pcb_strdup("a"); $$->precomp.fld = query_fields_sphash("a"); $$->next = $2; } + | T_FLD_A attribs { $$ = pcb_qry_n_alloc(PCBQ_FIELD); $$->data.str = rnd_strdup("a"); $$->precomp.fld = query_fields_sphash("a"); $$->next = $2; } ; attribs: @@ -311,7 +311,7 @@ var: T_STR { $$ = pcb_qry_n_alloc(PCBQ_VAR); $$->data.crd = pcb_qry_iter_var(iter_ctx, $1, 1); if (iter_active_ctx != NULL) vti0_set(iter_active_ctx, $$->data.crd, 1); free($1); } - | T_LIST '(' '@' ')' { $$ = pcb_qry_n_alloc(PCBQ_LISTVAR); $$->data.str = pcb_strdup("@"); /* delibertely not setting iter_active, list() protects against turning it into an iterator */ } + | T_LIST '(' '@' ')' { $$ = pcb_qry_n_alloc(PCBQ_LISTVAR); $$->data.str = rnd_strdup("@"); /* delibertely not setting iter_active, list() protects against turning it into an iterator */ } | '@' { $$ = pcb_qry_n_alloc(PCBQ_VAR); $$->data.crd = pcb_qry_iter_var(iter_ctx, "@", 1); if (iter_active_ctx != NULL) vti0_set(iter_active_ctx, $$->data.crd, 1); } ; @@ -360,7 +360,7 @@ ; words: - /* empty */ { $$ = pcb_qry_n_alloc(PCBQ_RNAME); $$->data.str = (const char *)pcb_strdup(""); } + /* empty */ { $$ = pcb_qry_n_alloc(PCBQ_RNAME); $$->data.str = (const char *)rnd_strdup(""); } | T_STR words { char *old = $2->data.str, *sep = ((*old != '\0') ? " " : ""); $2->data.str = pcb_concat($1, sep, old, NULL); Index: trunk/src_plugins/renumber/renumber.c =================================================================== --- trunk/src_plugins/renumber/renumber.c (revision 30941) +++ trunk/src_plugins/renumber/renumber.c (revision 30942) @@ -102,7 +102,7 @@ } if (name && *name) { - default_file = pcb_strdup(name); + default_file = rnd_strdup(name); } if ((out = pcb_fopen(&PCB->hidlib, name, "r"))) { @@ -206,7 +206,7 @@ for (i = 0; i < cnt; i++) { if (subc_list[i]->refdes) { /* figure out the prefix */ - tmps = pcb_strdup(or_empty(subc_list[i]->refdes)); + tmps = rnd_strdup(or_empty(subc_list[i]->refdes)); j = 0; while (tmps[j] && (tmps[j] < '0' || tmps[j] > '9') && tmps[j] != '?') @@ -234,7 +234,7 @@ /* start a new counter if we don't have a counter for this prefix */ if (!cnt_list[j].name) { - cnt_list[j].name = pcb_strdup(tmps); + cnt_list[j].name = rnd_strdup(tmps); cnt_list[j].cnt = 0; } @@ -274,8 +274,8 @@ fprintf(out, "*RENAME* \"%s\" \"%s\"\n", or_empty(subc_list[i]->refdes), tmps); /* add this rename to our table of renames so we can update the netlist */ - was[c_cnt] = pcb_strdup(or_empty(subc_list[i]->refdes)); - is[c_cnt] = pcb_strdup(tmps); + was[c_cnt] = rnd_strdup(or_empty(subc_list[i]->refdes)); + is[c_cnt] = rnd_strdup(tmps); c_cnt++; pcb_undo_add_obj_to_change_name(PCB_OBJ_SUBC, NULL, NULL, subc_list[i], (char *)or_empty(subc_list[i]->refdes)); @@ -318,7 +318,7 @@ */ if (strcmp(t->refdes, was[k]) == 0) { free(t->refdes); - t->refdes = pcb_strdup(is[k]); + t->refdes = rnd_strdup(is[k]); k = c_cnt; } } Index: trunk/src_plugins/report/report.c =================================================================== --- trunk/src_plugins/report/report.c (revision 30941) +++ trunk/src_plugins/report/report.c (revision 30942) @@ -375,7 +375,7 @@ gds_init(&tmp); if (op != NULL) { - if (pcb_strncasecmp(op, "Subc", 4) == 0) + if (rnd_strncasecmp(op, "Subc", 4) == 0) type = PCB_OBJ_SUBC; } type = pcb_search_screen(x, y, type, &ptr1, &ptr2, &ptr3); @@ -769,11 +769,11 @@ RND_PCB_ACT_CONVARG(1, FGW_STR, Report, cmd = argv[1].val.str); - if (pcb_strcasecmp(cmd, "Object") == 0) { + if (rnd_strcasecmp(cmd, "Object") == 0) { rnd_hid_get_coords("Click on an object", &x, &y, 0); return pcb_act_report_dialog(res, argc, argv); } - else if (pcb_strncasecmp(cmd, "Subc", 4) == 0) { + else if (rnd_strncasecmp(cmd, "Subc", 4) == 0) { rnd_hid_get_coords("Click on a subcircuit", &x, &y, 0); return pcb_act_report_dialog(res, argc, argv); } @@ -780,17 +780,17 @@ rnd_hid_get_coords("Click on object to report on", &x, &y, 0); - if (pcb_strcasecmp(cmd, "DrillReport") == 0) + if (rnd_strcasecmp(cmd, "DrillReport") == 0) return report_drills(res, argc, argv); - else if (pcb_strcasecmp(cmd, "FoundPins") == 0) + else if (rnd_strcasecmp(cmd, "FoundPins") == 0) return report_found_pins(res, argc, argv); - else if ((pcb_strcasecmp(cmd, "NetLength") == 0) && (argc == 2)) + else if ((rnd_strcasecmp(cmd, "NetLength") == 0) && (argc == 2)) return report_net_length(res, argc, argv, 0); - else if ((pcb_strcasecmp(cmd, "NetLengthTo") == 0) && (argc == 2)) + else if ((rnd_strcasecmp(cmd, "NetLengthTo") == 0) && (argc == 2)) return report_net_length(res, argc, argv, 1); - else if (pcb_strcasecmp(cmd, "AllNetLengths") == 0) + else if (rnd_strcasecmp(cmd, "AllNetLengths") == 0) return report_all_net_lengths(res, argc, argv); - else if (pcb_strcasecmp(cmd, "NetLength") == 0) { + else if (rnd_strcasecmp(cmd, "NetLength") == 0) { RND_PCB_ACT_CONVARG(2, FGW_STR, Report, name = argv[2].val.str); return report_net_length_by_name(name); } Index: trunk/src_plugins/script/c_script.c =================================================================== --- trunk/src_plugins/script/c_script.c (revision 30941) +++ trunk/src_plugins/script/c_script.c (revision 30942) @@ -72,7 +72,7 @@ return -1; } - library->name = pcb_strdup(filename); + library->name = rnd_strdup(filename); obj->script_data = library; return 0; } Index: trunk/src_plugins/script/live_script.c =================================================================== --- trunk/src_plugins/script/live_script.c (revision 30941) +++ trunk/src_plugins/script/live_script.c (revision 30942) @@ -142,11 +142,11 @@ continue; if (s1 < s2) *s1 = '\0'; else *s2 = '\0'; - eng = pcb_strdup(de->d_name + 6); /* remove the fungw_ prefix, the low level script runner will insert it */ + eng = rnd_strdup(de->d_name + 6); /* remove the fungw_ prefix, the low level script runner will insert it */ el = strlen(eng); eng[el-4] = '\0'; vtp0_append(&ve, eng); - vtp0_append(&vl, pcb_strdup(s)); + vtp0_append(&vl, rnd_strdup(s)); } fclose(f); } @@ -164,9 +164,9 @@ vtp0_init(&vl); vtp0_init(&ve); - vtp0_append(&vl, pcb_strdup("fawk")); vtp0_append(&ve, pcb_strdup("fawk")); - vtp0_append(&vl, pcb_strdup("fbas")); vtp0_append(&ve, pcb_strdup("fbas")); - vtp0_append(&vl, pcb_strdup("fpas")); vtp0_append(&ve, pcb_strdup("fpas")); + vtp0_append(&vl, rnd_strdup("fawk")); vtp0_append(&ve, rnd_strdup("fawk")); + vtp0_append(&vl, rnd_strdup("fbas")); vtp0_append(&ve, rnd_strdup("fbas")); + vtp0_append(&vl, rnd_strdup("fpas")); vtp0_append(&ve, rnd_strdup("fpas")); lvs->langs = (char **)vl.array; lvs->lang_engines = (char **)ve.array; @@ -210,7 +210,7 @@ } lvs->hidlib = hidlib; - lvs->name = pcb_strdup(name); + lvs->name = rnd_strdup(name); lvs->longname = pcb_concat("_live_script_", name, NULL); PCB_DAD_BEGIN_VBOX(lvs->dlg); PCB_DAD_COMPFLAG(lvs->dlg, PCB_HATF_EXPFILL); @@ -443,7 +443,7 @@ rnd_PCB_ACT_MAY_CONVARG(2, FGW_STR, LiveScript, name = argv[2].val.str); rnd_PCB_ACT_MAY_CONVARG(3, FGW_STR, LiveScript, arg = argv[3].val.str); - if (pcb_strcasecmp(cmd, "new") == 0) { + if (rnd_strcasecmp(cmd, "new") == 0) { if (name == NULL) name = "default"; lvs = htsp_get(&pcb_live_scripts, name); if (lvs != NULL) { @@ -475,22 +475,22 @@ } RND_ACT_IRES(0); - if (pcb_strcasecmp(cmd, "load") == 0) { + if (rnd_strcasecmp(cmd, "load") == 0) { RND_ACT_IRES(live_load(NULL, lvs, arg)); } - else if (pcb_strcasecmp(cmd, "save") == 0) { + else if (rnd_strcasecmp(cmd, "save") == 0) { RND_ACT_IRES(live_save(NULL, lvs, arg)); } - else if (pcb_strcasecmp(cmd, "undo") == 0) { + else if (rnd_strcasecmp(cmd, "undo") == 0) { RND_ACT_IRES(live_undo(lvs)); } - else if (pcb_strcasecmp(cmd, "run") == 0) { + else if (rnd_strcasecmp(cmd, "run") == 0) { live_run(NULL, lvs); } - else if (pcb_strcasecmp(cmd, "stop") == 0) { + else if (rnd_strcasecmp(cmd, "stop") == 0) { live_stop(lvs); } - else if (pcb_strcasecmp(cmd, "rerun") == 0) { + else if (rnd_strcasecmp(cmd, "rerun") == 0) { live_stop(lvs); live_undo(lvs); live_run(NULL, lvs); Index: trunk/src_plugins/script/script.c =================================================================== --- trunk/src_plugins/script/script.c (revision 30941) +++ trunk/src_plugins/script/script.c (revision 30942) @@ -249,7 +249,7 @@ static char *script_fn(const char *fn) { if (*fn != '~') - return pcb_strdup(fn); + return rnd_strdup(fn); return pcb_strdup_printf("%s%c%s", pcbhl_conf.rc.path.home, RND_DIR_SEPARATOR_C, fn+1); } @@ -299,9 +299,9 @@ s = calloc(1, sizeof(script_t)); s->pup = pup; - s->id = pcb_strdup(id); + s->id = rnd_strdup(id); s->fn = script_fn(fn); - s->lang = pcb_strdup(lang); + s->lang = rnd_strdup(lang); old_id = script_persistency_id; script_persistency_id = id; @@ -329,8 +329,8 @@ return -1; s = e->value; - fn = pcb_strdup(s->fn); - lang = pcb_strdup(s->lang); + fn = rnd_strdup(s->fn); + lang = rnd_strdup(s->lang); cookie = script_gen_cookie(id); script_unload_entry(e, "reload", cookie); Index: trunk/src_plugins/script/script_act.c =================================================================== --- trunk/src_plugins/script/script_act.c (revision 30941) +++ trunk/src_plugins/script/script_act.c (revision 30942) @@ -98,7 +98,7 @@ /* add all actions */ cell[1] = NULL; for(e = htsp_first(&sc->obj->func_tbl); e; e = htsp_next(&sc->obj->func_tbl, e)) { - cell[0] = pcb_strdup(e->key); + cell[0] = rnd_strdup(e->key); pcb_dad_tree_append(attr, NULL, cell); } } @@ -118,7 +118,7 @@ /* remember cursor */ r = pcb_dad_tree_get_selected(attr); if (r != NULL) - cursor_path = pcb_strdup(r->cell[0]); + cursor_path = rnd_strdup(r->cell[0]); /* remove existing items */ for(r = gdl_first(&tree->rows); r != NULL; r = gdl_first(&tree->rows)) @@ -128,9 +128,9 @@ cell[3] = NULL; for(e = htsp_first(&scripts); e; e = htsp_next(&scripts, e)) { script_t *s = (script_t *)e->value; - cell[0] = pcb_strdup(s->id); - cell[1] = pcb_strdup(s->lang); - cell[2] = pcb_strdup(s->fn); + cell[0] = rnd_strdup(s->id); + cell[1] = rnd_strdup(s->lang); + cell[2] = rnd_strdup(s->fn); pcb_dad_tree_append(attr, NULL, cell); } @@ -208,7 +208,7 @@ tmp = strrchr(fn, RND_DIR_SEPARATOR_C); if (tmp != NULL) { tmp++; - idlang.dlg[idlang.wid].val.str = tmp = pcb_strdup(tmp); + idlang.dlg[idlang.wid].val.str = tmp = rnd_strdup(tmp); tmp = strchr(tmp, '.'); if (tmp != NULL) *tmp = '\0'; @@ -220,7 +220,7 @@ idlang.wlang = PCB_DAD_CURRENT(idlang.dlg); tmp = strrchr(fn, '.'); if (tmp != NULL) - idlang.dlg[idlang.wlang].val.str = pcb_strdup(guess_lang(tmp+1)); + idlang.dlg[idlang.wlang].val.str = rnd_strdup(guess_lang(tmp+1)); PCB_DAD_END(idlang.dlg); PCB_DAD_BUTTON_CLOSES(idlang.dlg, clbtn); PCB_DAD_END(idlang.dlg); @@ -417,7 +417,7 @@ rnd_PCB_ACT_MAY_CONVARG(1, FGW_STR, Oneliner, first = argv[1].val.str); if (first != NULL) { if (*first == '/') { - if (pcb_strcasecmp(scr, "/exit") == 0) { + if (rnd_strcasecmp(scr, "/exit") == 0) { RND_ACT_IRES(rnd_cli_leave()); return 0; } @@ -433,7 +433,7 @@ return 0; } - if (pcb_strcasecmp(scr, "/exit") == 0) { + if (rnd_strcasecmp(scr, "/exit") == 0) { RND_ACT_IRES(rnd_cli_leave()); return 0; } Index: trunk/src_plugins/script/timer.c =================================================================== --- trunk/src_plugins/script/timer.c (revision 30941) +++ trunk/src_plugins/script/timer.c (revision 30942) @@ -53,7 +53,7 @@ return; /* don't even restart the timer if we are not waiting for anything */ } - now = pcb_dtime(); + now = rnd_dtime(); /* we could do something clever here, e.g. sort timers by ->next but in reality there will be so few timers at any given time that it's @@ -134,12 +134,12 @@ rnd_aname(fn, act); len = strlen(fn); t = malloc(sizeof(script_timer_t) + len); - t->next = pcb_dtime() + period; + t->next = rnd_dtime() + period; t->period = period; t->count = count; strcpy(t->aname, fn); if (user_data != NULL) - t->user_data = pcb_strdup(user_data); + t->user_data = rnd_strdup(user_data); else t->user_data = NULL; Index: trunk/src_plugins/shand_cmd/command.c =================================================================== --- trunk/src_plugins/shand_cmd/command.c (revision 30941) +++ trunk/src_plugins/shand_cmd/command.c (revision 30942) @@ -176,7 +176,7 @@ if (pcb_save_pcb(filename, NULL) == 0) { pcb_board_set_changed_flag(pcb_false); free(PCB->hidlib.filename); - PCB->hidlib.filename = pcb_strdup(filename); + PCB->hidlib.filename = rnd_strdup(filename); pcb_event(&PCB->hidlib, PCB_EVENT_BOARD_FN_CHANGED, NULL); } } Index: trunk/src_plugins/shape/shape.c =================================================================== --- trunk/src_plugins/shape/shape.c (revision 30941) +++ trunk/src_plugins/shape/shape.c (revision 30942) @@ -82,8 +82,8 @@ for(n = 0,a = 0; n < corners; n++,a+=da) { rnd_coord_t x, y; - x = pcb_round(cos(a) * (double)rx + (double)cx); - y = pcb_round(sin(a) * (double)ry + (double)cy); + x = rnd_round(cos(a) * (double)rx + (double)cx); + y = rnd_round(sin(a) * (double)ry + (double)cy); if (rot_deg != 0.0) pcb_rotate(&x, &y, cx, cy, cosra, sinra); pcb_poly_point_new(p, x, y); @@ -118,8 +118,8 @@ segs -= 2; for(n = 0,sa+=da; n < segs; n++,sa+=da) { rnd_coord_t x, y; - x = pcb_round((double)cx + cos(sa) * (double)rx); - y = pcb_round((double)cy - sin(sa) * (double)ry); + x = rnd_round((double)cx + cos(sa) * (double)rx); + y = rnd_round((double)cy - sin(sa) * (double)ry); if (need_rot) pcb_rotate(&x, &y, rotcx, rotcy, cosra, sinra); if ((x != lx) || (y != ly)) @@ -137,8 +137,8 @@ } #define CORNER(outx, outy, rect_signx, rect_signy, rsignx, rsigny) \ - outx = pcb_round((double)cx + rect_signx * (double)w/2 + rsignx*rx); \ - outy = pcb_round((double)cy + rect_signy * (double)h/2 + rsigny*ry); + outx = rnd_round((double)cx + rect_signx * (double)w/2 + rsignx*rx); \ + outy = rnd_round((double)cy + rect_signy * (double)h/2 + rsigny*ry); pcb_poly_t *pcb_genpoly_roundrect(pcb_layer_t *layer, rnd_coord_t w, rnd_coord_t h, rnd_coord_t rx, rnd_coord_t ry, double rot_deg, rnd_coord_t cx, rnd_coord_t cy, pcb_shape_corner_t corner[4], double roundres) { pcb_poly_t *p; @@ -164,7 +164,7 @@ if (segs < 3) segs = 3; if (segs > 15) segs = 15; - segs = pcb_round((double)segs * roundres); + segs = rnd_round((double)segs * roundres); p = pcb_poly_new(layer, 2 * conf_core.design.clearance, pcb_flag_make(flags)); if (p == NULL) @@ -227,7 +227,7 @@ else layer = &data.Layer[0]; - rr = pcb_round(minor * roundness); + rr = rnd_round(minor * roundness); p = pcb_genpoly_roundrect(layer, width, height, rr, rr, 0, 0, 0, corner, 4.0); pcb_pstk_shape_alloc_poly(dst, p->PointN); shape->shape = PCB_PSSH_POLY; @@ -317,7 +317,7 @@ rnd_bool succ; dst = arg; - if (pcb_strncasecmp(dst, "buffer", 6) == 0) { + if (rnd_strncasecmp(dst, "buffer", 6) == 0) { *data = PCB_PASTEBUFFER->Data; dst += 6; a = 1; @@ -332,7 +332,7 @@ *have_coords = pcb_true; a = 1; - tmp = pcb_strdup(dst); + tmp = rnd_strdup(dst); tmp[offs] = '\0'; sx = tmp; sy = tmp + offs + 1; @@ -360,7 +360,7 @@ dst = arg; end = strchr(dst, ';'); if (end != NULL) { - char *sx, *sy, *tmp = pcb_strdup(dst); + char *sx, *sy, *tmp = rnd_strdup(dst); int offs = end - dst; tmp[offs] = '\0'; sx = tmp; Index: trunk/src_plugins/stroke/stroke.c =================================================================== --- trunk/src_plugins/stroke/stroke.c (revision 30941) +++ trunk/src_plugins/stroke/stroke.c (revision 30942) @@ -122,7 +122,7 @@ RND_ACT_FAIL(stroke); pcb_stroke_exec(RND_ACT_HIDLIB, arg); } - else if (pcb_strcasecmp(cmd, "zoom") == 0) { + else if (rnd_strcasecmp(cmd, "zoom") == 0) { fgw_arg_t args[5]; fgw_func_t *f = fgw_func_lookup(&rnd_fgw, "zoomto"); @@ -139,7 +139,7 @@ args[4].type = FGW_COORD; fgw_coord(&args[4]) = stroke_last_y; return rnd_actionv_(f, res, 5, args); } - else if (pcb_strcasecmp(cmd, "stopline") == 0) + else if (rnd_strcasecmp(cmd, "stopline") == 0) rnd_actionva(RND_ACT_HIDLIB, "Tool", "Escape", NULL); else RND_ACT_FAIL(stroke); Index: trunk/src_plugins/vendordrill/vendor.c =================================================================== --- trunk/src_plugins/vendordrill/vendor.c (revision 30941) +++ trunk/src_plugins/vendordrill/vendor.c (revision 30942) @@ -160,7 +160,7 @@ default_file = NULL; if (fname && *fname) - default_file = pcb_strdup(fname); + default_file = rnd_strdup(fname); } vendor_free_all(); @@ -524,7 +524,7 @@ fprintf(stderr, "realloc() failed\n"); exit(-1); } - (*lst)[*cnt - 1] = pcb_strdup(sval); + (*lst)[*cnt - 1] = rnd_strdup(sval); } else pcb_hid_cfg_error(n, "invalid skip type; must be text"); Index: trunk/tests/conf/conftest.c =================================================================== --- trunk/tests/conf/conftest.c (revision 30941) +++ trunk/tests/conf/conftest.c (revision 30942) @@ -198,7 +198,7 @@ *end = '\0'; sprintf(tmp, "%s-%d", first->name, np); free(first->name); - first->name = pcb_strdup(tmp); + first->name = rnd_strdup(tmp); pcb_conf_update(NULL, -1); } } @@ -226,11 +226,11 @@ if (end != NULL) { sprintf(tmp, "%s%s", arg, end); free(first->name); - first->name = pcb_strdup(tmp); + first->name = rnd_strdup(tmp); } else { free(first->name); - first->name = pcb_strdup(arg); + first->name = rnd_strdup(arg); } pcb_conf_update(NULL, -1); } Index: trunk/util/gsch2pcb-rnd/gsch2pcb.c =================================================================== --- trunk/util/gsch2pcb-rnd/gsch2pcb.c (revision 30941) +++ trunk/util/gsch2pcb-rnd/gsch2pcb.c (revision 30942) @@ -114,12 +114,12 @@ { char **n; n = gadl_new(&schematics); - *n = pcb_strdup(sch); + *n = rnd_strdup(sch); gadl_append(&schematics, n); if (!conf_g2pr.utils.gsch2pcb_rnd.sch_basename) { const char *suff = loc_str_has_suffix(sch, ".sch", 4); if (suff != NULL) { - char *tmp = pcb_strndup(sch, suff - sch); + char *tmp = rnd_strndup(sch, suff - sch); pcb_conf_set(CFR_CLI, "utils/gsch2pcb_rnd/sch_basename", -1, tmp, POL_OVERWRITE); free(tmp); } @@ -131,7 +131,7 @@ /* parse the string using shell semantics */ int count; char **args; - char *tmp = pcb_strdup(sch); + char *tmp = rnd_strdup(sch); count = qparse(tmp, &args); free(tmp); @@ -198,7 +198,7 @@ else if (!strcmp(config, "gnetlist")) { char **n; n = gadl_new(&extra_gnetlist_list); - *n = pcb_strdup(arg); + *n = rnd_strdup(arg); gadl_append(&extra_gnetlist_list, n); } else if (!strcmp(config, "empty-footprint")) @@ -326,7 +326,7 @@ else if (!strcmp(opt, "gnetlist-arg")) { char **n; n = gadl_new(&extra_gnetlist_arg_list); - *n = pcb_strdup(arg); + *n = rnd_strdup(arg); gadl_append(&extra_gnetlist_arg_list, n); i++; continue; Index: trunk/util/gsch2pcb-rnd/netlister.c =================================================================== --- trunk/util/gsch2pcb-rnd/netlister.c (revision 30941) +++ trunk/util/gsch2pcb-rnd/netlister.c (revision 30942) @@ -93,11 +93,11 @@ char *backend; if (!s2) { out_file = pcb_concat(basename, ".", s, NULL); - backend = pcb_strdup(s); + backend = rnd_strdup(s); } else { - out_file = pcb_strdup(s2 + 4); - backend = pcb_strndup(s, s2 - s); + out_file = rnd_strdup(s2 + 4); + backend = rnd_strndup(s, s2 - s); } if (!build_and_run_command("%s %s -g %s -o %s %L %L", Index: trunk/util/gsch2pcb-rnd/run.c =================================================================== --- trunk/util/gsch2pcb-rnd/run.c (revision 30941) +++ trunk/util/gsch2pcb-rnd/run.c (revision 30942) @@ -41,7 +41,7 @@ within a copy of the format string. The format string is copied so that these parts can be terminated by overwriting whitepsace with \0 */ va_start(vargs, format_); - format = pcb_strdup(format_); + format = rnd_strdup(format_); vts0_init(&args); for(s = start = format; *s != '\0'; s++) { /* if word separator is reached, save the previous word */