Index: trunk/src/actions_pcb.c =================================================================== --- trunk/src/actions_pcb.c (revision 31006) +++ trunk/src/actions_pcb.c (revision 31007) @@ -86,7 +86,7 @@ ARG_CONV_CASE_INVALID(tmp, conv_err) case FGW_AUTO: case FGW_STR: - arg->val.str = (char *)pcb_strdup_printf("#%ld", (long)tmp); + arg->val.str = (char *)rnd_strdup_printf("#%ld", (long)tmp); arg->type = FGW_STR | FGW_DYN; return 0; } @@ -171,7 +171,7 @@ ARG_CONV_CASE_INVALID(tmp, conv_err) case FGW_AUTO: case FGW_STR: - arg->val.str = (char *)pcb_strdup_printf("#%ld", (long)tmp); + arg->val.str = (char *)rnd_strdup_printf("#%ld", (long)tmp); arg->type = FGW_STR | FGW_DYN; return 0; } Index: trunk/src/board.c =================================================================== --- trunk/src/board.c (revision 31006) +++ trunk/src/board.c (revision 31007) @@ -290,7 +290,7 @@ static void undo_board_size_print(void *udata, char *dst, size_t dst_len) { undo_board_size_t *s = udata; - pcb_snprintf(dst, dst_len, "board_size: %mmx%mm", s->w, s->h); + rnd_snprintf(dst, dst_len, "board_size: %mmx%mm", s->w, s->h); } static const uundo_oper_t undo_board_size = { Index: trunk/src/change.c =================================================================== --- trunk/src/change.c (revision 31006) +++ trunk/src/change.c (revision 31007) @@ -940,7 +940,7 @@ static void undo_chg_attr_print(void *udata, char *dst, size_t dst_len) { chg_attr_t *ca = udata; - pcb_snprintf(dst, dst_len, "chg_attr: #%ld/%s to '%s'\n", + rnd_snprintf(dst, dst_len, "chg_attr: #%ld/%s to '%s'\n", ca->obj->ID, ca->key, ca->delete ? "" : ca->value); } Index: trunk/src/conf_core.c =================================================================== --- trunk/src/conf_core.c (revision 31006) +++ trunk/src/conf_core.c (revision 31007) @@ -35,7 +35,7 @@ const char *dst_path = ndst->hash_path; gds_init(&tmp); - rnd_conf_print_native_field((rnd_conf_pfn)pcb_append_printf, &tmp, 0, &nlegacy->val, nlegacy->type, nlegacy->prop, 0); + rnd_conf_print_native_field((rnd_conf_pfn)rnd_append_printf, &tmp, 0, &nlegacy->val, nlegacy->type, nlegacy->prop, 0); if (tmp.used > 0) rnd_conf_set(RND_CFR_INTERNAL, dst_path, -1, tmp.array, RND_POL_OVERWRITE); gds_uninit(&tmp); Index: trunk/src/data.c =================================================================== --- trunk/src/data.c (revision 31006) +++ trunk/src/data.c (revision 31007) @@ -1012,7 +1012,7 @@ { if (addr == 0) *buf = '\0'; else if (addr == 1) strcpy(buf, "pcb"); - else pcb_snprintf(buf, 16, "buffer#%d", addr-2); + else rnd_snprintf(buf, 16, "buffer#%d", addr-2); return buf; } @@ -1042,7 +1042,7 @@ for(n = 0; n < PCB_MAX_BUFFER; n++) { if (data == pcb_buffers[n].Data) { - pcb_sprintf(buf, "buffer#%d", n); + rnd_sprintf(buf, "buffer#%d", n); return buf; } } Index: trunk/src/draw.c =================================================================== --- trunk/src/draw.c (revision 31006) +++ trunk/src/draw.c (revision 31007) @@ -1205,7 +1205,7 @@ /* fallback when template is not available or failed */ if (intconn <= 0) return lab; - pcb_snprintf(buff, bufflen, "%s[%d]", lab, intconn); + rnd_snprintf(buff, bufflen, "%s[%d]", lab, intconn); return buff; } Index: trunk/src/drc.c =================================================================== --- trunk/src/drc.c (revision 31006) +++ trunk/src/drc.c (revision 31007) @@ -96,12 +96,12 @@ 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); if (v->have_bbox) - pcb_printf("%m+within %$m4\n", rnd_conf.editor.grid_unit->allow, v->bbox.X1, v->bbox.Y1, v->bbox.X2, v->bbox.Y2); + rnd_printf("%m+within %$m4\n", rnd_conf.editor.grid_unit->allow, v->bbox.X1, v->bbox.Y1, v->bbox.X2, v->bbox.Y2); if (v->have_xy) - pcb_printf("%m+at %$m2\n", rnd_conf.editor.grid_unit->allow, v->x, v->y); - pcb_printf("%m+required value %$mS\n", rnd_conf.editor.grid_unit->allow, v->data.drc.required_value); + rnd_printf("%m+at %$m2\n", rnd_conf.editor.grid_unit->allow, v->x, v->y); + rnd_printf("%m+required value %$mS\n", rnd_conf.editor.grid_unit->allow, v->data.drc.required_value); if (v->data.drc.have_measured) - pcb_printf("%m+measured value %$mS\n", rnd_conf.editor.grid_unit->allow, v->data.drc.measured_value); + rnd_printf("%m+measured value %$mS\n", rnd_conf.editor.grid_unit->allow, v->data.drc.measured_value); printf("%s\n\n", v->description); } } @@ -113,7 +113,7 @@ rnd_message(RND_MSG_INFO, "%m+within %$m4\n", rnd_conf.editor.grid_unit->allow, v->bbox.X1, v->bbox.Y1, v->bbox.X2, v->bbox.Y2); if (v->have_xy) rnd_message(RND_MSG_INFO, "%m+at %$m2\n", rnd_conf.editor.grid_unit->allow, v->x, v->y); - pcb_printf("%m+required value %$mS\n", rnd_conf.editor.grid_unit->allow, v->data.drc.required_value); + rnd_printf("%m+required value %$mS\n", rnd_conf.editor.grid_unit->allow, v->data.drc.required_value); if (v->data.drc.have_measured) rnd_message(RND_MSG_INFO, "%m+measured value %$mS\n", rnd_conf.editor.grid_unit->allow, v->data.drc.measured_value); rnd_message(RND_MSG_INFO, "%s\n\n", v->description); @@ -127,12 +127,12 @@ printf("T%s\n", v->type); printf("t%s\n", v->title); if (v->have_bbox) - pcb_printf("B%mm %mm %mm %mm mm\n", v->bbox.X1, v->bbox.Y1, v->bbox.X2, v->bbox.Y2); + rnd_printf("B%mm %mm %mm %mm mm\n", v->bbox.X1, v->bbox.Y1, v->bbox.X2, v->bbox.Y2); if (v->have_xy) - pcb_printf("A%mm %mm mm\n", v->x, v->y); - pcb_printf("R%$mm\n", v->data.drc.required_value); + rnd_printf("A%mm %mm mm\n", v->x, v->y); + rnd_printf("R%$mm\n", v->data.drc.required_value); if (v->data.drc.have_measured) - pcb_printf("M%$mm\n", v->data.drc.measured_value); + rnd_printf("M%$mm\n", v->data.drc.measured_value); for(s = v->description; *s != '\0'; s++) if (*s == '\n') *s = ' '; Index: trunk/src/extobj_helper.h =================================================================== --- trunk/src/extobj_helper.h (revision 31006) +++ trunk/src/extobj_helper.h (revision 31007) @@ -167,7 +167,7 @@ pcb_subc_t *subc = caller_data; char tmp[128]; - pcb_snprintf(tmp, sizeof(tmp), "%$mm", attr->val.crd); + rnd_snprintf(tmp, sizeof(tmp), "%$mm", attr->val.crd); pcb_exto_dlg_gui_chg_attr(subc, attr, tmp); } @@ -227,7 +227,7 @@ pcb_subc_t *subc = caller_data; char tmp[128]; - pcb_snprintf(tmp, sizeof(tmp), "%d", attr->val.lng); + rnd_snprintf(tmp, sizeof(tmp), "%d", attr->val.lng); pcb_exto_dlg_gui_chg_attr(subc, attr, tmp); } Index: trunk/src/file_act.c =================================================================== --- trunk/src/file_act.c (revision 31006) +++ trunk/src/file_act.c (revision 31007) @@ -437,7 +437,7 @@ subclist_foreach(&src->subc, &sit, subc) { FILE *f; - char *fullname = pcb_strdup_printf("%s.%ld%s%s", name, (long)sit.count, sep, ending); + char *fullname = rnd_strdup_printf("%s.%ld%s%s", name, (long)sit.count, sep, ending); f = pcb_fopen(RND_ACT_HIDLIB, fullname, "w"); free(fullname); Index: trunk/src/gui_act.c =================================================================== --- trunk/src/gui_act.c (revision 31006) +++ trunk/src/gui_act.c (revision 31007) @@ -912,7 +912,7 @@ if (name != NULL) g->name = rnd_strdup(name); else - g->name = pcb_strdup_printf("%s%s%s", sloc == NULL ? "" : sloc, sloc == NULL ? "" : "-", stype); + g->name = rnd_strdup_printf("%s%s%s", sloc == NULL ? "" : sloc, sloc == NULL ? "" : "-", stype); g->ltype = ltype | lloc; g->vis = 1; g->open = 1; Index: trunk/src/hid_cam.c =================================================================== --- trunk/src/hid_cam.c (revision 31006) +++ trunk/src/hid_cam.c (revision 31007) @@ -61,7 +61,7 @@ ctx.cam = dst; ctx.vars = pcb_cam_vars; free(dst->fn); - dst->fn = pcb_strdup_subst(dst->fn_template, cam_update_name_cb, &ctx, PCB_SUBST_HOME | PCB_SUBST_PERCENT | PCB_SUBST_CONF); + dst->fn = rnd_strdup_subst(dst->fn_template, cam_update_name_cb, &ctx, RND_SUBST_HOME | RND_SUBST_PERCENT | RND_SUBST_CONF); } @@ -85,10 +85,10 @@ if (styp == NULL) styp = "none"; if (purpose == NULL) purpose = "none"; if (group < 0) { - pcb_append_printf(dest, "%s.%s.%s.none", sloc, styp, purpose); + rnd_append_printf(dest, "%s.%s.%s.none", sloc, styp, purpose); } else - pcb_append_printf(dest, "%s.%s.%s.%ld", sloc, styp, purpose, group); + rnd_append_printf(dest, "%s.%s.%s.%ld", sloc, styp, purpose, group); return dest->array; } @@ -115,7 +115,7 @@ else if (flags & PCB_LYT_PASTE) res = "toppaste"; else if (purpose != NULL) { - pcb_snprintf(buf, sizeof(buf), "top-%s", purpose); + rnd_snprintf(buf, sizeof(buf), "top-%s", purpose); res = buf; } else @@ -129,7 +129,7 @@ else if (flags & PCB_LYT_PASTE) res = "bottompaste"; else if (purpose != NULL) { - pcb_snprintf(buf, sizeof(buf), "bottom-%s", purpose); + rnd_snprintf(buf, sizeof(buf), "bottom-%s", purpose); res = buf; } else @@ -444,7 +444,7 @@ tune = get_tune(input); pcb_layergrp_dist(PCB, pcb_layergrp_id(PCB, ctx->grp), tcop_id, PCB_LYT_COPPER, &from_top); - pcb_append_printf(s, "%d", from_top+tune); + rnd_append_printf(s, "%d", from_top+tune); } else if (strncmp(*input, "bot_offs", 8) == 0) { int tune, from_bot = -1; @@ -455,7 +455,7 @@ tune = get_tune(input); pcb_layergrp_dist(PCB, pcb_layergrp_id(PCB, ctx->grp), bcop_id, PCB_LYT_COPPER, &from_bot); - pcb_append_printf(s, "%d", from_bot+tune); + rnd_append_printf(s, "%d", from_bot+tune); } else { char *end = strchr(*input, '%'); @@ -498,7 +498,7 @@ ctx.grp = pcb_get_layergrp(cam->pcb, gid); ctx.vl = vl; ctx.vars = pcb_cam_vars; - cam->fn = pcb_strdup_subst(cam->fn_template, cam_update_name_cb, &ctx, PCB_SUBST_HOME | PCB_SUBST_PERCENT | PCB_SUBST_CONF); + cam->fn = rnd_strdup_subst(cam->fn_template, cam_update_name_cb, &ctx, RND_SUBST_HOME | RND_SUBST_PERCENT | RND_SUBST_CONF); if ((cam->fn_last == NULL) || (strcmp(cam->fn, cam->fn_last) != 0)) { cam->fn_changed = 1; free(cam->fn_last); Index: trunk/src/idpath.c =================================================================== --- trunk/src/idpath.c (revision 31006) +++ trunk/src/idpath.c (revision 31007) @@ -173,7 +173,7 @@ } for(n = 0; n < idp->len; n++) - pcb_append_printf(dst, "/%ld", idp->id[n]); + rnd_append_printf(dst, "/%ld", idp->id[n]); } char *pcb_idpath2str(const pcb_idpath_t *idp, rnd_bool relative) Index: trunk/src/layer.c =================================================================== --- trunk/src/layer.c (revision 31006) +++ trunk/src/layer.c (revision 31007) @@ -582,7 +582,7 @@ static void undo_layer_rename_print(void *udata, char *dst, size_t dst_len) { undo_layer_rename_t *r = udata; - pcb_snprintf(dst, dst_len, "rename layer: '%s' -> '%s'", r->layer->name, r->name); + rnd_snprintf(dst, dst_len, "rename layer: '%s' -> '%s'", r->layer->name, r->name); } static void undo_layer_rename_free(void *udata) @@ -654,7 +654,7 @@ static void undo_layer_recolor_print(void *udata, char *dst, size_t dst_len) { undo_layer_recolor_t *r = udata; - pcb_snprintf(dst, dst_len, "recolor layer: '%s' -> '%s'", r->layer->meta.real.color.str, r->color.str); + rnd_snprintf(dst, dst_len, "recolor layer: '%s' -> '%s'", r->layer->meta.real.color.str, r->color.str); } static const uundo_oper_t undo_layer_recolor = { @@ -961,7 +961,7 @@ static void undo_layer_move_print(void *udata, char *dst, size_t dst_len) { undo_layer_move_t *m = udata; - pcb_snprintf(dst, dst_len, "layer_move: %s %s lid=%ld grp=%ld", m->append ? "append" : "delete", m->name, m->lid, m->grp); + rnd_snprintf(dst, dst_len, "layer_move: %s %s lid=%ld grp=%ld", m->append ? "append" : "delete", m->name, m->lid, m->grp); } static void undo_layer_move_free(void *udata) @@ -1487,7 +1487,7 @@ void pcb_layer_edit_attrib(pcb_layer_t *layer) { - char *buf = pcb_strdup_printf("Layer %s Attributes", layer->name); + char *buf = rnd_strdup_printf("Layer %s Attributes", layer->name); rnd_gui->edit_attributes(rnd_gui, buf, &(layer->Attributes)); free(buf); } Index: trunk/src/layer_grp.c =================================================================== --- trunk/src/layer_grp.c (revision 31006) +++ trunk/src/layer_grp.c (revision 31007) @@ -546,7 +546,7 @@ static void undo_layergrp_steply_print(void *udata, char *dst, size_t dst_len) { undo_layergrp_steply_t *s = udata; - pcb_snprintf(dst, dst_len, "step layer in grp: #%ld/#%ld: %+d", s->gid, s->lid, s->delta); + rnd_snprintf(dst, dst_len, "step layer in grp: #%ld/#%ld: %+d", s->gid, s->lid, s->delta); } static const uundo_oper_t undo_layergrp_steply = { @@ -653,7 +653,7 @@ static void undo_layergrp_del_print(void *udata, char *dst, size_t dst_len) { undo_layergrp_del_t *r = udata; - pcb_snprintf(dst, dst_len, "layergrp %s: '%s'", r->del ? "delete" : "insert", r->del ? r->save.name : pcb_layergrp_name(r->pcb, r->gid)); + rnd_snprintf(dst, dst_len, "layergrp %s: '%s'", r->del ? "delete" : "insert", r->del ? r->save.name : pcb_layergrp_name(r->pcb, r->gid)); } static const uundo_oper_t undo_layergrp_del = { @@ -1018,7 +1018,7 @@ static void undo_layergrp_rename_print(void *udata, char *dst, size_t dst_len) { undo_layergrp_rename_t *r = udata; - pcb_snprintf(dst, dst_len, "rename layergrp: '%s' -> '%s'", r->grp->name, r->name); + rnd_snprintf(dst, dst_len, "rename layergrp: '%s' -> '%s'", r->grp->name, r->name); } static void undo_layergrp_rename_free(void *udata) @@ -1092,7 +1092,7 @@ static void undo_layergrp_repurp_print(void *udata, char *dst, size_t dst_len) { undo_layergrp_repurp_t *r = udata; - pcb_snprintf(dst, dst_len, "repurpose layergrp: '%s' -> '%s'", r->grp->purpose, r->purps); + rnd_snprintf(dst, dst_len, "repurpose layergrp: '%s' -> '%s'", r->grp->purpose, r->purps); } static void undo_layergrp_repurp_free(void *udata) @@ -1174,7 +1174,7 @@ static void undo_layergrp_ltype_print(void *udata, char *dst, size_t dst_len) { undo_layergrp_ltype_t *r = udata; - pcb_snprintf(dst, dst_len, "layergrp type: '%lx' -> '%lx'", r->grp->ltype, r->ltype); + rnd_snprintf(dst, dst_len, "layergrp type: '%lx' -> '%lx'", r->grp->ltype, r->ltype); } static const uundo_oper_t undo_layergrp_ltype = { Index: trunk/src/librnd/core/actions.c =================================================================== --- trunk/src/librnd/core/actions.c (revision 31006) +++ trunk/src/librnd/core/actions.c (revision 31007) @@ -806,7 +806,7 @@ ARG_CONV_CASE_INVALID(tmp, conv_err) case FGW_AUTO: case FGW_STR: - arg->val.str = (char *)pcb_strdup_printf("%.08$mH", tmp); + arg->val.str = (char *)rnd_strdup_printf("%.08$mH", tmp); arg->type = FGW_STR | FGW_DYN; return 0; } @@ -867,7 +867,7 @@ ARG_CONV_CASE_INVALID(tmp, conv_err) case FGW_AUTO: case FGW_STR: - arg->val.str = (char *)pcb_strdup_printf("%.08$mH", tmp); + arg->val.str = (char *)rnd_strdup_printf("%.08$mH", tmp); arg->type = FGW_STR | FGW_DYN; return 0; } Index: trunk/src/librnd/core/conf.c =================================================================== --- trunk/src/librnd/core/conf.c (revision 31006) +++ trunk/src/librnd/core/conf.c (revision 31007) @@ -291,7 +291,7 @@ int res = conf_merge_plug(d, role, path); if (res) { char id[256]; - pcb_snprintf(id, sizeof(id), "%s:%s", rnd_conf_role_name(role), fn); + rnd_snprintf(id, sizeof(id), "%s:%s", rnd_conf_role_name(role), fn); rnd_file_loaded_set_at("conf/plugin", id, path, NULL); } cnt += res; @@ -1831,7 +1831,7 @@ } } else { - rnd_conf_print_native_field((rnd_conf_pfn)pcb_append_printf, &s, 0, &n->val, n->type, n->prop+i, i); + rnd_conf_print_native_field((rnd_conf_pfn)rnd_append_printf, &s, 0, &n->val, n->type, n->prop+i, i); ch = lht_dom_node_alloc(LHT_TEXT, isarr ? "" : name+1); ch->data.text.value = s.array; if (isarr) @@ -2229,7 +2229,7 @@ va_list ap; va_start(ap, fmt); - tmp = pcb_strdup_vprintf(fmt, ap); + tmp = rnd_strdup_vprintf(fmt, ap); va_end(ap); rnd_conf_set(role, path, idx, tmp, RND_POL_OVERWRITE); Index: trunk/src/librnd/core/conf_act.c =================================================================== --- trunk/src/librnd/core/conf_act.c (revision 31006) +++ trunk/src/librnd/core/conf_act.c (revision 31007) @@ -49,7 +49,7 @@ int res; va_list ap; va_start(ap, fmt); - res = pcb_safe_append_vprintf((gds_t *)ctx, 0, fmt, ap); + res = rnd_safe_append_vprintf((gds_t *)ctx, 0, fmt, ap); va_end(ap); return res; } Index: trunk/src/librnd/core/error.c =================================================================== --- trunk/src/librnd/core/error.c (revision 31006) +++ trunk/src/librnd/core/error.c (revision 31007) @@ -42,7 +42,7 @@ #ifndef NDEBUG va_list args; va_start(args, Format); - pcb_vfprintf(stderr, Format, args); + rnd_vfprintf(stderr, Format, args); va_end(args); #endif } @@ -63,7 +63,7 @@ if ((level >= min_level) || (rnd_conf.rc.verbose)) { va_start(args, Format); - pcb_vfprintf(stderr, Format, args); + rnd_vfprintf(stderr, Format, args); va_end(args); } } @@ -74,7 +74,7 @@ gds_enlarge(&tmp, sizeof(rnd_logline_t)); tmp.used = offsetof(rnd_logline_t, str); va_start(args, Format); - pcb_safe_append_vprintf(&tmp, 0, Format, args); + rnd_safe_append_vprintf(&tmp, 0, Format, args); va_end(args); /* add the header and link in */ Index: trunk/src/librnd/core/grid.c =================================================================== --- trunk/src/librnd/core/grid.c (revision 31006) +++ trunk/src/librnd/core/grid.c (revision 31007) @@ -144,9 +144,9 @@ gds_append_str(dst, src->name); gds_append(dst, ':'); } - pcb_append_printf(dst, "%$.08mH", src->size); + rnd_append_printf(dst, "%$.08mH", src->size); if ((src->ox != 0) || (src->oy != 0)) - pcb_append_printf(dst, "@%$.08mH,%$.08mH", src->ox, src->oy); + rnd_append_printf(dst, "@%$.08mH,%$.08mH", src->ox, src->oy); if (src->unit != NULL) { gds_append(dst, '!'); gds_append_str(dst, src->unit->suffix); Index: trunk/src/librnd/core/hid_cfg.c =================================================================== --- trunk/src/librnd/core/hid_cfg.c (revision 31006) +++ trunk/src/librnd/core/hid_cfg.c (revision 31007) @@ -368,11 +368,11 @@ va_list ap; int len, maxlen = sizeof(hid_cfg_error_shared); - len = pcb_snprintf(hid_cfg_error_shared, maxlen, "Error in lihata node %s:%d.%d:", node->file_name, node->line, node->col); + len = rnd_snprintf(hid_cfg_error_shared, maxlen, "Error in lihata node %s:%d.%d:", node->file_name, node->line, node->col); end = hid_cfg_error_shared + len; maxlen -= len; va_start(ap, fmt); - end += pcb_vsnprintf(end, maxlen, fmt, ap); + end += rnd_vsnprintf(end, maxlen, fmt, ap); va_end(ap); rnd_message(RND_MSG_ERROR, hid_cfg_error_shared); } Index: trunk/src/librnd/core/hid_dad.h =================================================================== --- trunk/src/librnd/core/hid_dad.h (revision 31006) +++ trunk/src/librnd/core/hid_dad.h (revision 31007) @@ -265,7 +265,7 @@ #define RND_DAD_LABELF(table, printf_args) \ do { \ RND_DAD_ALLOC(table, RND_HATT_LABEL); \ - RND_DAD_SET_ATTR_FIELD(table, name, pcb_strdup_printf printf_args); \ + RND_DAD_SET_ATTR_FIELD(table, name, rnd_strdup_printf printf_args); \ } while(0) #define RND_DAD_ENUM(table, choices) \ Index: trunk/src/librnd/core/hid_dad_spin.c =================================================================== --- trunk/src/librnd/core/hid_dad_spin.c (revision 31006) +++ trunk/src/librnd/core/hid_dad_spin.c (revision 31007) @@ -116,10 +116,10 @@ else unit = rnd_conf.editor.grid_unit; if (buf != NULL) { - pcb_snprintf(buf, buflen, "%$m*", unit->suffix, c); + rnd_snprintf(buf, buflen, "%$m*", unit->suffix, c); return buf; } - return pcb_strdup_printf("%$m*", unit->suffix, c); + return rnd_strdup_printf("%$m*", unit->suffix, c); } typedef struct { @@ -152,7 +152,7 @@ rnd_gui->attr_dlg_set_value(hid_ctx, su->wunit, &hv); } - pcb_snprintf(su->buf, sizeof(su->buf), "%$m*", unit->suffix, su->end->val.crd); + rnd_snprintf(su->buf, sizeof(su->buf), "%$m*", unit->suffix, su->end->val.crd); hv.str = su->buf; rnd_gui->attr_dlg_set_value(hid_ctx, su->wout, &hv); if (!is_globbing && can_glob) { @@ -503,12 +503,12 @@ case RND_DAD_SPIN_INT: attr->val.lng = l; free((char *)str->val.str); - str->val.str = pcb_strdup_printf("%ld", l); + str->val.str = rnd_strdup_printf("%ld", l); break; case RND_DAD_SPIN_DOUBLE: attr->val.dbl = d; free((char *)str->val.str); - str->val.str = pcb_strdup_printf("%f", d); + str->val.str = rnd_strdup_printf("%f", d); break; case RND_DAD_SPIN_COORD: attr->val.crd = c; Index: trunk/src/librnd/core/hid_init.c =================================================================== --- trunk/src/librnd/core/hid_init.c (revision 31006) +++ trunk/src/librnd/core/hid_init.c (revision 31007) @@ -543,7 +543,7 @@ if ((strcmp(cmd, "?") == 0) || (strcmp(cmd, "h") == 0) || (strcmp(cmd, "-help") == 0)) { if (arg != NULL) { /* memory leak, but who cares for --help? */ - ga->main_action = pcb_strdup_printf("PrintUsage(%s)", arg); + ga->main_action = rnd_strdup_printf("PrintUsage(%s)", arg); return 1; } ga->main_action = "PrintUsage()"; Index: trunk/src/librnd/core/paths.c =================================================================== --- trunk/src/librnd/core/paths.c (revision 31006) +++ trunk/src/librnd/core/paths.c (revision 31007) @@ -115,23 +115,23 @@ char *rnd_build_fn(rnd_hidlib_t *hidlib, const char *template) { - pcb_strdup_subst_t sbs = PCB_SUBST_ALL; + rnd_strdup_subst_t sbs = RND_SUBST_ALL; #ifdef __WIN32__ - sbs &= ~PCB_SUBST_BACKSLASH; + sbs &= ~RND_SUBST_BACKSLASH; #endif - return pcb_strdup_subst(template, rnd_build_fn_cb, hidlib, sbs); + return rnd_strdup_subst(template, rnd_build_fn_cb, hidlib, sbs); } char *rnd_build_argfn(const char *template, rnd_build_argfn_t *arg) { - pcb_strdup_subst_t sbs = PCB_SUBST_ALL; + rnd_strdup_subst_t sbs = RND_SUBST_ALL; #ifdef __WIN32__ - sbs &= ~PCB_SUBST_BACKSLASH; + sbs &= ~RND_SUBST_BACKSLASH; #endif - return pcb_strdup_subst(template, rnd_build_argfn_cb, arg, sbs); + return rnd_strdup_subst(template, rnd_build_argfn_cb, arg, sbs); } -int pcb_subst_append(gds_t *s, const char *template, int (*cb)(void *ctx, gds_t *s, const char **input), void *ctx, pcb_strdup_subst_t flags, size_t extra_room) +int rnd_subst_append(gds_t *s, const char *template, int (*cb)(void *ctx, gds_t *s, const char **input), void *ctx, rnd_strdup_subst_t flags, size_t extra_room) { const char *curr, *next; @@ -150,9 +150,9 @@ } #endif - if ((*template == '~') && (flags & PCB_SUBST_HOME)) { + if ((*template == '~') && (flags & RND_SUBST_HOME)) { if (rnd_conf.rc.path.home == NULL) { - rnd_message(RND_MSG_ERROR, "pcb_strdup_subst(): can't resolve home dir required for path %s\n", template); + rnd_message(RND_MSG_ERROR, "rnd_strdup_subst(): can't resolve home dir required for path %s\n", template); goto error; } gds_append_str(s, rnd_conf.rc.path.home); @@ -171,7 +171,7 @@ switch(*next) { case '\\': - if (flags & PCB_SUBST_BACKSLASH) { + if (flags & RND_SUBST_BACKSLASH) { char c; next++; switch(*next) { @@ -190,7 +190,7 @@ } break; case '%': - if (flags & PCB_SUBST_PERCENT) { + if (flags & RND_SUBST_PERCENT) { next++; switch(*next) { case '%': @@ -211,7 +211,7 @@ } break; case '$': - if (flags & PCB_SUBST_CONF) { + if (flags & RND_SUBST_CONF) { const char *start, *end; next++; switch(*next) { @@ -224,8 +224,8 @@ char path[256], *q; size_t len = end - start; if (len > sizeof(path) - 1) { - if (!(flags & PCB_SUBST_QUIET)) - rnd_message(RND_MSG_ERROR, "pcb_strdup_subst(): can't resolve $() conf var, name too long: %s\n", start); + if (!(flags & RND_SUBST_QUIET)) + rnd_message(RND_MSG_ERROR, "rnd_strdup_subst(): can't resolve $() conf var, name too long: %s\n", start); goto error; } memcpy(path, start, len); @@ -235,13 +235,13 @@ *q = '/'; cn = rnd_conf_get_field(path); if (cn == NULL) { - if (!(flags & PCB_SUBST_QUIET)) - rnd_message(RND_MSG_ERROR, "pcb_strdup_subst(): can't resolve $(%s) conf var: not found in the conf tree\n", path); + if (!(flags & RND_SUBST_QUIET)) + rnd_message(RND_MSG_ERROR, "rnd_strdup_subst(): can't resolve $(%s) conf var: not found in the conf tree\n", path); goto error; } if (cn->type != RND_CFN_STRING) { - if (!(flags & PCB_SUBST_QUIET)) - rnd_message(RND_MSG_ERROR, "pcb_strdup_subst(): can't resolve $(%s) conf var: value type is not string\n", path); + if (!(flags & RND_SUBST_QUIET)) + rnd_message(RND_MSG_ERROR, "rnd_strdup_subst(): can't resolve $(%s) conf var: value type is not string\n", path); goto error; } if (cn->val.string[0] != NULL) { @@ -259,8 +259,8 @@ curr = end+1; } else { - if (!(flags & PCB_SUBST_QUIET)) - rnd_message(RND_MSG_ERROR, "pcb_strdup_subst(): unterminated $(%s)\n", start); + if (!(flags & RND_SUBST_QUIET)) + rnd_message(RND_MSG_ERROR, "rnd_strdup_subst(): unterminated $(%s)\n", start); goto error; } break; @@ -287,7 +287,7 @@ return -1; } -static char *pcb_strdup_subst_(const char *template, int (*cb)(void *ctx, gds_t *s, const char **input), void *ctx, pcb_strdup_subst_t flags, size_t extra_room) +static char *pcb_strdup_subst_(const char *template, int (*cb)(void *ctx, gds_t *s, const char **input), void *ctx, rnd_strdup_subst_t flags, size_t extra_room) { gds_t s; @@ -294,9 +294,9 @@ if (template == NULL) return NULL; - memset(&s, 0, sizeof(s)); /* shouldn't do gds_init() here, pcb_subst_append() will do that */ + memset(&s, 0, sizeof(s)); /* shouldn't do gds_init() here, rnd_subst_append() will do that */ - if (pcb_subst_append(&s, template, cb, ctx, flags, extra_room) == 0) + if (rnd_subst_append(&s, template, cb, ctx, flags, extra_room) == 0) return s.array; gds_uninit(&s); @@ -303,7 +303,7 @@ return NULL; } -char *pcb_strdup_subst(const char *template, int (*cb)(void *ctx, gds_t *s, const char **input), void *ctx, pcb_strdup_subst_t flags) +char *rnd_strdup_subst(const char *template, int (*cb)(void *ctx, gds_t *s, const char **input), void *ctx, rnd_strdup_subst_t flags) { return pcb_strdup_subst_(template, cb, ctx, flags, 0); } @@ -310,12 +310,12 @@ void rnd_paths_resolve(rnd_hidlib_t *hidlib, const char **in, char **out, int numpaths, unsigned int extra_room, int quiet) { - pcb_strdup_subst_t flags = PCB_SUBST_ALL; + rnd_strdup_subst_t flags = RND_SUBST_ALL; #ifdef __WIN32__ - flags &= ~PCB_SUBST_BACKSLASH; + flags &= ~RND_SUBST_BACKSLASH; #endif if (quiet) - flags |= PCB_SUBST_QUIET; + flags |= RND_SUBST_QUIET; for (; numpaths > 0; numpaths--, in++, out++) *out = pcb_strdup_subst_(*in, rnd_build_fn_cb, hidlib, flags, extra_room); } Index: trunk/src/librnd/core/pcb-printf.c =================================================================== --- trunk/src/librnd/core/pcb-printf.c (revision 31006) +++ trunk/src/librnd/core/pcb-printf.c (revision 31007) @@ -42,7 +42,7 @@ #include #include -const char *pcb_printf_slot[PCB_PRINTF_SLOT_max] = +const char *rnd_printf_slot[RND_PRINTF_SLOT_max] = { NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, /* 8 user formats */ "%mr", /* original unitless cmil file format coord */ @@ -420,7 +420,7 @@ * [in] args Arguments to specifier * * return 0 on success */ -int pcb_safe_append_vprintf(gds_t *string, pcb_safe_printf_t safe, const char *fmt, va_list args) +int rnd_safe_append_vprintf(gds_t *string, rnd_safe_printf_t safe, const char *fmt, va_list args) { gds_t spec; const char *qstr, *needsq; @@ -469,7 +469,7 @@ if ((gds_len(&spec) > 2) && (spec.array[1] == '[')) { int slot = atoi(spec.array+2); gds_t new_spec; - if ((slot < 0) || (slot > PCB_PRINTF_SLOT_max)) { + if ((slot < 0) || (slot > RND_PRINTF_SLOT_max)) { fprintf(stderr, "Internal error: invalid printf slot addressed: '%s'\n", spec.array); abort(); } @@ -478,12 +478,12 @@ fprintf(stderr, "Internal error: printf slot recursion too deep on addressed: '%s'\n", spec.array); abort(); } - if (pcb_printf_slot[slot] == NULL) { + if (rnd_printf_slot[slot] == NULL) { fprintf(stderr, "Internal error: printf empty slot reference: '%s'\n", spec.array); abort(); } gds_init(&new_spec); - gds_append_str(&new_spec, pcb_printf_slot[slot]); + gds_append_str(&new_spec, rnd_printf_slot[slot]); if (*fmt == ']') fmt++; gds_append_str(&new_spec, fmt); @@ -756,7 +756,7 @@ return retval; } -int pcb_sprintf(char *string, const char *fmt, ...) +int rnd_sprintf(char *string, const char *fmt, ...) { gds_t str; va_list args; @@ -770,13 +770,13 @@ str.alloced = 1<<31; str.no_realloc = 1; - pcb_safe_append_vprintf(&str, 0, fmt, args); + rnd_safe_append_vprintf(&str, 0, fmt, args); va_end(args); return str.used; } -int pcb_snprintf(char *string, size_t len, const char *fmt, ...) +int rnd_snprintf(char *string, size_t len, const char *fmt, ...) { gds_t str; va_list args; @@ -788,13 +788,13 @@ str.alloced = len; str.no_realloc = 1; - pcb_safe_append_vprintf(&str, 0, fmt, args); + rnd_safe_append_vprintf(&str, 0, fmt, args); va_end(args); return str.used; } -int pcb_safe_snprintf(char *string, size_t len, pcb_safe_printf_t safe, const char *fmt, ...) +int rnd_safe_snprintf(char *string, size_t len, rnd_safe_printf_t safe, const char *fmt, ...) { gds_t str; va_list args; @@ -809,7 +809,7 @@ if (len > 0) *string = '\0'; /* make sure the string is empty on error of the low level call didn't print anything */ - res = pcb_safe_append_vprintf(&str, safe, fmt, args); + res = rnd_safe_append_vprintf(&str, safe, fmt, args); va_end(args); if (res < 0) @@ -818,7 +818,7 @@ } -int pcb_vsnprintf(char *string, size_t len, const char *fmt, va_list args) +int rnd_vsnprintf(char *string, size_t len, const char *fmt, va_list args) { gds_t str; @@ -828,24 +828,24 @@ str.alloced = len; str.no_realloc = 1; - pcb_safe_append_vprintf(&str, 0, fmt, args); + rnd_safe_append_vprintf(&str, 0, fmt, args); return str.used; } -int pcb_fprintf(FILE * fh, const char *fmt, ...) +int rnd_fprintf(FILE * fh, const char *fmt, ...) { int rv; va_list args; va_start(args, fmt); - rv = pcb_vfprintf(fh, fmt, args); + rv = rnd_vfprintf(fh, fmt, args); va_end(args); return rv; } -int pcb_vfprintf(FILE * fh, const char *fmt, va_list args) +int rnd_vfprintf(FILE * fh, const char *fmt, va_list args) { int rv; gds_t str; @@ -854,7 +854,7 @@ if (fh == NULL) rv = -1; else { - pcb_safe_append_vprintf(&str, 0, fmt, args); + rnd_safe_append_vprintf(&str, 0, fmt, args); rv = fprintf(fh, "%s", str.array); } @@ -862,7 +862,7 @@ return rv; } -int pcb_printf(const char *fmt, ...) +int rnd_printf(const char *fmt, ...) { int rv; gds_t str; @@ -871,7 +871,7 @@ gds_init(&str); va_start(args, fmt); - pcb_safe_append_vprintf(&str, 0, fmt, args); + rnd_safe_append_vprintf(&str, 0, fmt, args); rv = printf("%s", str.array); va_end(args); @@ -879,7 +879,7 @@ return rv; } -char *pcb_strdup_printf(const char *fmt, ...) +char *rnd_strdup_printf(const char *fmt, ...) { gds_t str; va_list args; @@ -887,18 +887,18 @@ gds_init(&str); va_start(args, fmt); - pcb_safe_append_vprintf(&str, 0, fmt, args); + rnd_safe_append_vprintf(&str, 0, fmt, args); va_end(args); return str.array; /* no other allocation has been made */ } -char *pcb_strdup_vprintf(const char *fmt, va_list args) +char *rnd_strdup_vprintf(const char *fmt, va_list args) { gds_t str; gds_init(&str); - pcb_safe_append_vprintf(&str, 0, fmt, args); + rnd_safe_append_vprintf(&str, 0, fmt, args); return str.array; /* no other allocation has been made */ } @@ -905,13 +905,13 @@ /* Wrapper for pcb_safe_append_vprintf that appends to a string using vararg API */ -int pcb_append_printf(gds_t *str, const char *fmt, ...) +int rnd_append_printf(gds_t *str, const char *fmt, ...) { int retval; va_list args; va_start(args, fmt); - retval = pcb_safe_append_vprintf(str, 0, fmt, args); + retval = rnd_safe_append_vprintf(str, 0, fmt, args); va_end(args); return retval; Index: trunk/src/librnd/core/pcb-printf.h =================================================================== --- trunk/src/librnd/core/pcb-printf.h (revision 31006) +++ trunk/src/librnd/core/pcb-printf.h (revision 31007) @@ -95,8 +95,8 @@ * No support for %zu size_t printf spec */ -#ifndef PCB_PCB_PRINTF_H -#define PCB_PCB_PRINTF_H +#ifndef RND_PCB_PRINTF_H +#define RND_PCB_PRINTF_H #include #include @@ -106,45 +106,45 @@ typedef enum { /* bitmask for printf hardening */ PCB_SAFEPRINT_arg_max = 1023, /* for internal use */ PCB_SAFEPRINT_COORD_ONLY = 1024 /* print only coords (%m); anything else will result in error, returning -1 */ -} pcb_safe_printf_t; +} rnd_safe_printf_t; -int pcb_fprintf(FILE * f, const char *fmt, ...); -int pcb_vfprintf(FILE * f, const char *fmt, va_list args); -int pcb_sprintf(char *string, const char *fmt, ...); -int pcb_snprintf(char *string, size_t len, const char *fmt, ...); -int pcb_safe_snprintf(char *string, size_t len, pcb_safe_printf_t safe, const char *fmt, ...); -int pcb_vsnprintf(char *string, size_t len, const char *fmt, va_list args); -int pcb_printf(const char *fmt, ...); -char *pcb_strdup_printf(const char *fmt, ...); -char *pcb_strdup_vprintf(const char *fmt, va_list args); +int rnd_fprintf(FILE * f, const char *fmt, ...); +int rnd_vfprintf(FILE * f, const char *fmt, va_list args); +int rnd_sprintf(char *string, const char *fmt, ...); +int rnd_snprintf(char *string, size_t len, const char *fmt, ...); +int rnd_safe_snprintf(char *string, size_t len, rnd_safe_printf_t safe, const char *fmt, ...); +int rnd_vsnprintf(char *string, size_t len, const char *fmt, va_list args); +int rnd_printf(const char *fmt, ...); +char *rnd_strdup_printf(const char *fmt, ...); +char *rnd_strdup_vprintf(const char *fmt, va_list args); -int pcb_append_printf(gds_t *str, const char *fmt, ...); +int rnd_append_printf(gds_t *str, const char *fmt, ...); /* Low level call that does the job */ -int pcb_safe_append_vprintf(gds_t *string, pcb_safe_printf_t safe, const char *fmt, va_list args); +int rnd_safe_append_vprintf(gds_t *string, rnd_safe_printf_t safe, const char *fmt, va_list args); /* Predefined slots (macros): %[n] will use the nth string from this list. The first 8 are user-definable. */ typedef enum { - PCB_PRINTF_SLOT_USER0, - PCB_PRINTF_SLOT_USER1, - PCB_PRINTF_SLOT_USER2, - PCB_PRINTF_SLOT_USER3, - PCB_PRINTF_SLOT_USER4, - PCB_PRINTF_SLOT_USER5, - PCB_PRINTF_SLOT_USER6, - PCB_PRINTF_SLOT_USER7, - PCB_PRINTF_SLOT_FF_ORIG_COORD, /* %[8] original .pcb file format coord prints */ - PCB_PRINTF_SLOT_FF_SAFE_COORD, /* %[9] safe .pcb file format coord print that doesn't lose precision */ - PCB_PRINTF_SLOT_max -} pcb_printf_slot_idx_t; -extern const char *pcb_printf_slot[PCB_PRINTF_SLOT_max]; + RND_PRINTF_SLOT_USER0, + RND_PRINTF_SLOT_USER1, + RND_PRINTF_SLOT_USER2, + RND_PRINTF_SLOT_USER3, + RND_PRINTF_SLOT_USER4, + RND_PRINTF_SLOT_USER5, + RND_PRINTF_SLOT_USER6, + RND_PRINTF_SLOT_USER7, + RND_PRINTF_SLOT_FF_ORIG_COORD, /* %[8] original .pcb file format coord prints */ + RND_PRINTF_SLOT_FF_SAFE_COORD, /* %[9] safe .pcb file format coord print that doesn't lose precision */ + RND_PRINTF_SLOT_max +} rnd_printf_slot_idx_t; +extern const char *rnd_printf_slot[RND_PRINTF_SLOT_max]; /* strdup and return a string built from a template, controlled by flags: - PCB_SUBST_HOME: replace leading ~ with the user's home directory + RND_SUBST_HOME: replace leading ~ with the user's home directory - PCB_SUBST_PERCENT: attempt to replace printf-like formatting + RND_SUBST_PERCENT: attempt to replace printf-like formatting directives (e.g. %P) using an user provided callback function. The callback function needs to recognize the directive at **input (pointing to the byte after the %) and append the substitution to s and increase *input to point @@ -152,27 +152,27 @@ on unknown directive (which will be copied verbatim). %% will always be translated into a single %, without calling cb. - PCB_SUBST_CONF: replace $(conf) automatically (no callback) + RND_SUBST_CONF: replace $(conf) automatically (no callback) Implemented in paths.c because it depends on conf_core.h and error.h . */ typedef enum { - PCB_SUBST_HOME = 1, - PCB_SUBST_PERCENT = 2, - PCB_SUBST_CONF = 4, - PCB_SUBST_BACKSLASH = 8, /* substitute \ sequences as printf(3) does */ + RND_SUBST_HOME = 1, + RND_SUBST_PERCENT = 2, + RND_SUBST_CONF = 4, + RND_SUBST_BACKSLASH = 8, /* substitute \ sequences as printf(3) does */ - PCB_SUBST_ALL = 0x7f, /* substitute all, but do not enable quiet */ + RND_SUBST_ALL = 0x7f, /* substitute all, but do not enable quiet */ - PCB_SUBST_QUIET = 0x80 -} pcb_strdup_subst_t; + RND_SUBST_QUIET = 0x80 +} rnd_strdup_subst_t; /* Substitute template using cb, leaving extra room at the end and append the result to s. Returns 0 on success. */ -int pcb_subst_append(gds_t *s, const char *template, int (*cb)(void *ctx, gds_t *s, const char **input), void *ctx, pcb_strdup_subst_t flags, size_t extra_room); +int rnd_subst_append(gds_t *s, const char *template, int (*cb)(void *ctx, gds_t *s, const char **input), void *ctx, rnd_strdup_subst_t flags, size_t extra_room); -/* Same as pcb_subst_append(), but returns a dynamic allocated string +/* Same as rnd_subst_append(), but returns a dynamic allocated string (the caller needs to free() after use) or NULL on error. */ -char *pcb_strdup_subst(const char *template, int (*cb)(void *ctx, gds_t *s, const char **input), void *ctx, pcb_strdup_subst_t flags); +char *rnd_strdup_subst(const char *template, int (*cb)(void *ctx, gds_t *s, const char **input), void *ctx, rnd_strdup_subst_t flags); #endif Index: trunk/src/librnd/core/safe_fs.c =================================================================== --- trunk/src/librnd/core/safe_fs.c (revision 31006) +++ trunk/src/librnd/core/safe_fs.c (revision 31007) @@ -282,7 +282,7 @@ FILE *res; /* try the trivial: directly under this dir */ - pcb_snprintf(tmp, sizeof(tmp), "%s%c%s", from, RND_DIR_SEPARATOR_C, fn); + rnd_snprintf(tmp, sizeof(tmp), "%s%c%s", from, RND_DIR_SEPARATOR_C, fn); res = pcb_fopen(hidlib, tmp, mode); if (res != NULL) { @@ -303,7 +303,7 @@ struct stat st; if (de->d_name[0] == '.') continue; - pcb_snprintf(tmp, sizeof(tmp), "%s%c%s", from, RND_DIR_SEPARATOR_C, de->d_name); + rnd_snprintf(tmp, sizeof(tmp), "%s%c%s", from, RND_DIR_SEPARATOR_C, de->d_name); if (stat(tmp, &st) != 0) continue; if (!S_ISDIR(st.st_mode)) Index: trunk/src/librnd/pcb_compat.h =================================================================== --- trunk/src/librnd/pcb_compat.h (revision 31006) +++ trunk/src/librnd/pcb_compat.h (revision 31007) @@ -1016,3 +1016,37 @@ #define pcb_build_argfn rnd_build_argfn #define pcb_build_argfn_cb rnd_build_argfn_cb #define pcb_build_argfn_t rnd_build_argfn_t +#define pcb_safe_printf_t rnd_safe_printf_t +#define pcb_fprintf rnd_fprintf +#define pcb_vfprintf rnd_vfprintf +#define pcb_sprintf rnd_sprintf +#define pcb_snprintf rnd_snprintf +#define pcb_safe_snprintf rnd_safe_snprintf +#define pcb_vsnprintf rnd_vsnprintf +#define pcb_printf rnd_printf +#define pcb_strdup_printf rnd_strdup_printf +#define pcb_strdup_vprintf rnd_strdup_vprintf +#define pcb_append_printf rnd_append_printf +#define pcb_safe_append_vprintf rnd_safe_append_vprintf +#define PCB_PRINTF_SLOT_USER0 RND_PRINTF_SLOT_USER0 +#define PCB_PRINTF_SLOT_USER1 RND_PRINTF_SLOT_USER1 +#define PCB_PRINTF_SLOT_USER2 RND_PRINTF_SLOT_USER2 +#define PCB_PRINTF_SLOT_USER3 RND_PRINTF_SLOT_USER3 +#define PCB_PRINTF_SLOT_USER4 RND_PRINTF_SLOT_USER4 +#define PCB_PRINTF_SLOT_USER5 RND_PRINTF_SLOT_USER5 +#define PCB_PRINTF_SLOT_USER6 RND_PRINTF_SLOT_USER6 +#define PCB_PRINTF_SLOT_USER7 RND_PRINTF_SLOT_USER7 +#define PCB_PRINTF_SLOT_FF_ORIG_COORD RND_PRINTF_SLOT_FF_ORIG_COORD +#define PCB_PRINTF_SLOT_FF_SAFE_COORD RND_PRINTF_SLOT_FF_SAFE_COORD +#define PCB_PRINTF_SLOT_max RND_PRINTF_SLOT_max +#define pcb_printf_slot_idx_t rnd_printf_slot_idx_t +#define pcb_printf_slot rnd_printf_slot +#define PCB_SUBST_HOME RND_SUBST_HOME +#define PCB_SUBST_PERCENT RND_SUBST_PERCENT +#define PCB_SUBST_CONF RND_SUBST_CONF +#define PCB_SUBST_BACKSLASH RND_SUBST_BACKSLASH +#define PCB_SUBST_ALL RND_SUBST_ALL +#define PCB_SUBST_QUIET RND_SUBST_QUIET +#define pcb_strdup_subst_t rnd_strdup_subst_t +#define pcb_subst_append rnd_subst_append +#define pcb_strdup_subst rnd_strdup_subst Index: trunk/src/librnd/poly/polyarea.c =================================================================== --- trunk/src/librnd/poly/polyarea.c (revision 31006) +++ trunk/src/librnd/poly/polyarea.c (revision 31007) @@ -118,7 +118,7 @@ { va_list ap; va_start(ap, fmt); - pcb_vfprintf(stderr, fmt, ap); + rnd_vfprintf(stderr, fmt, ap); va_end(ap); } #else @@ -150,7 +150,7 @@ s = v; do { n = v->next; - pcb_fprintf(stderr, "Line [%#mS %#mS %#mS %#mS 10 10 \"%s\"]\n", + rnd_fprintf(stderr, "Line [%#mS %#mS %#mS %#mS 10 10 \"%s\"]\n", v->point[0], v->point[1], n->point[0], n->point[1], theState(v)); } while ((v = v->next) != s); @@ -2923,7 +2923,7 @@ #ifndef NDEBUG va_list ap; va_start(ap, fmt); - pcb_vsnprintf(res->msg, sizeof(res->msg), fmt, ap); + rnd_vsnprintf(res->msg, sizeof(res->msg), fmt, ap); va_end(ap); #endif return pcb_true; @@ -3048,8 +3048,8 @@ if (val < min) min = val; \ if (val > max) max = val; if (chk != NULL) - pcb_fprintf(stderr, "Details: %s\n", chk->msg); - pcb_fprintf(stderr, "!!!animator start\n"); + rnd_fprintf(stderr, "Details: %s\n", chk->msg); + rnd_fprintf(stderr, "!!!animator start\n"); v = pl; do { n = v->next; @@ -3059,13 +3059,13 @@ update_minmax(miny, maxy, n->point[1]); } while ((v = v->next) != pl); - pcb_fprintf(stderr, "scale 1 -1\n"); - pcb_fprintf(stderr, "viewport %mm %mm - %mm %mm\n", minx, miny, maxx, maxy); - pcb_fprintf(stderr, "frame\n"); + rnd_fprintf(stderr, "scale 1 -1\n"); + rnd_fprintf(stderr, "viewport %mm %mm - %mm %mm\n", minx, miny, maxx, maxy); + rnd_fprintf(stderr, "frame\n"); v = pl; do { n = v->next; - pcb_fprintf(stderr, "line %#mm %#mm %#mm %#mm\n", v->point[0], v->point[1], n->point[0], n->point[1]); + rnd_fprintf(stderr, "line %#mm %#mm %#mm %#mm\n", v->point[0], v->point[1], n->point[0], n->point[1]); } while ((v = v->next) != pl); @@ -3073,8 +3073,8 @@ int n, MR=PCB_MM_TO_COORD(0.05); fprintf(stderr, "color #770000\n"); for(n = 0; n < chk->marks; n++) { - pcb_fprintf(stderr, "line %#mm %#mm %#mm %#mm\n", chk->x[n]-MR, chk->y[n]-MR, chk->x[n]+MR, chk->y[n]+MR); - pcb_fprintf(stderr, "line %#mm %#mm %#mm %#mm\n", chk->x[n]-MR, chk->y[n]+MR, chk->x[n]+MR, chk->y[n]-MR); + rnd_fprintf(stderr, "line %#mm %#mm %#mm %#mm\n", chk->x[n]-MR, chk->y[n]-MR, chk->x[n]+MR, chk->y[n]+MR); + rnd_fprintf(stderr, "line %#mm %#mm %#mm %#mm\n", chk->x[n]-MR, chk->y[n]+MR, chk->x[n]+MR, chk->y[n]-MR); } } @@ -3082,7 +3082,7 @@ int n; fprintf(stderr, "color #990000\n"); for(n = 0; n < chk->lines; n++) - pcb_fprintf(stderr, "line %#mm %#mm %#mm %#mm\n", chk->x1[n], chk->y1[n], chk->x2[n], chk->y2[n]); + rnd_fprintf(stderr, "line %#mm %#mm %#mm %#mm\n", chk->x1[n], chk->y1[n], chk->x2[n], chk->y2[n]); } fprintf(stderr, "flush\n"); @@ -3102,7 +3102,7 @@ #if 0 (disabled for too many false positive) #ifndef NDEBUG - pcb_fprintf(stderr, "Invalid polyarea: no contours\n"); + rnd_fprintf(stderr, "Invalid polyarea: no contours\n"); #endif #endif return pcb_false; @@ -3110,7 +3110,7 @@ if (p->contours->Flags.orient == PCB_PLF_INV) { #ifndef NDEBUG - pcb_fprintf(stderr, "Invalid Outer pcb_pline_t: failed orient\n"); + rnd_fprintf(stderr, "Invalid Outer pcb_pline_t: failed orient\n"); pcb_poly_valid_report(p->contours, p->contours->head, NULL); #endif return pcb_false; @@ -3118,7 +3118,7 @@ if (pcb_polyarea_contour_check_(p->contours, &chk)) { #ifndef NDEBUG - pcb_fprintf(stderr, "Invalid Outer pcb_pline_t: failed contour check\n"); + rnd_fprintf(stderr, "Invalid Outer pcb_pline_t: failed contour check\n"); pcb_poly_valid_report(p->contours, p->contours->head, &chk); #endif return pcb_false; @@ -3127,7 +3127,7 @@ for (c = p->contours->next; c != NULL; c = c->next) { if (c->Flags.orient == PCB_PLF_DIR) { #ifndef NDEBUG - pcb_fprintf(stderr, "Invalid Inner: pcb_pline_t orient = %d\n", c->Flags.orient); + rnd_fprintf(stderr, "Invalid Inner: pcb_pline_t orient = %d\n", c->Flags.orient); pcb_poly_valid_report(c, c->head, NULL); #endif return pcb_false; @@ -3134,7 +3134,7 @@ } if (pcb_polyarea_contour_check_(c, &chk)) { #ifndef NDEBUG - pcb_fprintf(stderr, "Invalid Inner: failed contour check\n"); + rnd_fprintf(stderr, "Invalid Inner: failed contour check\n"); pcb_poly_valid_report(c, c->head, &chk); #endif return pcb_false; @@ -3141,7 +3141,7 @@ } if (!pcb_poly_contour_in_contour(p->contours, c)) { #ifndef NDEBUG - pcb_fprintf(stderr, "Invalid Inner: overlap with outer\n"); + rnd_fprintf(stderr, "Invalid Inner: overlap with outer\n"); pcb_poly_valid_report(c, c->head, NULL); #endif return pcb_false; Index: trunk/src/main_act.c =================================================================== --- trunk/src/main_act.c (revision 31006) +++ trunk/src/main_act.c (revision 31007) @@ -276,9 +276,9 @@ RND_ACT_IRES(0); 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); + rnd_snprintf(tmp, sizeof(tmp), "%mm", pcb_crosshair.X); rnd_setenv("PCB_RND_CROSSHAIR_X_MM", tmp, 1); - pcb_snprintf(tmp, sizeof(tmp), "%mm", pcb_crosshair.Y); + rnd_snprintf(tmp, sizeof(tmp), "%mm", pcb_crosshair.Y); 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)); Index: trunk/src/netlist.c =================================================================== --- trunk/src/netlist.c (revision 31006) +++ trunk/src/netlist.c (revision 31007) @@ -127,7 +127,7 @@ static void undo_term_alloc_print(void *udata, char *dst, size_t dst_len) { undo_term_alloc_t *a = udata; - pcb_snprintf(dst, dst_len, "net_term_alloc: %s/%d %s-%s", a->netname, a->nl_idx, a->refdes, a->term); + rnd_snprintf(dst, dst_len, "net_term_alloc: %s/%d %s-%s", a->netname, a->nl_idx, a->refdes, a->term); } static void undo_term_alloc_free(void *udata) @@ -315,7 +315,7 @@ static void undo_net_alloc_print(void *udata, char *dst, size_t dst_len) { undo_net_alloc_t *a = udata; - pcb_snprintf(dst, dst_len, "net_alloc: %d %s", a->nl_idx, a->netname); + rnd_snprintf(dst, dst_len, "net_alloc: %d %s", a->nl_idx, a->netname); } static const uundo_oper_t undo_net_alloc = { Index: trunk/src/netlist_act.c =================================================================== --- trunk/src/netlist_act.c (revision 31006) +++ trunk/src/netlist_act.c (revision 31007) @@ -333,7 +333,7 @@ /* move over all terminals from nfrom to nto */ for(t = pcb_termlist_first(&nfrom->conns); t != NULL; t = tnext) { - char *pinname = pcb_strdup_printf("%s-%s", t->refdes, t->term); + char *pinname = rnd_strdup_printf("%s-%s", t->refdes, t->term); tnext = pcb_termlist_next(t); pcb_net_term_del(nfrom, t); @@ -520,13 +520,13 @@ if (t != NULL) { /* remove term from its original net */ - pinname = pcb_strdup_printf("%s-%s", t->refdes, t->term); + pinname = rnd_strdup_printf("%s-%s", t->refdes, t->term); pcb_ratspatch_append_optimize(PCB, RATP_DEL_CONN, pinname, net->name, NULL); free(pinname); } t = pcb_net_term_get(net, subc->refdes, obj->term, PCB_NETA_ALLOC); - pinname = pcb_strdup_printf("%s-%s", t->refdes, t->term); + pinname = rnd_strdup_printf("%s-%s", t->refdes, t->term); pcb_ratspatch_append_optimize(PCB, RATP_ADD_CONN, pinname, net->name, NULL); free(pinname); } Index: trunk/src/obj_arc.c =================================================================== --- trunk/src/obj_arc.c (revision 31006) +++ trunk/src/obj_arc.c (revision 31007) @@ -418,7 +418,7 @@ static void undo_arc_geo_print(void *udata, char *dst, size_t dst_len) { - pcb_snprintf(dst, dst_len, "arc geo"); + rnd_snprintf(dst, dst_len, "arc geo"); } static const uundo_oper_t undo_arc_geo = { Index: trunk/src/obj_gfx.c =================================================================== --- trunk/src/obj_gfx.c (revision 31006) +++ trunk/src/obj_gfx.c (revision 31007) @@ -289,7 +289,7 @@ static void undo_gfx_geo_print(void *udata, char *dst, size_t dst_len) { - pcb_snprintf(dst, dst_len, "gfx geo"); + rnd_snprintf(dst, dst_len, "gfx geo"); } static const uundo_oper_t undo_gfx_geo = { Index: trunk/src/obj_line.c =================================================================== --- trunk/src/obj_line.c (revision 31006) +++ trunk/src/obj_line.c (revision 31007) @@ -152,7 +152,7 @@ static void undo_line_geo_print(void *udata, char *dst, size_t dst_len) { - pcb_snprintf(dst, dst_len, "line geo"); + rnd_snprintf(dst, dst_len, "line geo"); } static const uundo_oper_t undo_line_geo = { Index: trunk/src/obj_poly.c =================================================================== --- trunk/src/obj_poly.c (revision 31006) +++ trunk/src/obj_poly.c (revision 31007) @@ -311,7 +311,7 @@ static void undo_poly_mirror_print(void *udata, char *dst, size_t dst_len) { undo_poly_mirror_t *g = udata; - pcb_snprintf(dst, dst_len, "poly mirror y=%$mm", g->y_offs); + rnd_snprintf(dst, dst_len, "poly mirror y=%$mm", g->y_offs); } static const uundo_oper_t undo_poly_mirror = { Index: trunk/src/obj_pstk.c =================================================================== --- trunk/src/obj_pstk.c (revision 31006) +++ trunk/src/obj_pstk.c (revision 31007) @@ -1218,7 +1218,7 @@ static void undo_pstk_mirror_print(void *udata, char *dst, size_t dst_len) { undo_pstk_mirror_t *g = udata; - pcb_snprintf(dst, dst_len, "pstk mirror y_offs=%$mm swap_side=%d disable_xmirror=%d", g->y_offs, g->swap_side, g->disable_xmirror); + rnd_snprintf(dst, dst_len, "pstk mirror y_offs=%$mm swap_side=%d disable_xmirror=%d", g->y_offs, g->swap_side, g->disable_xmirror); } static const uundo_oper_t undo_pstk_mirror = { @@ -1322,7 +1322,7 @@ static void undo_pstk_thermal_print(void *udata, char *dst, size_t dst_len) { undo_pstk_thermal_t *t = udata; - pcb_snprintf(dst, dst_len, "pstk_thermal: #%ld %ld %d", t->ps->ID, t->lid, t->shape); + rnd_snprintf(dst, dst_len, "pstk_thermal: #%ld %ld %d", t->ps->ID, t->lid, t->shape); } static const uundo_oper_t undo_pstk_thermal = { @@ -1439,7 +1439,7 @@ static void undo_change_instance_print(void *udata, char *dst, size_t dst_len) { padstack_change_instance_t *u = udata; - pcb_snprintf(dst, dst_len, "padstack change: clearance=%$mm rot=%.2f xmirror=%d smirror=%d\n", u->clearance, u->rot, u->xmirror, u->smirror); + rnd_snprintf(dst, dst_len, "padstack change: clearance=%$mm rot=%.2f xmirror=%d smirror=%d\n", u->clearance, u->rot, u->xmirror, u->smirror); } static const uundo_oper_t undo_pstk_change_instance = { Index: trunk/src/obj_pstk_proto.c =================================================================== --- trunk/src/obj_pstk_proto.c (revision 31006) +++ trunk/src/obj_pstk_proto.c (revision 31007) @@ -722,7 +722,7 @@ static void undo_proto_set_print(void *udata, char *dst, size_t dst_len) { - pcb_snprintf(dst, dst_len, "proto set"); + rnd_snprintf(dst, dst_len, "proto set"); } static const uundo_oper_t undo_proto_set = { @@ -939,7 +939,7 @@ static void undo_change_hole_print(void *udata, char *dst, size_t dst_len) { padstack_proto_change_hole_t *u = udata; - pcb_snprintf(dst, dst_len, "padstack proto hole change: plated=%d dia=%$mm top=%d bottom=%d\n", u->hplated, u->hdia, u->htop, u->hbottom); + rnd_snprintf(dst, dst_len, "padstack proto hole change: plated=%d dia=%$mm top=%d bottom=%d\n", u->hplated, u->hdia, u->htop, u->hbottom); } static const uundo_oper_t undo_pstk_proto_change_hole = { @@ -1013,7 +1013,7 @@ static void undo_change_name_print(void *udata, char *dst, size_t dst_len) { padstack_proto_change_name_t *u = udata; - pcb_snprintf(dst, dst_len, "padstack proto name change to: '%s'\n", u->name); + rnd_snprintf(dst, dst_len, "padstack proto name change to: '%s'\n", u->name); } static const uundo_oper_t undo_pstk_proto_change_name = { @@ -1249,7 +1249,7 @@ static void undo_shape_geo_print(void *udata, char *dst, size_t dst_len) { undo_shape_geo_t *g = udata; - pcb_snprintf(dst, dst_len, "pstk shape geo proto=%d %d/%d shape=%d clearance=%d", g->proto_id, g->tridx, g->shpidx, g->shp_valid, g->clr_valid); + rnd_snprintf(dst, dst_len, "pstk shape geo proto=%d %d/%d shape=%d clearance=%d", g->proto_id, g->tridx, g->shpidx, g->shp_valid, g->clr_valid); } static const char core_shape_cookie[] = "core-pstk-proto-shape"; Index: trunk/src/obj_subc.c =================================================================== --- trunk/src/obj_subc.c (revision 31006) +++ trunk/src/obj_subc.c (revision 31007) @@ -1661,7 +1661,7 @@ static void undo_subc_unbind_print(void *udata, char *dst, size_t dst_len) { undo_subc_unbind_t *u = udata; - pcb_snprintf(dst, dst_len, "subc unbind layer: %s #%ld:%ld", u->unbind ? "unbind" : "rebind", u->sc->ID, u->slot); + rnd_snprintf(dst, dst_len, "subc unbind layer: %s #%ld:%ld", u->unbind ? "unbind" : "rebind", u->sc->ID, u->slot); } static const uundo_oper_t undo_subc_unbind = { @@ -1861,7 +1861,7 @@ static void undo_subc_mirror_print(void *udata, char *dst, size_t dst_len) { undo_subc_mirror_t *g = udata; - pcb_snprintf(dst, dst_len, "subc mirror y_offs=%$mm smirror=%d", g->y_offs, g->smirror); + rnd_snprintf(dst, dst_len, "subc mirror y_offs=%$mm smirror=%d", g->y_offs, g->smirror); } static const uundo_oper_t undo_subc_mirror = { Index: trunk/src/obj_term.c =================================================================== --- trunk/src/obj_term.c (revision 31006) +++ trunk/src/obj_term.c (revision 31007) @@ -215,7 +215,7 @@ static void undo_term_rename_print(void *udata, char *dst, size_t dst_len) { term_rename_t *r = udata; - pcb_snprintf(dst, dst_len, "term_rename: %s #%ld to '%s'\n", + rnd_snprintf(dst, dst_len, "term_rename: %s #%ld to '%s'\n", pcb_obj_type_name(r->obj->type), r->obj->ID, r->str); } Index: trunk/src/obj_text.c =================================================================== --- trunk/src/obj_text.c (revision 31006) +++ trunk/src/obj_text.c (revision 31007) @@ -153,7 +153,7 @@ static void undo_text_geo_print(void *udata, char *dst, size_t dst_len) { - pcb_snprintf(dst, dst_len, "text geo"); + rnd_snprintf(dst, dst_len, "text geo"); } static const uundo_oper_t undo_text_geo = { @@ -273,7 +273,7 @@ if (!PCB_FLAG_TEST(PCB_FLAG_DYNTEXT, text)) return (unsigned char *)text->TextString; - res = (unsigned char *)pcb_strdup_subst(text->TextString, pcb_text_render_str_cb, text, PCB_SUBST_PERCENT | PCB_SUBST_CONF); + res = (unsigned char *)rnd_strdup_subst(text->TextString, pcb_text_render_str_cb, text, RND_SUBST_PERCENT | RND_SUBST_CONF); if (res == NULL) { res = (unsigned char *)rnd_strdup(""); } @@ -287,7 +287,7 @@ int pcb_append_dyntext(gds_t *dst, const pcb_any_obj_t *obj, const char *fmt) { - return pcb_subst_append(dst, fmt, pcb_text_render_str_cb, (void *)obj, PCB_SUBST_PERCENT | PCB_SUBST_CONF, 0); + return rnd_subst_append(dst, fmt, pcb_text_render_str_cb, (void *)obj, RND_SUBST_PERCENT | RND_SUBST_CONF, 0); } /* Free rendered if it was allocated */ Index: trunk/src/object_act.c =================================================================== --- trunk/src/object_act.c (revision 31006) +++ trunk/src/object_act.c (revision 31007) @@ -139,7 +139,7 @@ } if (s->refdes != NULL) - buf = pcb_strdup_printf("Subcircuit %s Attributes", s->refdes); + buf = rnd_strdup_printf("Subcircuit %s Attributes", s->refdes); else buf = rnd_strdup("Unnamed Subcircuit's Attributes"); @@ -1157,10 +1157,10 @@ vt = e->value; str.used = 0; - pcb_append_printf(&str, "subc eq %u:", e->key); + rnd_append_printf(&str, "subc eq %u:", e->key); for(n = 0; n < vt->used; n++) { sc = (pcb_subc_t *)vt->array[n]; - pcb_append_printf(&str, " #%ld(%s):%d", sc->ID, (sc->refdes == NULL ? "" : sc->refdes), pcb_subc_eq(sc, (pcb_subc_t*)vt->array[0])); + rnd_append_printf(&str, " #%ld(%s):%d", sc->ID, (sc->refdes == NULL ? "" : sc->refdes), pcb_subc_eq(sc, (pcb_subc_t*)vt->array[0])); } rnd_message(RND_MSG_INFO, "%s\n", str.array); vtp0_uninit(vt); Index: trunk/src/plug_footprint.c =================================================================== --- trunk/src/plug_footprint.c (revision 31006) +++ trunk/src/plug_footprint.c (revision 31007) @@ -167,7 +167,7 @@ if (type == PCB_FP_PARAMETRIC) { /* concat name and () */ - /* do not use pcb_strdup_printf or Concat here, do not increase gsch2pcb-rnd deps */ + /* do not use rnd_strdup_printf or Concat here, do not increase gsch2pcb-rnd deps */ int nl = strlen(name); entry->name = malloc(nl+3); memcpy(entry->name, name, nl); Index: trunk/src/plug_io.c =================================================================== --- trunk/src/plug_io.c (revision 31006) +++ trunk/src/plug_io.c (revision 31007) @@ -964,7 +964,7 @@ if (do_digest) { for(n = 0; n < out->len; n++) - out->digest[n] = pcb_strdup_printf("%s (%s)", out->plug[n]->default_fmt, out->plug[n]->description); + out->digest[n] = rnd_strdup_printf("%s (%s)", out->plug[n]->default_fmt, out->plug[n]->description); out->digest[n] = NULL; } Index: trunk/src/polygon.c =================================================================== --- trunk/src/polygon.c (revision 31006) +++ trunk/src/polygon.c (revision 31007) @@ -1627,10 +1627,10 @@ void debug_pline(pcb_pline_t * pl) { pcb_vnode_t *v; - pcb_fprintf(stderr, "\txmin %#mS xmax %#mS ymin %#mS ymax %#mS\n", pl->xmin, pl->xmax, pl->ymin, pl->ymax); + rnd_fprintf(stderr, "\txmin %#mS xmax %#mS ymin %#mS ymax %#mS\n", pl->xmin, pl->xmax, pl->ymin, pl->ymax); v = pl->head; while (v) { - pcb_fprintf(stderr, "\t\tvnode: %#mD\n", v->point[0], v->point[1]); + rnd_fprintf(stderr, "\t\tvnode: %#mD\n", v->point[0], v->point[1]); v = v->next; if (v == pl->head) break; @@ -1652,7 +1652,7 @@ rnd_polyarea_t *pa; fprintf(stderr, "POLYGON %p %d pts\n", (void *)p, p->PointN); for (i = 0; i < p->PointN; i++) - pcb_fprintf(stderr, "\t%d: %#mD\n", i, p->Points[i].X, p->Points[i].Y); + rnd_fprintf(stderr, "\t%d: %#mD\n", i, p->Points[i].X, p->Points[i].Y); if (p->HoleIndexN) { fprintf(stderr, "%d holes, starting at indices\n", p->HoleIndexN); for (i = 0; i < p->HoleIndexN; i++) Index: trunk/src/rats_patch.c =================================================================== --- trunk/src/rats_patch.c (revision 31006) +++ trunk/src/rats_patch.c (revision 31007) @@ -122,7 +122,7 @@ static void undo_ratspatch_append_print(void *udata, char *dst, size_t dst_len) { undo_ratspatch_append_t *a = udata; - pcb_snprintf(dst, dst_len, "ratspatch_append: op=%d '%s' '%s' '%s' (used by attr: %d)", a->op, RND_EMPTY(a->id), RND_EMPTY(a->a1), RND_EMPTY(a->a2), a->used_by_attr); + rnd_snprintf(dst, dst_len, "ratspatch_append: op=%d '%s' '%s' '%s' (used by attr: %d)", a->op, RND_EMPTY(a->id), RND_EMPTY(a->a1), RND_EMPTY(a->a2), a->used_by_attr); } static void undo_ratspatch_append_free(void *udata) Index: trunk/src/route_style.c =================================================================== --- trunk/src/route_style.c (revision 31006) +++ trunk/src/route_style.c (revision 31007) @@ -60,7 +60,7 @@ gds_init(&str); for (i = 0; i < vtroutestyle_len(styles); ++i) { - pcb_append_printf(&str, "%s,%mc,%mc,%mc,%mc", styles->array[i].name, + rnd_append_printf(&str, "%s,%mc,%mc,%mc,%mc", styles->array[i].name, styles->array[i].Thick, styles->array[i].Diameter, styles->array[i].Hole, styles->array[i].Clearance); if (i > 0) Index: trunk/src/select.c =================================================================== --- trunk/src/select.c (revision 31006) +++ trunk/src/select.c (revision 31007) @@ -223,7 +223,7 @@ long int *list = NULL; fix_box_dir(Box, 0); -/*pcb_printf("box: %mm %mm - %mm %mm [ %d ] %d %d\n", Box->X1, Box->Y1, Box->X2, Box->Y2, PCB_IS_BOX_NEGATIVE(Box), rnd_conf.editor.view.flip_x, rnd_conf.editor.view.flip_y);*/ +/*rnd_printf("box: %mm %mm - %mm %mm [ %d ] %d %d\n", Box->X1, Box->Y1, Box->X2, Box->Y2, PCB_IS_BOX_NEGATIVE(Box), rnd_conf.editor.view.flip_x, rnd_conf.editor.view.flip_y);*/ /* append an object to the return list OR set the flag if there's no list */ #define append(undo_type, p1, obj) \ Index: trunk/src/undo_old.c =================================================================== --- trunk/src/undo_old.c (revision 31006) +++ trunk/src/undo_old.c (revision 31007) @@ -110,7 +110,7 @@ UndoListType *slot = udata; #ifndef NDEBUG const char *res = undo_type2str(slot->Type); - pcb_snprintf(dst, dst_len, "%s ser=%d id=%d", res, slot->Serial, slot->ID); + rnd_snprintf(dst, dst_len, "%s ser=%d id=%d", res, slot->Serial, slot->ID); #else sprintf(dst, "%d", slot->Type); #endif Index: trunk/src/view.c =================================================================== --- trunk/src/view.c (revision 31006) +++ trunk/src/view.c (revision 31007) @@ -210,7 +210,7 @@ static void view_append_str(gds_t *dst, const char *prefix, const char *key, const char *value) { const char *s; - pcb_append_printf(dst, "%s %s = {", prefix, key); + rnd_append_printf(dst, "%s %s = {", prefix, key); for(s = value; *s != '\0'; s++) { switch(*s) { case '\\': @@ -244,44 +244,44 @@ if (prefix == NULL) prefix = ""; - pcb_append_printf(dst, "%sha:view.%lu {\n", prefix, v->uid); + rnd_append_printf(dst, "%sha:view.%lu {\n", prefix, v->uid); view_append_str(dst, prefix, "type", v->type); view_append_str(dst, prefix, "title", v->title); view_append_str(dst, prefix, "description", v->description); if (v->have_bbox) - pcb_append_printf(dst, "%s li:bbox = {%.08$$mm; %.08$$mm; %.08$$mm; %.08$$mm;}\n", prefix, v->bbox.X1, v->bbox.Y1, v->bbox.X2, v->bbox.Y2); + rnd_append_printf(dst, "%s li:bbox = {%.08$$mm; %.08$$mm; %.08$$mm; %.08$$mm;}\n", prefix, v->bbox.X1, v->bbox.Y1, v->bbox.X2, v->bbox.Y2); if (v->have_xy) - pcb_append_printf(dst, "%s li:xy = {%.08$$mm; %.08$$mm;}\n", prefix, v->x, v->y); + rnd_append_printf(dst, "%s li:xy = {%.08$$mm; %.08$$mm;}\n", prefix, v->x, v->y); for(g = 0; g < 2; g++) { if (pcb_idpath_list_length(&v->objs[g]) > 0) { pcb_idpath_t *i; - pcb_append_printf(dst, "%s li:objs.%d {\n", prefix, g); + rnd_append_printf(dst, "%s li:objs.%d {\n", prefix, g); for(i = pcb_idpath_list_first(&v->objs[g]); i != NULL; i = pcb_idpath_list_next(i)) { - pcb_append_printf(dst, "%s li:id {", prefix); + rnd_append_printf(dst, "%s li:id {", prefix); for(n = 0; n < i->len; n++) - pcb_append_printf(dst, "%ld;", i->id[n]); - pcb_append_printf(dst, "}\n", prefix); + rnd_append_printf(dst, "%ld;", i->id[n]); + rnd_append_printf(dst, "}\n", prefix); } - pcb_append_printf(dst, "%s }\n", prefix); + rnd_append_printf(dst, "%s }\n", prefix); } } switch(v->data_type) { case PCB_VIEW_PLAIN: - pcb_append_printf(dst, "%s data_type = plain\n", prefix); + rnd_append_printf(dst, "%s data_type = plain\n", prefix); break; case PCB_VIEW_DRC: - pcb_append_printf(dst, "%s data_type = drc\n", prefix); - pcb_append_printf(dst, "%s ha:data {\n", prefix); - pcb_append_printf(dst, "%s required_value = %.08$$mm\n", prefix, v->data.drc.required_value); + rnd_append_printf(dst, "%s data_type = drc\n", prefix); + rnd_append_printf(dst, "%s ha:data {\n", prefix); + rnd_append_printf(dst, "%s required_value = %.08$$mm\n", prefix, v->data.drc.required_value); if (v->data.drc.have_measured) - pcb_append_printf(dst, "%s measured_value = %.08$$mm\n", prefix, v->data.drc.measured_value); - pcb_append_printf(dst, "%s }\n", prefix); + rnd_append_printf(dst, "%s measured_value = %.08$$mm\n", prefix, v->data.drc.measured_value); + rnd_append_printf(dst, "%s }\n", prefix); break; } - pcb_append_printf(dst, "%s}\n", prefix); + rnd_append_printf(dst, "%s}\n", prefix); } typedef struct { Index: trunk/src_plugins/ar_cpcb/ar_cpcb.c =================================================================== --- trunk/src_plugins/ar_cpcb/ar_cpcb.c (revision 31006) +++ trunk/src_plugins/ar_cpcb/ar_cpcb.c (revision 31007) @@ -216,13 +216,13 @@ TODO("generate a poly"); break; case PCB_PSSH_POLY: - pcb_fprintf(f, "(0 %mm (%mm %mm %d) (", conf_core.design.clearance, ps->x, ps->y, lidx); + rnd_fprintf(f, "(0 %mm (%mm %mm %d) (", conf_core.design.clearance, ps->x, ps->y, lidx); for(n = 0; n < shp->data.poly.len; n++) - pcb_fprintf(f, "(%mm %mm)", shp->data.poly.x[n], shp->data.poly.y[n]); + rnd_fprintf(f, "(%mm %mm)", shp->data.poly.x[n], shp->data.poly.y[n]); fprintf(f, "))"); break; case PCB_PSSH_CIRC: - pcb_fprintf(f, "(%mm %mm (%mm %mm %d) ())", shp->data.circ.dia/2, conf_core.design.clearance, ps->x, ps->y, lidx); + rnd_fprintf(f, "(%mm %mm (%mm %mm %d) ())", shp->data.circ.dia/2, conf_core.design.clearance, ps->x, ps->y, lidx); break; } } @@ -256,7 +256,7 @@ htpp_entry_t *e; /* print dims */ - pcb_fprintf(f, "(%d %d %d)\n", (int)(PCB_COORD_TO_MM(pcb->hidlib.size_x)+0.5), (int)(PCB_COORD_TO_MM(pcb->hidlib.size_y)+0.5), stack->maxlayer); + rnd_fprintf(f, "(%d %d %d)\n", (int)(PCB_COORD_TO_MM(pcb->hidlib.size_x)+0.5), (int)(PCB_COORD_TO_MM(pcb->hidlib.size_y)+0.5), stack->maxlayer); /* print tracks */ for(e = htpp_first(&nmap->netmap.n2o); e != NULL; e = htpp_next(&nmap->netmap.n2o, e)) { @@ -264,15 +264,15 @@ dyn_obj_t *o, *olist = e->value; long id = htpi_get(&nmap->n2i, net); -/* pcb_fprintf(f, "# %s: %ld\n", net->Name, id);*/ - pcb_fprintf(f, "(%ld %mm %mm %mm\n", id, conf_core.design.line_thickness/2, conf_core.design.via_thickness/2, conf_core.design.clearance); +/* rnd_fprintf(f, "# %s: %ld\n", net->Name, id);*/ + rnd_fprintf(f, "(%ld %mm %mm %mm\n", id, conf_core.design.line_thickness/2, conf_core.design.via_thickness/2, conf_core.design.clearance); /* print pads (terminals) */ - pcb_fprintf(f, " ("); + rnd_fprintf(f, " ("); for(o = olist; o != NULL; o = o->next) if (o->obj->term != NULL) cpcb_print_pads(pcb, f, o->obj, stack); - pcb_fprintf(f, ")\n"); + rnd_fprintf(f, ")\n"); fprintf(f, " ()\n"); @@ -382,7 +382,7 @@ cpcb_save(PCB, f, &stk, &nmap); fclose(f); - cmdline = pcb_strdup_printf("%s < %s", cmd, tmpfn); + cmdline = rnd_strdup_printf("%s < %s", cmd, tmpfn); f = pcb_popen(&PCB->hidlib, cmdline, "r"); if (f != NULL) { cpcb_load(PCB, f, &stk, NULL); Index: trunk/src_plugins/asm/asm.c =================================================================== --- trunk/src_plugins/asm/asm.c (revision 31006) +++ trunk/src_plugins/asm/asm.c (revision 31007) @@ -160,7 +160,7 @@ pcb_subc_get_origin(subc, &x, &y); have_coords = 1; } - pcb_append_printf(&s, "%.08mm", x); + rnd_append_printf(&s, "%.08mm", x); break; case TT_Y: if (!have_coords) { @@ -167,7 +167,7 @@ pcb_subc_get_origin(subc, &x, &y); have_coords = 1; } - pcb_append_printf(&s, "%.08mm", y); + rnd_append_printf(&s, "%.08mm", y); break; } } @@ -435,7 +435,7 @@ done++; } - tmp = pcb_strdup_printf("%d/%d", done, total); + tmp = rnd_strdup_printf("%d/%d", done, total); rnd_dad_tree_modify_cell(&asm_ctx.dlg[asm_ctx.wtbl], grp->row, 5, tmp); } Index: trunk/src_plugins/autoroute/autoroute.c =================================================================== --- trunk/src_plugins/autoroute/autoroute.c (revision 31006) +++ trunk/src_plugins/autoroute/autoroute.c (revision 31007) @@ -616,7 +616,7 @@ assert(*rbpp); (*rbpp)->group = layergroup; clr = pcb_obj_clearance_at(PCB, term, layer); -pcb_printf("***** CLR=%mm\n", clr); +rnd_printf("***** CLR=%mm\n", clr); init_const_box(*rbpp, /*X1 */ term->BoundingBox.X1 + clr, /*Y1 */ term->BoundingBox.Y1 + clr, @@ -823,7 +823,7 @@ #ifdef ROUTE_DEBUG_VERBOSE static void DumpRouteBox(routebox_t * rb) { - pcb_printf("RB: %#mD-%#mD l%d; ", rb->box.X1, rb->box.Y1, rb->box.X2, rb->box.Y2, (int) rb->group); + rnd_printf("RB: %#mD-%#mD l%d; ", rb->box.X1, rb->box.Y1, rb->box.X2, rb->box.Y2, (int) rb->group); switch (rb->type) { case TERM: printf("TERM[%s] ", rb->parent.term->term); @@ -3229,7 +3229,7 @@ #if defined(ROUTE_DEBUG) && defined(DEBUG_SHOW_ROUTE_BOXES) showroutebox(path); #if defined(ROUTE_VERBOSE) - pcb_printf("TRACEPOINT start %#mD\n", nextpoint.X, nextpoint.Y); + rnd_printf("TRACEPOINT start %#mD\n", nextpoint.X, nextpoint.Y); #endif #endif @@ -3257,7 +3257,7 @@ #if defined(ROUTE_DEBUG_VERBOSE) printf("TRACEPATH: "); DumpRouteBox(path); - pcb_printf("TRACEPATH: point %#mD to point %#mD layer %d\n", + rnd_printf("TRACEPATH: point %#mD to point %#mD layer %d\n", lastpoint.X, lastpoint.Y, nextpoint.X, nextpoint.Y, path->group); #endif Index: trunk/src_plugins/cam/cam_gui.c =================================================================== --- trunk/src_plugins/cam/cam_gui.c (revision 31006) +++ trunk/src_plugins/cam/cam_gui.c (revision 31007) @@ -198,7 +198,7 @@ if (row != NULL) { const char *outfile = ctx->dlg[ctx->woutfile].val.str; - char *tmp = pcb_strdup_printf("outfile=%s", outfile); + char *tmp = rnd_strdup_printf("outfile=%s", outfile); rnd_actionva(ctx->cam.hidlib, "cam", "call", row->cell[0], tmp, NULL); free(tmp); } Index: trunk/src_plugins/ddraft/cli_line.c =================================================================== --- trunk/src_plugins/ddraft/cli_line.c (revision 31006) +++ trunk/src_plugins/ddraft/cli_line.c (revision 31007) @@ -117,7 +117,7 @@ argn = argc - 1; if (argn < 0) { /* empty arg list */ - pcb_snprintf(buff, sizeof(buff), " from %.08$$mm,%.08$$mm", pcb_crosshair.X, pcb_crosshair.Y); + rnd_snprintf(buff, sizeof(buff), " from %.08$$mm,%.08$$mm", pcb_crosshair.X, pcb_crosshair.Y); printf("append: '%s'\n", buff); cursor = cli_str_insert(line, strlen(line), buff, 1); goto update; @@ -142,7 +142,7 @@ case CLI_FROM: case CLI_TO: rnd_trace("abs"); - pcb_snprintf(buff, sizeof(buff), "%.08$$mm,%.08$$mm", pcb_crosshair.X, pcb_crosshair.Y); + rnd_snprintf(buff, sizeof(buff), "%.08$$mm,%.08$$mm", pcb_crosshair.X, pcb_crosshair.Y); goto maybe_replace_after; break; case CLI_RELATIVE: @@ -152,7 +152,7 @@ return 0; } rnd_trace("rel from %$mm,%$mm", ox, oy); - pcb_snprintf(buff, sizeof(buff), "%.08$$mm,%.08$$mm", pcb_crosshair.X - ox, pcb_crosshair.Y - oy); + rnd_snprintf(buff, sizeof(buff), "%.08$$mm,%.08$$mm", pcb_crosshair.X - ox, pcb_crosshair.Y - oy); maybe_replace_after:; if ((by+1 < argc) && (argv[by+1].type == CLI_COORD)) { argn = by+1; @@ -166,7 +166,7 @@ return 0; } replace=1; - pcb_snprintf(buff, sizeof(buff), "<%f", atan2(pcb_crosshair.Y - oy, pcb_crosshair.X - ox) * RND_RAD_TO_DEG); + rnd_snprintf(buff, sizeof(buff), "<%f", atan2(pcb_crosshair.Y - oy, pcb_crosshair.X - ox) * RND_RAD_TO_DEG); break; case CLI_DIST: res = get_rel_coord(argc, argv, argn, &ox, &oy); @@ -175,7 +175,7 @@ return 0; } replace=1; - pcb_snprintf(buff, sizeof(buff), "~%.08$$mm", rnd_distance(pcb_crosshair.X, pcb_crosshair.Y, ox, oy)); + rnd_snprintf(buff, sizeof(buff), "~%.08$$mm", rnd_distance(pcb_crosshair.X, pcb_crosshair.Y, ox, oy)); break; case_object: ; { @@ -185,7 +185,7 @@ return 0; o = p2; replace=1; - pcb_snprintf(buff, sizeof(buff), "%s %ld", find_rev_type(argv[by].type), (long)o->ID); + rnd_snprintf(buff, sizeof(buff), "%s %ld", find_rev_type(argv[by].type), (long)o->ID); } break; default: Index: trunk/src_plugins/ddraft/constraint_gui.c =================================================================== --- trunk/src_plugins/ddraft/constraint_gui.c (revision 31006) +++ trunk/src_plugins/ddraft/constraint_gui.c (revision 31007) @@ -62,7 +62,7 @@ *end++ = ' '; \ len--; \ } \ - l = pcb_snprintf(end, len, fmt, cons.name[n]); \ + l = rnd_snprintf(end, len, fmt, cons.name[n]); \ len -= l; \ end += l; \ } \ Index: trunk/src_plugins/diag/diag.c =================================================================== --- trunk/src_plugins/diag/diag.c (revision 31006) +++ trunk/src_plugins/diag/diag.c (revision 31007) @@ -153,7 +153,7 @@ } printf(" Native:\n"); - rnd_conf_print_native((rnd_conf_pfn)pcb_fprintf, stdout, " ", 1, nat); + rnd_conf_print_native((rnd_conf_pfn)rnd_fprintf, stdout, " ", 1, nat); RND_ACT_IRES(0); return 0; @@ -258,7 +258,7 @@ } name = f->name == NULL ? "" : f->name; - pcb_printf("%s: %d %s; dim: %$$mm * %$$mm glyphs: %d (letter: %d, digit: %d)\n", prefix, f->id, name, f->MaxWidth, f->MaxHeight, g, gletter, gdigit); + rnd_printf("%s: %d %s; dim: %$$mm * %$$mm glyphs: %d (letter: %d, digit: %d)\n", prefix, f->id, name, f->MaxWidth, f->MaxHeight, g, gletter, gdigit); } static const char dump_fonts_syntax[] = "dumpfonts()\n"; @@ -317,7 +317,7 @@ cx = (o->BoundingBox.X1+o->BoundingBox.X2)/2; cy = (o->BoundingBox.Y1+o->BoundingBox.Y2)/2; printf("%*s %s", ind, "", type); - pcb_printf(" #%ld %mm;%mm ", o->ID, cx, cy); + rnd_printf(" #%ld %mm;%mm ", o->ID, cx, cy); if (parent != NULL) printf("%s", parent); @@ -361,10 +361,10 @@ { pcb_flag_bits_t *flag = (pcb_flag_bits_t *)ctx; switch(**input) { - case 'm': (*input)++; pcb_append_printf(s, "%lx", flag->mask); break; + case 'm': (*input)++; rnd_append_printf(s, "%lx", flag->mask); break; case 'M': (*input)++; gds_append_str(s, flag->mask_name); break; case 'N': (*input)++; gds_append_str(s, flag->name); break; - case 't': (*input)++; pcb_append_printf(s, "%lx", flag->object_types); break; + case 't': (*input)++; rnd_append_printf(s, "%lx", flag->object_types); break; case 'H': (*input)++; gds_append_str(s, flag->name); break; default: return -1; @@ -384,7 +384,7 @@ for(n = 0; n < pcb_object_flagbits_len; n++) { char *tmp; - tmp = pcb_strdup_subst(fmt, dumpflag_cb, &pcb_object_flagbits[n], PCB_SUBST_PERCENT /*| PCB_SUBST_BACKSLASH*/); + tmp = rnd_strdup_subst(fmt, dumpflag_cb, &pcb_object_flagbits[n], RND_SUBST_PERCENT /*| RND_SUBST_BACKSLASH*/); printf("%s", tmp); free(tmp); } @@ -528,9 +528,9 @@ } if (want_bbox) - pcb_printf(DLF_PREFIX "bbox mm %mm %mm %mm %mm\n", SCRATCH.BoundingBox.X1, SCRATCH.BoundingBox.Y1, SCRATCH.BoundingBox.X2, SCRATCH.BoundingBox.Y2); + rnd_printf(DLF_PREFIX "bbox mm %mm %mm %mm %mm\n", SCRATCH.BoundingBox.X1, SCRATCH.BoundingBox.Y1, SCRATCH.BoundingBox.X2, SCRATCH.BoundingBox.Y2); if (want_origin) - pcb_printf(DLF_PREFIX "origin mm %mm %mm\n", SCRATCH.X, SCRATCH.Y); + rnd_printf(DLF_PREFIX "origin mm %mm %mm\n", SCRATCH.X, SCRATCH.Y); RND_ACT_IRES(0); } Index: trunk/src_plugins/diag/diag_conf.c =================================================================== --- trunk/src_plugins/diag/diag_conf.c (revision 31006) +++ trunk/src_plugins/diag/diag_conf.c (revision 31007) @@ -41,6 +41,6 @@ if (strncmp(node->hash_path, match_prefix, pl) != 0) continue; } - rnd_conf_print_native((rnd_conf_pfn)pcb_fprintf, f, prefix, verbose, node); + rnd_conf_print_native((rnd_conf_pfn)rnd_fprintf, f, prefix, verbose, node); } } Index: trunk/src_plugins/dialogs/dlg_about.c =================================================================== --- trunk/src_plugins/dialogs/dlg_about.c (revision 31006) +++ trunk/src_plugins/dialogs/dlg_about.c (revision 31007) @@ -86,7 +86,7 @@ gds_truncate(&s, 0); for (e2 = htsp_first(&cat->data.category.children); e2; e2 = htsp_next(&cat->data.category.children, e2)) { rnd_file_loaded_t *file = e2->value; - pcb_append_printf(&s, " %s\t%s\t%s\n", file->name, file->data.file.path, file->data.file.desc); + rnd_append_printf(&s, " %s\t%s\t%s\n", file->name, file->data.file.path, file->data.file.desc); } RND_DAD_LABEL(about_ctx.dlg, s.array); } Index: trunk/src_plugins/dialogs/dlg_fontsel.c =================================================================== --- trunk/src_plugins/dialogs/dlg_fontsel.c (revision 31006) +++ trunk/src_plugins/dialogs/dlg_fontsel.c (revision 31007) @@ -126,7 +126,7 @@ static void btn_replace_cb(void *hid_ctx, void *caller_data, rnd_hid_attribute_t *attr) { char file[1] = "", id[5]; - pcb_snprintf(id, sizeof(id), "%ld", conf_core.design.text_font_id); + rnd_snprintf(id, sizeof(id), "%ld", conf_core.design.text_font_id); rnd_actionva(&PCB->hidlib, "LoadFontFrom", file, id, NULL); /* modal, blocking */ fontsel_preview_update((fontsel_ctx_t *)caller_data); } Index: trunk/src_plugins/dialogs/dlg_infobar.c =================================================================== --- trunk/src_plugins/dialogs/dlg_infobar.c (revision 31006) +++ trunk/src_plugins/dialogs/dlg_infobar.c (revision 31007) @@ -97,7 +97,7 @@ } /* update labels */ - hv.str = pcb_strdup_printf("The file %s has changed on disk", PCB->hidlib.filename); + hv.str = rnd_strdup_printf("The file %s has changed on disk", PCB->hidlib.filename); rnd_gui->attr_dlg_set_value(sub.dlg_hid_ctx, wlab[0], &hv); free((char *)hv.str); Index: trunk/src_plugins/dialogs/dlg_lib_pstk.c =================================================================== --- trunk/src_plugins/dialogs/dlg_lib_pstk.c (revision 31006) +++ trunk/src_plugins/dialogs/dlg_lib_pstk.c (revision 31007) @@ -110,10 +110,10 @@ for(id = 0, proto = data->ps_protos.array; id < pcb_vtpadstack_proto_len(&data->ps_protos); proto++,id++) { if (!proto->in_use) continue; - cell[0] = pcb_strdup_printf("%ld", id); + cell[0] = rnd_strdup_printf("%ld", id); cell[1] = rnd_strdup(proto->name == NULL ? "" : proto->name); if (ctx->stat != NULL) - cell[2] = pcb_strdup_printf("%d", ctx->stat[id]); + cell[2] = rnd_strdup_printf("%d", ctx->stat[id]); else cell[2] = rnd_strdup(""); rnd_dad_tree_append(attr, NULL, cell); @@ -604,9 +604,9 @@ if (subc_id > 0) { if (sc->refdes != NULL) - name = pcb_strdup_printf("pcb-rnd padstacks - subcircuit #%ld (%s)", subc_id, sc->refdes); + name = rnd_strdup_printf("pcb-rnd padstacks - subcircuit #%ld (%s)", subc_id, sc->refdes); else - name = pcb_strdup_printf("pcb-rnd padstacks - subcircuit #%ld", subc_id); + name = rnd_strdup_printf("pcb-rnd padstacks - subcircuit #%ld", subc_id); } else name = rnd_strdup("pcb-rnd padstacks - board"); Index: trunk/src_plugins/dialogs/dlg_library_param.c =================================================================== --- trunk/src_plugins/dialogs/dlg_library_param.c (revision 31006) +++ trunk/src_plugins/dialogs/dlg_library_param.c (revision 31007) @@ -270,10 +270,10 @@ if (arg != NULL) { if (strlen(arg) > 32) { arg[32] = '\0'; - evl = pcb_strdup_printf("%s (%s...)", col, arg); + evl = rnd_strdup_printf("%s (%s...)", col, arg); } else - evl = pcb_strdup_printf("%s (%s)", col, arg); + evl = rnd_strdup_printf("%s (%s)", col, arg); } else evl = rnd_strdup(col); @@ -334,7 +334,7 @@ case RND_HATT_COORD: case RND_HATT_END: val = buff; - pcb_snprintf(buff, sizeof(buff), "%$$mH", a->val.crd); + rnd_snprintf(buff, sizeof(buff), "%$$mH", a->val.crd); break; default:; } @@ -348,7 +348,7 @@ if ((n == pushed) && (n < ctx->first_optional)) gds_append_str(&sres, val); /* positional */ else - pcb_append_printf(&sres, "%s=%s", ctx->pnames[n], val); + rnd_append_printf(&sres, "%s=%s", ctx->pnames[n], val); pushed++; } @@ -554,13 +554,13 @@ #ifdef __WIN32__ { char *s; - cmd = pcb_strdup_printf("%s/sh -c \"%s --help\"", rnd_w32_bindir, l->data.fp.loc_info); + cmd = rnd_strdup_printf("%s/sh -c \"%s --help\"", rnd_w32_bindir, l->data.fp.loc_info); for(s = cmd; *s != '\0'; s++) if (*s == '\\') *s = '/'; } #else - cmd = pcb_strdup_printf("%s --help", l->data.fp.loc_info); + cmd = rnd_strdup_printf("%s --help", l->data.fp.loc_info); #endif f = pcb_popen(NULL, cmd, "r"); free(cmd); Index: trunk/src_plugins/dialogs/dlg_padstack.c =================================================================== --- trunk/src_plugins/dialogs/dlg_padstack.c (revision 31006) +++ trunk/src_plugins/dialogs/dlg_padstack.c (revision 31007) @@ -55,7 +55,7 @@ } } - pcb_snprintf(out, size, "%s\n[%s]", gname, lname); + rnd_snprintf(out, size, "%s\n[%s]", gname, lname); return out; } @@ -84,7 +84,7 @@ /* instance */ if ((proto != NULL) && (proto->name != NULL)) prn = proto->name; - pcb_snprintf(tmp, sizeof(tmp), "#%ld:%d (%s)", (long int)pse->ps->proto, pse->ps->protoi, prn); + rnd_snprintf(tmp, sizeof(tmp), "#%ld:%d (%s)", (long int)pse->ps->proto, pse->ps->protoi, prn); RND_DAD_SET_VALUE(hid_ctx, pse->proto_id, str, tmp); RND_DAD_SET_VALUE(hid_ctx, pse->clearance, crd, pse->ps->Clearance); RND_DAD_SET_VALUE(hid_ctx, pse->rot, dbl, pse->ps->rot); @@ -108,9 +108,9 @@ case PCB_PSSH_CIRC: RND_DAD_SET_VALUE(hid_ctx, pse->proto_shape[n], str, "circle"); if ((shape->data.circ.x != 0) || (shape->data.circ.y != 0)) - pcb_snprintf(tmp, sizeof(tmp), "dia=%.06$mm\nat %.06$mm;%.06$mm", shape->data.circ.dia, shape->data.circ.x, shape->data.circ.y); + rnd_snprintf(tmp, sizeof(tmp), "dia=%.06$mm\nat %.06$mm;%.06$mm", shape->data.circ.dia, shape->data.circ.x, shape->data.circ.y); else - pcb_snprintf(tmp, sizeof(tmp), "dia=%.06$mm", shape->data.circ.dia); + rnd_snprintf(tmp, sizeof(tmp), "dia=%.06$mm", shape->data.circ.dia); break; case PCB_PSSH_LINE: if (shape->data.line.square) @@ -117,11 +117,11 @@ RND_DAD_SET_VALUE(hid_ctx, pse->proto_shape[n], str, "square line"); else RND_DAD_SET_VALUE(hid_ctx, pse->proto_shape[n], str, "round line"); - pcb_snprintf(tmp, sizeof(tmp), "thickness=%.06$mm", shape->data.line.thickness); + rnd_snprintf(tmp, sizeof(tmp), "thickness=%.06$mm", shape->data.line.thickness); break; case PCB_PSSH_POLY: RND_DAD_SET_VALUE(hid_ctx, pse->proto_shape[n], str, "polygon"); - pcb_snprintf(tmp, sizeof(tmp), "corners=%d", shape->data.poly.len); + rnd_snprintf(tmp, sizeof(tmp), "corners=%d", shape->data.poly.len); break; default: RND_DAD_SET_VALUE(hid_ctx, pse->proto_shape[n], str, ""); @@ -848,7 +848,7 @@ char *help = NULL; if (pcb_proto_board_layer_for(PCB->Data, pcb_proto_layers[n].mask, pcb_proto_layers[n].comb) == -1) { - layname = layname_tmp = pcb_strdup_printf("(%s)", pcb_proto_layers[n].name); + layname = layname_tmp = rnd_strdup_printf("(%s)", pcb_proto_layers[n].name); help = "No board layer available for this layer type.\nThis shape will not show on the board\nuntil the corresponding layer in the matching layer group type is created."; } Index: trunk/src_plugins/dialogs/dlg_pref_conf.c =================================================================== --- trunk/src_plugins/dialogs/dlg_pref_conf.c (revision 31006) +++ trunk/src_plugins/dialogs/dlg_pref_conf.c (revision 31007) @@ -97,7 +97,7 @@ *bnsep = '/'; parent = rnd_dad_tree_mkdirp(tree, path, NULL); for(i = 0; i < nat->array_size; i++) { - cell[0] = pcb_strdup_printf("[%d]", i); + cell[0] = rnd_strdup_printf("[%d]", i); rnd_dad_tree_append_under(attr, parent, cell); } } @@ -156,7 +156,7 @@ nd = rnd_conf_lht_get_at_mainplug(n, nat->hash_path, 1, 0); if (nd != NULL) { /* role, prio, policy, value */ rnd_conf_get_policy_prio(nd, &pol, &prio); - cell[1] = pcb_strdup_printf("%ld", prio); + cell[1] = rnd_strdup_printf("%ld", prio); cell[2] = rnd_strdup(rnd_conf_policy_name(pol)); cell[3] = rnd_strdup(pref_conf_get_val(nd, nat, idx)); } @@ -176,7 +176,7 @@ case RND_CFN_BOOLEAN: strcpy(buf, *val->boolean ? "true" : "false"); break; case RND_CFN_INTEGER: sprintf(buf, "%ld", *val->integer); break; case RND_CFN_REAL: sprintf(buf, "%f", *val->real); break; - case RND_CFN_COORD: pcb_snprintf(buf, sizebuf, "%mH\n%mm\n%ml", *val->coord, *val->coord, *val->coord); break; + case RND_CFN_COORD: rnd_snprintf(buf, sizebuf, "%mH\n%mm\n%ml", *val->coord, *val->coord, *val->coord); break; case RND_CFN_UNIT: strcpy(buf, (*val->unit)->suffix); break; case RND_CFN_COLOR: strcpy(buf, val->color->str); break; case RND_CFN_LIST: strcpy(buf, ""); break; @@ -247,7 +247,7 @@ strval = print_conf_val(n->type, &n->val, buf, sizeof(buf)); cell[0] = rolename == NULL ? rnd_strdup("") : rnd_strdup(rolename); - cell[1] = pcb_strdup_printf("%ld", n->prop.prio); + cell[1] = rnd_strdup_printf("%ld", n->prop.prio); cell[2] = rnd_strdup(strval); cell[3] = 0; rnd_dad_tree_append(attr, NULL, cell); @@ -262,10 +262,10 @@ src = nat->prop[idx].src; if (src != NULL) { rolename = rnd_conf_role_name(rnd_conf_lookup_role(nat->prop[idx].src)); - hv.str = tmp = pcb_strdup_printf("prio: %d role: %s\nsource: %s:%d.%d", nat->prop[idx].prio, rolename, src->file_name, src->line, src->col); + hv.str = tmp = rnd_strdup_printf("prio: %d role: %s\nsource: %s:%d.%d", nat->prop[idx].prio, rolename, src->file_name, src->line, src->col); } else - hv.str = tmp = pcb_strdup_printf("prio: %d\nsource: ", nat->prop[idx].prio); + hv.str = tmp = rnd_strdup_printf("prio: %d\nsource: ", nat->prop[idx].prio); rnd_gui->attr_dlg_set_value(ctx->dlg_hid_ctx, ctx->conf.wsrc[nat->type], &hv); free(tmp); Index: trunk/src_plugins/dialogs/dlg_pref_confedit.c =================================================================== --- trunk/src_plugins/dialogs/dlg_pref_confedit.c (revision 31006) +++ trunk/src_plugins/dialogs/dlg_pref_confedit.c (revision 31007) @@ -140,7 +140,7 @@ case RND_CFN_BOOLEAN: case RND_CFN_INTEGER: sprintf(buf, "%ld", attr->val.lng); break; case RND_CFN_REAL: sprintf(buf, "%f", attr->val.dbl); break; - case RND_CFN_COORD: pcb_snprintf(buf, sizeof(buf), "%.08$mH", attr->val.crd); break; + case RND_CFN_COORD: rnd_snprintf(buf, sizeof(buf), "%.08$mH", attr->val.crd); break; case RND_CFN_UNIT: if ((attr->val.lng < 0) || (attr->val.lng >= pcb_get_n_units(0))) return; Index: trunk/src_plugins/dialogs/dlg_pref_lib.c =================================================================== --- trunk/src_plugins/dialogs/dlg_pref_lib.c (revision 31006) +++ trunk/src_plugins/dialogs/dlg_pref_lib.c (revision 31007) @@ -412,7 +412,7 @@ if (strncmp(e->key, "rc/path/", 8) != 0) continue; - pcb_snprintf(tmp, sizeof(tmp), "$(rc.path.%s)", e->key + 8); + rnd_snprintf(tmp, sizeof(tmp), "$(rc.path.%s)", e->key + 8); RND_DAD_LABEL(ctx->dlg, tmp); RND_DAD_LABEL(ctx->dlg, nat->val.string[0] == NULL ? "" : nat->val.string[0]); } Index: trunk/src_plugins/dialogs/dlg_search.c =================================================================== --- trunk/src_plugins/dialogs/dlg_search.c (revision 31006) +++ trunk/src_plugins/dialogs/dlg_search.c (revision 31007) @@ -43,7 +43,7 @@ #define NEW_EXPR_LAB "" /* for debugging: */ -/*#define NEW_EXPR_LAB pcb_strdup_printf("%d:%d", row, col)*/ +/*#define NEW_EXPR_LAB rnd_strdup_printf("%d:%d", row, col)*/ #include "dlg_search_tab.h" Index: trunk/src_plugins/dialogs/dlg_search_edit.c =================================================================== --- trunk/src_plugins/dialogs/dlg_search_edit.c (revision 31006) +++ trunk/src_plugins/dialogs/dlg_search_edit.c (revision 31007) @@ -53,13 +53,13 @@ ctx->se.right = rnd_strdup(attr->val.str); break; case RIGHT_INT: - ctx->se.right = pcb_strdup_printf("%d", attr->val.lng); + ctx->se.right = rnd_strdup_printf("%d", attr->val.lng); break; case RIGHT_DOUBLE: - ctx->se.right = pcb_strdup_printf("%f", attr->val.dbl); + ctx->se.right = rnd_strdup_printf("%f", attr->val.dbl); break; case RIGHT_COORD: - ctx->se.right = pcb_strdup_printf("%$mm", attr->val.crd); + ctx->se.right = rnd_strdup_printf("%$mm", attr->val.crd); break; case RIGHT_CONST: case RIGHT_max: @@ -94,7 +94,7 @@ /* add all items */ cell[1] = NULL; for(o = op->ops; *o != NULL; o++) { - cell[0] = pcb_strdup_printf(*o); + cell[0] = rnd_strdup_printf(*o); r = rnd_dad_tree_append(attr, NULL, cell); r->user_data = (void *)(*o); /* will be casted back to const char * only */ if ((!click) && (ctx->se.op == *o)) @@ -129,7 +129,7 @@ /* add all items */ cell[1] = NULL; for(o = s->expr->right_const->ops; *o != NULL; o++) { - cell[0] = pcb_strdup_printf(*o); + cell[0] = rnd_strdup_printf(*o); rnd_dad_tree_append(attr, NULL, cell); } Index: trunk/src_plugins/dialogs/dlg_test.c =================================================================== --- trunk/src_plugins/dialogs/dlg_test.c (revision 31006) +++ trunk/src_plugins/dialogs/dlg_test.c (revision 31007) @@ -324,7 +324,7 @@ rnd_gui->attr_dlg_set_value(hid_ctx, ctx->wspout_int, &hv); sprintf(tmp, "%f", ctx->dlg[ctx->wspin_double].val.dbl); rnd_gui->attr_dlg_set_value(hid_ctx, ctx->wspout_double, &hv); - pcb_snprintf(tmp, sizeof(tmp), "%mm\n%ml", ctx->dlg[ctx->wspin_coord].val.crd, ctx->dlg[ctx->wspin_coord].val.crd); + rnd_snprintf(tmp, sizeof(tmp), "%mm\n%ml", ctx->dlg[ctx->wspin_coord].val.crd, ctx->dlg[ctx->wspin_coord].val.crd); rnd_gui->attr_dlg_set_value(hid_ctx, ctx->wspout_coord, &hv); } @@ -353,7 +353,7 @@ rnd_hid_row_t *new_row, *row = rnd_dad_tree_get_selected(treea); rnd_hid_attr_val_t val; - rowdata[0] = pcb_strdup_printf("dyn_%d", ctx->ttctr++); + rowdata[0] = rnd_strdup_printf("dyn_%d", ctx->ttctr++); new_row = rnd_dad_tree_insert(treea, row, rowdata); new_row->user_data2.lng = 1; @@ -369,7 +369,7 @@ rnd_hid_row_t *new_row, *row = rnd_dad_tree_get_selected(treea); rnd_hid_attr_val_t val; - rowdata[0] = pcb_strdup_printf("dyn_%d", ctx->ttctr++); + rowdata[0] = rnd_strdup_printf("dyn_%d", ctx->ttctr++); new_row = rnd_dad_tree_append(treea, row, rowdata); new_row->user_data2.lng = 1; @@ -519,7 +519,7 @@ static rnd_bool prv_mouse(rnd_hid_attribute_t *attrib, rnd_hid_preview_t *prv, rnd_hid_mouse_ev_t kind, rnd_coord_t x, rnd_coord_t y) { - pcb_printf("Mouse %d %mm %mm\n", kind, x, y); + rnd_printf("Mouse %d %mm %mm\n", kind, x, y); return (kind == RND_HID_MOUSE_PRESS) || (kind == RND_HID_MOUSE_RELEASE); } Index: trunk/src_plugins/dialogs/dlg_view.c =================================================================== --- trunk/src_plugins/dialogs/dlg_view.c (revision 31006) +++ trunk/src_plugins/dialogs/dlg_view.c (revision 31007) @@ -114,7 +114,7 @@ rt->user_data2.lng = 0; } - cell[0] = pcb_strdup_printf("%lu", v->uid); + cell[0] = rnd_strdup_printf("%lu", v->uid); cell[1] = rnd_strdup(v->title); r = rnd_dad_tree_append_under(attr, rt, cell); r->user_data2.lng = v->uid; @@ -175,9 +175,9 @@ break; case PCB_VIEW_DRC: if (v->data.drc.have_measured) - RND_DAD_SET_VALUE(ctx->dlg_hid_ctx, ctx->wmeasure, str, pcb_strdup_printf("DRC: %m+required: %$ms\nmeasured: %$ms\n", rnd_conf.editor.grid_unit->allow, v->data.drc.required_value, v->data.drc.measured_value)); + RND_DAD_SET_VALUE(ctx->dlg_hid_ctx, ctx->wmeasure, str, rnd_strdup_printf("DRC: %m+required: %$ms\nmeasured: %$ms\n", rnd_conf.editor.grid_unit->allow, v->data.drc.required_value, v->data.drc.measured_value)); else - RND_DAD_SET_VALUE(ctx->dlg_hid_ctx, ctx->wmeasure, str, pcb_strdup_printf("DRC: %m+required: %$ms\n", rnd_conf.editor.grid_unit->allow, v->data.drc.required_value)); + RND_DAD_SET_VALUE(ctx->dlg_hid_ctx, ctx->wmeasure, str, rnd_strdup_printf("DRC: %m+required: %$ms\n", rnd_conf.editor.grid_unit->allow, v->data.drc.required_value)); break; } } Index: trunk/src_plugins/djopt/djopt.c =================================================================== --- trunk/src_plugins/djopt/djopt.c (revision 31006) +++ trunk/src_plugins/djopt/djopt.c (revision 31007) @@ -152,16 +152,16 @@ bp = buf[bn] + strlen(buf[bn]); if (c->pin) - pcb_sprintf(bp, "pin %s:%s at %#mD", element_name_for(c), c->pin->term, c->x, c->y); + rnd_sprintf(bp, "pin %s:%s at %#mD", element_name_for(c), c->pin->term, c->x, c->y); else if (c->via) - pcb_sprintf(bp, "via at %#mD", c->x, c->y); + rnd_sprintf(bp, "via at %#mD", c->x, c->y); else if (c->pad) { - pcb_sprintf(bp, "pad %s:%s at %#mD %#mD-%#mD", + rnd_sprintf(bp, "pad %s:%s at %#mD %#mD-%#mD", element_name_for(c), c->pad->term, c->x, c->y, c->pad->BoundingBox.X1, c->pad->BoundingBox.Y1, c->pad->BoundingBox.X2, c->pad->BoundingBox.Y2); } else - pcb_sprintf(bp, "at %#mD", c->x, c->y); + rnd_sprintf(bp, "at %#mD", c->x, c->y); sprintf(bp + strlen(bp), " n%d l%d]\033[0m", c->n_lines, c->layer); return buf[bn]; } @@ -222,7 +222,7 @@ if (!ll->is_pad && (ll->s->x != ll->line->Point1.X || ll->s->y != ll->line->Point1.Y || ll->e->x != ll->line->Point2.X || ll->e->y != ll->line->Point2.Y)) { - pcb_printf("line: %#mD to %#mD pcbline: %#mD to %#mD\n", + rnd_printf("line: %#mD to %#mD pcbline: %#mD to %#mD\n", ll->s->x, ll->s->y, ll->e->x, ll->e->y, ll->line->Point1.X, ll->line->Point1.Y, ll->line->Point2.X, ll->line->Point2.Y); dj_abort("check:%d: line doesn't match pcbline\n", srcline); @@ -598,7 +598,7 @@ if (c->x > e->x2 && c->y > e->y2 && dist(c->x, c->y, e->x2, e->y2) > diam) return; - /*pcb_printf("add point %#mD diam %#mS\n", c->x, c->y, diam); */ + /*rnd_printf("add point %#mD diam %#mS\n", c->x, c->y, diam); */ add_point_to_rect(rect, c->x, c->y, diam); } @@ -1406,7 +1406,7 @@ c = c->next; } if (rv) - pcb_printf("orthopull: %ml mils saved\n", rv); + rnd_printf("orthopull: %ml mils saved\n", rv); return rv; } @@ -1537,7 +1537,7 @@ rv += simple_optimizations(); if (rv) - pcb_printf("debumpify: %ml mils saved\n", rv / 50); + rnd_printf("debumpify: %ml mils saved\n", rv / 50); return rv; } @@ -1770,7 +1770,7 @@ } if (rv) - pcb_printf("vianudge: %ml mils saved\n", rv); + rnd_printf("vianudge: %ml mils saved\n", rv); return rv; } Index: trunk/src_plugins/draw_fontsel/draw_fontsel.c =================================================================== --- trunk/src_plugins/draw_fontsel/draw_fontsel.c (revision 31006) +++ trunk/src_plugins/draw_fontsel/draw_fontsel.c (revision 31007) @@ -117,7 +117,7 @@ pcb_font_id_t target_fid = (txt == NULL) ? conf_core.design.text_font_id : txt->fid; nm = (f->name == NULL) ? "" : f->name; - pcb_snprintf(buf, sizeof(buf), "#%d [abc ABC 123] %s", f->id, nm); + rnd_snprintf(buf, sizeof(buf), "#%d [abc ABC 123] %s", f->id, nm); dchkbox(gc, x-4, *y, (f->id == target_fid)); Index: trunk/src_plugins/drc_query/dlg.c =================================================================== --- trunk/src_plugins/drc_query/dlg.c (revision 31006) +++ trunk/src_plugins/drc_query/dlg.c (revision 31007) @@ -257,7 +257,7 @@ } } - info = pcb_strdup_printf("DRC rule edit: %s on role %s", rule, rnd_conf_role_name(role)); + info = rnd_strdup_printf("DRC rule edit: %s on role %s", rule, rnd_conf_role_name(role)); RND_DAD_BEGIN_VBOX(ctx->dlg); RND_DAD_COMPFLAG(ctx->dlg, RND_HATF_EXPFILL); RND_DAD_LABEL(ctx->dlg, info); @@ -406,7 +406,7 @@ cell[1] = rnd_strdup(rnd_conf_role_name(role)); cell[2] = *dis ? "YES" : "no"; if (st->run_cnt > 0) - cell[3] = pcb_strdup_printf("%.3fs", st->last_run_time); + cell[3] = rnd_strdup_printf("%.3fs", st->last_run_time); else cell[3] = "-"; rnd_dad_tree_append(attr, NULL, cell); @@ -536,14 +536,14 @@ gds_init(&tmp); st = pcb_drcq_stat_get(nd->name); - pcb_append_printf(&tmp, "Ran %ld times", st->run_cnt); + rnd_append_printf(&tmp, "Ran %ld times", st->run_cnt); if (st->run_cnt > 0) { - pcb_append_printf(&tmp, "\nLast run took: %.6f s", st->last_run_time); - pcb_append_printf(&tmp, "\nTotal run time: %.6f s", st->sum_run_time); - pcb_append_printf(&tmp, "\nAverage run time: %.6f s", st->sum_run_time / (double)st->run_cnt); - pcb_append_printf(&tmp, "\nLast run violations: %ld", st->last_hit_cnt); - pcb_append_printf(&tmp, "\nTotal violations: %ld", st->sum_hit_cnt); - pcb_append_printf(&tmp, "\nAverage violations: %.2f", (double)st->sum_hit_cnt / (double)st->run_cnt); + rnd_append_printf(&tmp, "\nLast run took: %.6f s", st->last_run_time); + rnd_append_printf(&tmp, "\nTotal run time: %.6f s", st->sum_run_time); + rnd_append_printf(&tmp, "\nAverage run time: %.6f s", st->sum_run_time / (double)st->run_cnt); + rnd_append_printf(&tmp, "\nLast run violations: %ld", st->last_hit_cnt); + rnd_append_printf(&tmp, "\nTotal violations: %ld", st->sum_hit_cnt); + rnd_append_printf(&tmp, "\nAverage violations: %.2f", (double)st->sum_hit_cnt / (double)st->run_cnt); } hv.str = tmp.array; rnd_gui->attr_dlg_set_value(ctx->dlg_hid_ctx, ctx->wstat, &hv); Index: trunk/src_plugins/export_dsn/dsn.c =================================================================== --- trunk/src_plugins/export_dsn/dsn.c (revision 31006) +++ trunk/src_plugins/export_dsn/dsn.c (revision 31007) @@ -140,7 +140,7 @@ pcb_net_t *net = e->value; if (!strcmp(g->name, net->name)) { free(layeropts); - layeropts = pcb_strdup_printf("(type power) (use_net \"%s\")", g->name); + layeropts = rnd_strdup_printf("(type power) (use_net \"%s\")", g->name); } } fprintf(fp, " (layer \"%ld__%s\"\n", (long)GRP_NAME(g)); @@ -150,20 +150,20 @@ } /* PCB outline */ - pcb_fprintf(fp, " (boundary\n"); - pcb_fprintf(fp, " (rect pcb 0.0 0.0 %.6mm %.6mm)\n", PCB->hidlib.size_x, PCB->hidlib.size_y); - pcb_fprintf(fp, " )\n"); - pcb_fprintf(fp, " (via via_%ld_%ld)\n", viawidth, viadrill); + rnd_fprintf(fp, " (boundary\n"); + rnd_fprintf(fp, " (rect pcb 0.0 0.0 %.6mm %.6mm)\n", PCB->hidlib.size_x, PCB->hidlib.size_y); + rnd_fprintf(fp, " )\n"); + rnd_fprintf(fp, " (via via_%ld_%ld)\n", viawidth, viadrill); /* DRC rules */ - pcb_fprintf(fp, " (rule\n"); - pcb_fprintf(fp, " (width %mm)\n", trackwidth); - pcb_fprintf(fp, " (clear %mm)\n", clearance); - pcb_fprintf(fp, " (clear %mm (type wire_area))\n", clearance); - pcb_fprintf(fp, " (clear %mm (type via_smd via_pin))\n", clearance); - pcb_fprintf(fp, " (clear %mm (type smd_smd))\n", clearance); - pcb_fprintf(fp, " (clear %mm (type default_smd))\n", clearance); - pcb_fprintf(fp, " )\n )\n"); + rnd_fprintf(fp, " (rule\n"); + rnd_fprintf(fp, " (width %mm)\n", trackwidth); + rnd_fprintf(fp, " (clear %mm)\n", clearance); + rnd_fprintf(fp, " (clear %mm (type wire_area))\n", clearance); + rnd_fprintf(fp, " (clear %mm (type via_smd via_pin))\n", clearance); + rnd_fprintf(fp, " (clear %mm (type smd_smd))\n", clearance); + rnd_fprintf(fp, " (clear %mm (type default_smd))\n", clearance); + rnd_fprintf(fp, " )\n )\n"); } static void print_placement(FILE * fp) @@ -187,9 +187,9 @@ ename = rnd_strdup(subc->refdes); else 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"); + rnd_fprintf(fp, " (component %d\n", subc->ID); + rnd_fprintf(fp, " (place \"%s\" %.6mm %.6mm %s 0 (PN 0))\n", ename, ox, PCB->hidlib.size_y - oy, side); + rnd_fprintf(fp, " )\n"); free(ename); } PCB_END_LOOP; @@ -197,9 +197,9 @@ TODO("padstack: check if real shapes are exported") PCB_PADSTACK_LOOP(PCB->Data); { /* add mounting holes */ - pcb_fprintf(fp, " (component %d\n", padstack->ID); - pcb_fprintf(fp, " (place %d %.6mm %.6mm %s 0 (PN 0))\n", padstack->ID, padstack->x, (PCB->hidlib.size_y - padstack->y), "front"); - pcb_fprintf(fp, " )\n"); + rnd_fprintf(fp, " (component %d\n", padstack->ID); + rnd_fprintf(fp, " (place %d %.6mm %.6mm %s 0 (PN 0))\n", padstack->ID, padstack->x, (PCB->hidlib.size_y - padstack->y), "front"); + rnd_fprintf(fp, " )\n"); } PCB_END_LOOP; @@ -212,7 +212,7 @@ int fld; int n; - pcb_snprintf(tmp, sizeof(tmp), " (polygon \"%d__%s\" 0", GRP_NAME(grp)); + rnd_snprintf(tmp, sizeof(tmp), " (polygon \"%d__%s\" 0", GRP_NAME(grp)); gds_append_str(term_shapes, tmp); fld = 0; @@ -219,7 +219,7 @@ for(n = 0; n < ply->len; n++) { if ((fld % 3) == 0) gds_append_str(term_shapes, "\n "); - pcb_snprintf(tmp, sizeof(tmp), " %.6mm %.6mm", (ply->x[n] - ox) * partsidesign, -(ply->y[n] - oy)); + rnd_snprintf(tmp, sizeof(tmp), " %.6mm %.6mm", (ply->x[n] - ox) * partsidesign, -(ply->y[n] - oy)); gds_append_str(term_shapes, tmp); fld++; } @@ -235,7 +235,7 @@ int n; pcb_line_t ltmp; - pcb_snprintf(tmp, sizeof(tmp), " (polygon \"%d__%s\" 0", GRP_NAME(grp)); + rnd_snprintf(tmp, sizeof(tmp), " (polygon \"%d__%s\" 0", GRP_NAME(grp)); gds_append_str(term_shapes, tmp); memset(<mp, 0, sizeof(ltmp)); @@ -252,7 +252,7 @@ for(n = 0; n < 4; n++) { if ((fld % 3) == 0) gds_append_str(term_shapes, "\n "); - pcb_snprintf(tmp, sizeof(tmp), " %.6mm %.6mm", (x[n] - ox) * partsidesign, -(y[n] - oy)); + rnd_snprintf(tmp, sizeof(tmp), " %.6mm %.6mm", (x[n] - ox) * partsidesign, -(y[n] - oy)); gds_append_str(term_shapes, tmp); fld++; } @@ -264,12 +264,12 @@ { char tmp[512]; - pcb_snprintf(tmp, sizeof(tmp), " (circle \"%d__%s\"", GRP_NAME(grp)); + rnd_snprintf(tmp, sizeof(tmp), " (circle \"%d__%s\"", GRP_NAME(grp)); gds_append_str(term_shapes, tmp); TODO("padstack: this ignores circle center offset") - pcb_snprintf(tmp, sizeof(tmp), " %.6mm)\n", circ->dia); + rnd_snprintf(tmp, sizeof(tmp), " %.6mm)\n", circ->dia); gds_append_str(term_shapes, tmp); } @@ -281,7 +281,7 @@ int go; if (pl != NULL) { - pcb_snprintf(tmp, sizeof(tmp), "(polygon \"%d__%s\" 0", GRP_NAME(grp)); + rnd_snprintf(tmp, sizeof(tmp), "(polygon \"%d__%s\" 0", GRP_NAME(grp)); gds_append_str(term_shapes, tmp); fld = 0; @@ -288,7 +288,7 @@ for(go = pcb_poly_vect_first(it, &x, &y); go; go = pcb_poly_vect_next(it, &x, &y)) { if ((fld % 3) == 0) gds_append_str(term_shapes, "\n "); - pcb_snprintf(tmp, sizeof(tmp), " %.6mm %.6mm", (x - ox) * partsidesign, -(y - oy)); + rnd_snprintf(tmp, sizeof(tmp), " %.6mm %.6mm", (x - ox) * partsidesign, -(y - oy)); gds_append_str(term_shapes, tmp); fld++; } @@ -302,12 +302,12 @@ if (poly->term != NULL) { rnd_layergrp_id_t gid = term_on_bottom ? pcb_layergrp_get_bottom_copper() : pcb_layergrp_get_top_copper(); pcb_layergrp_t *grp = pcb_get_layergrp(PCB, gid); - char *padstack = pcb_strdup_printf("Term_poly_%ld", poly->ID); + char *padstack = rnd_strdup_printf("Term_poly_%ld", poly->ID); pcb_poly_it_t it; rnd_polyarea_t *pa; - pcb_fprintf(fp, " (pin %s \"%s\" %.6mm %.6mm)\n", padstack, poly->term, 0, 0); + rnd_fprintf(fp, " (pin %s \"%s\" %.6mm %.6mm)\n", padstack, poly->term, 0, 0); gds_append_str(term_shapes, " (padstack "); gds_append_str(term_shapes, padstack); @@ -407,9 +407,9 @@ PCB_PADSTACK_LOOP(subc->data); { rnd_layergrp_id_t group; - char *pid = pcb_strdup_printf("Pstk_shape_%ld", padstack->ID); + char *pid = rnd_strdup_printf("Pstk_shape_%ld", padstack->ID); - pcb_fprintf(fp, " (pin %s \"%s\" %.6mm %.6mm)\n", pid, padstack->term, (padstack->x-ox)*partsidesign, -(padstack->y-oy)); + rnd_fprintf(fp, " (pin %s \"%s\" %.6mm %.6mm)\n", pid, padstack->term, (padstack->x-ox)*partsidesign, -(padstack->y-oy)); gds_append_str(&term_shapes, " (padstack "); gds_append_str(&term_shapes, pid); @@ -434,8 +434,8 @@ PCB_END_LOOP; /* add padstack for terminals */ - pcb_fprintf(fp, "%s", term_shapes.array); - pcb_fprintf(fp, " )\n"); + rnd_fprintf(fp, "%s", term_shapes.array); + rnd_fprintf(fp, " )\n"); gds_uninit(&term_shapes); @@ -470,11 +470,11 @@ pcb_net_t *net = e->value; fprintf(fp, " \"%s\"", net->name); } - pcb_fprintf(fp, "\n"); - pcb_fprintf(fp, " (circuit\n"); - pcb_fprintf(fp, " (use_via via_%ld_%ld)\n", viawidth, viadrill); - pcb_fprintf(fp, " )\n"); - pcb_fprintf(fp, " (rule (width %.6mm))\n )\n )\n", trackwidth); + rnd_fprintf(fp, "\n"); + rnd_fprintf(fp, " (circuit\n"); + rnd_fprintf(fp, " (use_via via_%ld_%ld)\n", viawidth, viadrill); + rnd_fprintf(fp, " )\n"); + rnd_fprintf(fp, " (rule (width %.6mm))\n )\n )\n", trackwidth); } static void print_wires(FILE * fp) @@ -492,7 +492,7 @@ PCB_LINE_LOOP(lay); { - pcb_fprintf(fp, + rnd_fprintf(fp, " (wire (path %d__%s %.6mm %.6mm %.6mm %.6mm %.6mm)\n", GRP_NAME(g), line->Thickness, line->Point1.X, (PCB->hidlib.size_y - line->Point1.Y), line->Point2.X, (PCB->hidlib.size_y - line->Point2.Y)); Index: trunk/src_plugins/export_dxf/dxf.c =================================================================== --- trunk/src_plugins/export_dxf/dxf.c (revision 31006) +++ trunk/src_plugins/export_dxf/dxf.c (revision 31007) @@ -240,7 +240,7 @@ if (strcmp(name, "extmin") == 0) fprintf(f, "10\n0\n20\n0\n30\n0\n"); else if (strcmp(name, "extmax") == 0) - pcb_fprintf(f, "10\n%mm\n20\n0\n30\n%mm\n", PCB->hidlib.size_x, PCB->hidlib.size_y); + rnd_fprintf(f, "10\n%mm\n20\n0\n30\n%mm\n", PCB->hidlib.size_x, PCB->hidlib.size_y); else if (strcmp(name, "layers") == 0) { const char **s; for(s = layer_names; *s != NULL; s++) Index: trunk/src_plugins/export_dxf/dxf_draw.c =================================================================== --- trunk/src_plugins/export_dxf/dxf_draw.c (revision 31006) +++ trunk/src_plugins/export_dxf/dxf_draw.c (revision 31007) @@ -79,8 +79,8 @@ dxf_draw_handle(ctx); dxf_draw_line_props(ctx, gc); fprintf(ctx->f, "100\nAcDbLine\n"); - pcb_fprintf(ctx->f, "10\n%mm\n20\n%mm\n", TRX(x1), TRY(y1)); - pcb_fprintf(ctx->f, "11\n%mm\n21\n%mm\n", TRX(x2), TRY(y2)); + rnd_fprintf(ctx->f, "10\n%mm\n20\n%mm\n", TRX(x1), TRY(y1)); + rnd_fprintf(ctx->f, "11\n%mm\n21\n%mm\n", TRX(x2), TRY(y2)); } static void dxf_fill_circle(rnd_hid_gc_t gc, rnd_coord_t cx, rnd_coord_t cy, rnd_coord_t r) @@ -93,19 +93,19 @@ /* contour, just in case the hatch fails */ if (ctx->drill_contour) { fprintf(ctx->f, "100\nAcDbCircle\n"); - pcb_fprintf(ctx->f, "10\n%mm\n20\n%mm\n", TRX(cx), TRY(cy)); - pcb_fprintf(ctx->f, "40\n%mm\n", r); + rnd_fprintf(ctx->f, "10\n%mm\n20\n%mm\n", TRX(cx), TRY(cy)); + rnd_fprintf(ctx->f, "40\n%mm\n", r); } /* hatch for fill circle: use it for copper or if explicitly requested */ if (ctx->drill_fill || !gc->drawing_hole) { dxf_hatch_pre(ctx, &thin, 1); - pcb_fprintf(ctx->f, "72\n2\n"); /* circular contour */ - pcb_fprintf(ctx->f, "10\n%mm\n20\n%mm\n", TRX(cx), TRY(cy)); - pcb_fprintf(ctx->f, "40\n%mm\n", r); - pcb_fprintf(ctx->f, "50\n0\n"); - pcb_fprintf(ctx->f, "51\n360\n"); - pcb_fprintf(ctx->f, "73\n1\n"); /* is closed */ + rnd_fprintf(ctx->f, "72\n2\n"); /* circular contour */ + rnd_fprintf(ctx->f, "10\n%mm\n20\n%mm\n", TRX(cx), TRY(cy)); + rnd_fprintf(ctx->f, "40\n%mm\n", r); + rnd_fprintf(ctx->f, "50\n0\n"); + rnd_fprintf(ctx->f, "51\n360\n"); + rnd_fprintf(ctx->f, "73\n1\n"); /* is closed */ dxf_hatch_post(ctx); } } @@ -134,8 +134,8 @@ dxf_draw_handle(ctx); dxf_draw_line_props(ctx, gc); fprintf(ctx->f, "100\nAcDbCircle\n"); - pcb_fprintf(ctx->f, "10\n%mm\n20\n%mm\n", TRX(cx), TRY(cy)); - pcb_fprintf(ctx->f, "40\n%mm\n", (width + height)/2); + rnd_fprintf(ctx->f, "10\n%mm\n20\n%mm\n", TRX(cx), TRY(cy)); + rnd_fprintf(ctx->f, "40\n%mm\n", (width + height)/2); fprintf(ctx->f, "100\nAcDbArc\n"); fprintf(ctx->f, "50\n%f\n", start_angle); fprintf(ctx->f, "51\n%f\n", end_angle); @@ -167,8 +167,8 @@ if (to == n_coords) to = 0; fprintf(ctx->f, "72\n1\n"); /* edge=line */ - pcb_fprintf(ctx->f, "10\n%mm\n20\n%mm\n", TRX(x[n]+dx), TRY(y[n]+dy)); - pcb_fprintf(ctx->f, "11\n%mm\n21\n%mm\n", TRX(x[to]+dx), TRY(y[to]+dy)); + rnd_fprintf(ctx->f, "10\n%mm\n20\n%mm\n", TRX(x[n]+dx), TRY(y[n]+dy)); + rnd_fprintf(ctx->f, "11\n%mm\n21\n%mm\n", TRX(x[to]+dx), TRY(y[to]+dy)); } dxf_hatch_post(ctx); } Index: trunk/src_plugins/export_excellon/excellon.c =================================================================== --- trunk/src_plugins/export_excellon/excellon.c (revision 31006) +++ trunk/src_plugins/export_excellon/excellon.c (revision 31007) @@ -70,21 +70,21 @@ } if (pd->is_slot) { if (first) { - pcb_fprintf(f, "G00"); + rnd_fprintf(f, "G00"); first = 0; } if (force_g85) - pcb_fprintf(f, "X%[3]Y%[3]G85X%[3]Y%[3]\r\n", excellonDrX(pcb, pd->x), excellonDrY(PCB, pd->y), excellonDrX(pcb, pd->x2), excellonDrY(PCB, pd->y2)); + rnd_fprintf(f, "X%[3]Y%[3]G85X%[3]Y%[3]\r\n", excellonDrX(pcb, pd->x), excellonDrY(PCB, pd->y), excellonDrX(pcb, pd->x2), excellonDrY(PCB, pd->y2)); else - pcb_fprintf(f, "X%[3]Y%[3]\r\nM15\r\nG01X%[3]Y%[3]\r\nM17\r\n", excellonDrX(pcb, pd->x), excellonDrY(PCB, pd->y), excellonDrX(pcb, pd->x2), excellonDrY(PCB, pd->y2)); + rnd_fprintf(f, "X%[3]Y%[3]\r\nM15\r\nG01X%[3]Y%[3]\r\nM17\r\n", excellonDrX(pcb, pd->x), excellonDrY(PCB, pd->y), excellonDrX(pcb, pd->x2), excellonDrY(PCB, pd->y2)); first = 1; /* each new slot will need a G00 for some fabs that ignore M17 and M15 */ } else { if (first) { - pcb_fprintf(f, "G05\r\n"); + rnd_fprintf(f, "G05\r\n"); first = 0; } - pcb_fprintf(f, "X%[3]Y%[3]\r\n", excellonDrX(pcb, pd->x), excellonDrY(pcb, pd->y)); + rnd_fprintf(f, "X%[3]Y%[3]\r\n", excellonDrX(pcb, pd->x), excellonDrY(pcb, pd->y)); } cnt++; } @@ -101,7 +101,7 @@ always six-digit 0.1 mil resolution (i.e. 001100 = 0.11") */ fprintf(f, "M48\r\n%s\r\n", coord_fmt_hdr); for (search = ctx->apr.data; search; search = search->next) - pcb_fprintf(f, "T%02dC%[2]\r\n", search->dCode, search->width); + rnd_fprintf(f, "T%02dC%[2]\r\n", search->dCode, search->width); fprintf(f, "%%\r\n"); /* dump pending drills in sequence */ @@ -127,8 +127,8 @@ } cfmt = &coord_format[coord_fmt_idx]; - pcb_printf_slot[3] = cfmt->cfmt; - pcb_printf_slot[2] = cfmt->afmt; + rnd_printf_slot[3] = cfmt->cfmt; + rnd_printf_slot[2] = cfmt->afmt; if (ctx->obj.used > 0) drill_print_holes(pcb, f, ctx, force_g85, cfmt->hdr1); @@ -396,7 +396,7 @@ if (radius != lastwidth) { aperture_t *aptr = find_aperture(&(get_drill_ctx()->apr), radius, ROUND); if (aptr == NULL) - pcb_fprintf(stderr, "error: aperture for radius %$mS type ROUND is null\n", radius); + rnd_fprintf(stderr, "error: aperture for radius %$mS type ROUND is null\n", radius); lastwidth = radius; } } Index: trunk/src_plugins/export_fidocadj/fidocadj.c =================================================================== --- trunk/src_plugins/export_fidocadj/fidocadj.c (revision 31006) +++ trunk/src_plugins/export_fidocadj/fidocadj.c (revision 31007) @@ -145,7 +145,7 @@ (*fidoly_next)++; if (*fidoly_next > 15) { - char *msg = pcb_strdup_printf("FidoCadJ can't handle this many layers - layer %s is not exported\n", lyname); + char *msg = rnd_strdup_printf("FidoCadJ can't handle this many layers - layer %s is not exported\n", lyname); pcb_io_incompat_save(NULL, NULL, "layer", msg, NULL); free(msg); return -1; @@ -155,7 +155,7 @@ static void write_custom_subc(FILE *f, pcb_subc_t *sc) { - char *msg = pcb_strdup_printf("Can't export custom footprint for %s yet\n", sc->refdes); + char *msg = rnd_strdup_printf("Can't export custom footprint for %s yet\n", sc->refdes); pcb_io_incompat_save(sc->parent.data, (pcb_any_obj_t *)sc, msg, "subc", "subcircuit omitted - add the footprint type on the footprint list!"); free(msg); } Index: trunk/src_plugins/export_gcode/gcode.c =================================================================== --- trunk/src_plugins/export_gcode/gcode.c (revision 31006) +++ trunk/src_plugins/export_gcode/gcode.c (revision 31007) @@ -119,7 +119,7 @@ pcb_line_t *l; gctx.drawn_objs++; - pcb_fprintf(gctx.f, "G0 Z#100\nG0 X%mm Y%mm\n", TX(from->Point1.X), TY(from->Point1.Y)); + rnd_fprintf(gctx.f, "G0 Z#100\nG0 X%mm Y%mm\n", TX(from->Point1.X), TY(from->Point1.Y)); if (passes > 1) fprintf(gctx.f, "(new path)\n"); @@ -127,8 +127,8 @@ /* mill from..to (forward) */ fprintf(gctx.f, "G0 Z#%d\n", depth++); for(l = from; l != to; l = l->link.next) - pcb_fprintf(gctx.f, "G1 X%mm Y%mm\n", TX(l->Point2.X), TY(l->Point2.Y)); - pcb_fprintf(gctx.f, "G1 X%mm Y%mm\n", TX(to->Point2.X), TY(to->Point2.Y)); + rnd_fprintf(gctx.f, "G1 X%mm Y%mm\n", TX(l->Point2.X), TY(l->Point2.Y)); + rnd_fprintf(gctx.f, "G1 X%mm Y%mm\n", TX(to->Point2.X), TY(to->Point2.Y)); if (--passes <= 0) break; @@ -143,8 +143,8 @@ /* mill to..from (backward) */ fprintf(gctx.f, "G0 Z#%d\n", depth++); for(l = to; l != from; l = l->link.prev) - pcb_fprintf(gctx.f, "G1 X%mm Y%mm\n", TX(l->Point1.X), TY(l->Point1.Y)); - pcb_fprintf(gctx.f, "G1 X%mm Y%mm\n", TX(from->Point1.X), TY(from->Point1.Y)); + rnd_fprintf(gctx.f, "G1 X%mm Y%mm\n", TX(l->Point1.X), TY(l->Point1.Y)); + rnd_fprintf(gctx.f, "G1 X%mm Y%mm\n", TX(from->Point1.X), TY(from->Point1.Y)); if (--passes <= 0) break; } @@ -160,8 +160,8 @@ rnd_coord_t total = gcode_values[HA_totalcutdepth].crd; rnd_coord_t at = gcode_values[HA_layerdepth].crd; - pcb_fprintf(gctx.f, "#100=%mm (safe Z for travels above the board)\n", gcode_values[HA_safeZ].crd); - pcb_fprintf(gctx.f, "#101=%mm (cutting depth for layers)\n", gcode_values[HA_layerdepth].crd); + rnd_fprintf(gctx.f, "#100=%mm (safe Z for travels above the board)\n", gcode_values[HA_safeZ].crd); + rnd_fprintf(gctx.f, "#101=%mm (cutting depth for layers)\n", gcode_values[HA_layerdepth].crd); if (step > 0) @@ -181,11 +181,11 @@ } for(gctx.passes = 0, at += step; at > total; gctx.passes++, at += step) - pcb_fprintf(gctx.f, "#%d=%mm (%s cutting depth for thru-cuts)\n", thru_start_depth+gctx.passes, at, gctx.passes == 0 ? "first" : "next"); - pcb_fprintf(gctx.f, "#%d=%mm (last cutting depth for thru-cuts)\n", thru_start_depth+gctx.passes, total); + rnd_fprintf(gctx.f, "#%d=%mm (%s cutting depth for thru-cuts)\n", thru_start_depth+gctx.passes, at, gctx.passes == 0 ? "first" : "next"); + rnd_fprintf(gctx.f, "#%d=%mm (last cutting depth for thru-cuts)\n", thru_start_depth+gctx.passes, total); gctx.passes++; - pcb_fprintf(gctx.f, + rnd_fprintf(gctx.f, "G17 " /* X-Y plane */ "G21 " /* mm */ "G90 " /* absolute coords */ @@ -199,7 +199,7 @@ static void gcode_print_footer(void) { - pcb_fprintf(gctx.f, + rnd_fprintf(gctx.f, "G0 Z#100\n" /* remove the tool from the board, just in case */ "M05 " /* stop spindle */ "M09 " /* coolant off */ @@ -216,7 +216,7 @@ int start_depth, passes; if (tctx->res_path->Line.lst.length == 0) { - pcb_fprintf(gctx.f, "(empty layer group: %s)\n", grp->name); + rnd_fprintf(gctx.f, "(empty layer group: %s)\n", grp->name); return; } Index: trunk/src_plugins/export_gerber/gerber.c =================================================================== --- trunk/src_plugins/export_gerber/gerber.c (revision 31006) +++ trunk/src_plugins/export_gerber/gerber.c (revision 31007) @@ -98,13 +98,13 @@ { switch (aptr->shape) { case ROUND: - pcb_fprintf(f, "%%ADD%dC,%[5]*%%\r\n", aptr->dCode, aptr->width); + rnd_fprintf(f, "%%ADD%dC,%[5]*%%\r\n", aptr->dCode, aptr->width); break; case SQUARE: - pcb_fprintf(f, "%%ADD%dR,%[5]X%[5]*%%\r\n", aptr->dCode, aptr->width, aptr->width); + rnd_fprintf(f, "%%ADD%dR,%[5]X%[5]*%%\r\n", aptr->dCode, aptr->width, aptr->width); break; case OCTAGON: - pcb_fprintf(f, "%%AMOCT%d*5,0,8,0,0,%[5],22.5*%%\r\n" + rnd_fprintf(f, "%%AMOCT%d*5,0,8,0,0,%[5],22.5*%%\r\n" "%%ADD%dOCT%d*%%\r\n", aptr->dCode, (rnd_coord_t) ((double) aptr->width / RND_COS_22_5_DEGREE), aptr->dCode, aptr->dCode); break; } @@ -337,8 +337,8 @@ return; } gerber_cfmt = &coord_format[i]; - pcb_printf_slot[4] = gerber_cfmt->cfmt; - pcb_printf_slot[5] = gerber_cfmt->afmt; + rnd_printf_slot[4] = gerber_cfmt->cfmt; + rnd_printf_slot[5] = gerber_cfmt->afmt; gerber_drawn_objs = 0; pcb_cam_begin(PCB, &gerber_cam, &xform, options[HA_cam].str, gerber_options, NUM_OPTIONS, options); @@ -553,7 +553,7 @@ fprintf(f, "G04 For: %s *\r\n", pcb_author()); fprintf(f, "G04 Format: Gerber/RS-274X *\r\n"); - pcb_fprintf(f, "G04 PCB-Dimensions: %[4] %[4] *\r\n", PCB->hidlib.size_x, PCB->hidlib.size_y); + rnd_fprintf(f, "G04 PCB-Dimensions: %[4] %[4] *\r\n", PCB->hidlib.size_x, PCB->hidlib.size_y); fprintf(f, "G04 PCB-Coordinate-Origin: lower left *\r\n"); /* Unit and coord format */ @@ -686,7 +686,7 @@ if (radius != linewidth || lastcap != rnd_cap_round) { aperture_t *aptr = find_aperture(curr_aptr_list, radius, ROUND); if (aptr == NULL) - pcb_fprintf(stderr, "error: aperture for radius %$mS type ROUND is null\n", radius); + rnd_fprintf(stderr, "error: aperture for radius %$mS type ROUND is null\n", radius); else if (f != NULL) fprintf(f, "G54D%d*", aptr->dCode); linewidth = radius; @@ -712,7 +712,7 @@ } aptr = find_aperture(curr_aptr_list, linewidth, shape); if (aptr == NULL) - pcb_fprintf(stderr, "error: aperture for width %$mS type %s is null\n", linewidth, shape == ROUND ? "ROUND" : "SQUARE"); + rnd_fprintf(stderr, "error: aperture for width %$mS type %s is null\n", linewidth, shape == ROUND ? "ROUND" : "SQUARE"); if (f && aptr) fprintf(f, "G54D%d*", aptr->dCode); } @@ -736,12 +736,12 @@ if (x[i]+dx != lastX) { m = pcb_true; lastX = x[i]+dx; - pcb_fprintf(f, "X%[4]", gerberX(PCB, lastX)); + rnd_fprintf(f, "X%[4]", gerberX(PCB, lastX)); } if (y[i]+dy != lastY) { m = pcb_true; lastY = y[i]+dy; - pcb_fprintf(f, "Y%[4]", gerberY(PCB, lastY)); + rnd_fprintf(f, "Y%[4]", gerberY(PCB, lastY)); } if (firstTime) { firstTime = 0; @@ -757,12 +757,12 @@ if (startX != lastX) { m = pcb_true; lastX = startX; - pcb_fprintf(f, "X%[4]", gerberX(PCB, startX)); + rnd_fprintf(f, "X%[4]", gerberX(PCB, startX)); } if (startY != lastY) { m = pcb_true; lastY = startY; - pcb_fprintf(f, "Y%[4]", gerberY(PCB, lastY)); + rnd_fprintf(f, "Y%[4]", gerberY(PCB, lastY)); } if (m) fprintf(f, "D01*\r\n"); @@ -819,12 +819,12 @@ if (x1 != lastX) { m = pcb_true; lastX = x1; - pcb_fprintf(f, "X%[4]", gerberX(PCB, lastX)); + rnd_fprintf(f, "X%[4]", gerberX(PCB, lastX)); } if (y1 != lastY) { m = pcb_true; lastY = y1; - pcb_fprintf(f, "Y%[4]", gerberY(PCB, lastY)); + rnd_fprintf(f, "Y%[4]", gerberY(PCB, lastY)); } if ((x1 == x2) && (y1 == y2)) fprintf(f, "D03*\r\n"); @@ -833,11 +833,11 @@ fprintf(f, "D02*"); if (x2 != lastX) { lastX = x2; - pcb_fprintf(f, "X%[4]", gerberX(PCB, lastX)); + rnd_fprintf(f, "X%[4]", gerberX(PCB, lastX)); } if (y2 != lastY) { lastY = y2; - pcb_fprintf(f, "Y%[4]", gerberY(PCB, lastY)); + rnd_fprintf(f, "Y%[4]", gerberY(PCB, lastY)); } fprintf(f, "D01*\r\n"); @@ -935,16 +935,16 @@ if (arcStartX != lastX) { m = pcb_true; lastX = arcStartX; - pcb_fprintf(f, "X%[4]", gerberX(PCB, lastX)); + rnd_fprintf(f, "X%[4]", gerberX(PCB, lastX)); } if (arcStartY != lastY) { m = pcb_true; lastY = arcStartY; - pcb_fprintf(f, "Y%[4]", gerberY(PCB, lastY)); + rnd_fprintf(f, "Y%[4]", gerberY(PCB, lastY)); } if (m) fprintf(f, "D02*"); - pcb_fprintf(f, + rnd_fprintf(f, "G75*G0%1dX%[4]Y%[4]I%[4]J%[4]D01*G01*\r\n", (delta_angle < 0) ? 2 : 3, gerberX(PCB, arcStopX), gerberY(PCB, arcStopY), @@ -970,11 +970,11 @@ return; if (cx != lastX) { lastX = cx; - pcb_fprintf(f, "X%[4]", gerberX(PCB, lastX)); + rnd_fprintf(f, "X%[4]", gerberX(PCB, lastX)); } if (cy != lastY) { lastY = cy; - pcb_fprintf(f, "Y%[4]", gerberY(PCB, lastY)); + rnd_fprintf(f, "Y%[4]", gerberY(PCB, lastY)); } fprintf(f, "D03*\r\n"); } Index: trunk/src_plugins/export_ipcd356/ipcd356.c =================================================================== --- trunk/src_plugins/export_ipcd356/ipcd356.c (revision 31006) +++ trunk/src_plugins/export_ipcd356/ipcd356.c (revision 31007) @@ -112,7 +112,7 @@ sprintf(fmt, "%%0%d.0mm", len); crd *= 1000; } - pcb_snprintf(tmp, sizeof(tmp), fmt, crd); + rnd_snprintf(tmp, sizeof(tmp), fmt, crd); fill_field(dst, start, end, tmp, name); } Index: trunk/src_plugins/export_openems/excitation.c =================================================================== --- trunk/src_plugins/export_openems/excitation.c (revision 31006) +++ trunk/src_plugins/export_openems/excitation.c (revision 31007) @@ -192,7 +192,7 @@ if (!to_hz(rnd_attribute_get(&PCB->Attributes, AEPREFIX "gaussian::fc"), &fc)) rnd_message(RND_MSG_ERROR, "Gauss excitation: unable to parse frequency gaussian::fc\n"); - return pcb_strdup_printf("FDTD = SetGaussExcite(FDTD, %f, %f);", fc, f0); + return rnd_strdup_printf("FDTD = SetGaussExcite(FDTD, %f, %f);", fc, f0); } static void exc_gaus_ser(int idx, int save) @@ -227,7 +227,7 @@ if (!to_hz(rnd_attribute_get(&PCB->Attributes, AEPREFIX "sinusoidal::f0"), &f0)) rnd_message(RND_MSG_ERROR, "Sinus excitation: unable to parse frequency sinusoidal::f0\n"); - return pcb_strdup_printf("FDTD = SetSinusExcite(FDTD, %f);", f0); + return rnd_strdup_printf("FDTD = SetSinusExcite(FDTD, %f);", f0); } static void exc_sin_ser(int idx, int save) @@ -267,7 +267,7 @@ if (!to_hz(rnd_attribute_get(&PCB->Attributes, AEPREFIX "custom::f0"), &f0)) rnd_message(RND_MSG_ERROR, "Custom excitation: unable to parse frequency custom::f0\n"); - return pcb_strdup_printf( + return rnd_strdup_printf( "FDTD = SetCustomExcite(FDTD, %f, %s)", f0, rnd_attribute_get(&PCB->Attributes, AEPREFIX "custom::func") @@ -492,7 +492,7 @@ RND_PCB_ACT_CONVARG(start+0, FGW_STR, OpenemsExcitation, key = argv[start+0].val.str); RND_PCB_ACT_CONVARG(start+1, FGW_STR, OpenemsExcitation, val = argv[start+1].val.str); - attrkey = pcb_strdup_printf(AEPREFIX "%s::%s", a1, key); + attrkey = rnd_strdup_printf(AEPREFIX "%s::%s", a1, key); rnd_attribute_put(&PCB->Attributes, attrkey, val); free(attrkey); @@ -512,7 +512,7 @@ RND_PCB_ACT_CONVARG(start+0, FGW_STR, OpenemsExcitation, key = argv[start+0].val.str); - attrkey = pcb_strdup_printf(AEPREFIX "%s::%s", a1, key); + attrkey = rnd_strdup_printf(AEPREFIX "%s::%s", a1, key); res->type = FGW_STR; res->val.cstr = rnd_attribute_get(&PCB->Attributes, attrkey); free(attrkey); Index: trunk/src_plugins/export_openems/export_openems.c =================================================================== --- trunk/src_plugins/export_openems/export_openems.c (revision 31006) +++ trunk/src_plugins/export_openems/export_openems.c (revision 31007) @@ -207,8 +207,8 @@ fprintf(ctx->f, "base_priority=%ld;\n", ctx->options[HA_base_prio].lng); fprintf(ctx->f, "\n"); fprintf(ctx->f, "%% offset on the whole layout to locate it relative to the simulation origin\n"); - pcb_fprintf(ctx->f, "offset.x = %mm;\n", -ctx->ox); - pcb_fprintf(ctx->f, "offset.y = %mm;\n", ctx->oy); + rnd_fprintf(ctx->f, "offset.x = %mm;\n", -ctx->ox); + rnd_fprintf(ctx->f, "offset.y = %mm;\n", ctx->oy); fprintf(ctx->f, "offset.z = 0;\n"); fprintf(ctx->f, "\n"); @@ -251,9 +251,9 @@ fmt = (grp->ltype & PCB_LYT_COPPER) ? cop_fmt : subs_fmt; assert(opt >= 0); if (fmt == NULL) - pcb_fprintf(ctx->f, "%s", ctx->options[opt].str); + rnd_fprintf(ctx->f, "%s", ctx->options[opt].str); else - pcb_fprintf(ctx->f, fmt, ctx->options[opt].crd); + rnd_fprintf(ctx->f, fmt, ctx->options[opt].crd); } static void openems_write_layers(wctx_t *ctx) @@ -339,15 +339,15 @@ long n; pcb_poly_t *p = pcb_topoly_conn(ctx->pcb, out1, PCB_TOPOLY_KEEP_ORIG | PCB_TOPOLY_FLOATING); for(n = 0; n < p->PointN; n++) - pcb_fprintf(ctx->f, "outline_xy(1, %ld) = %mm; outline_xy(2, %ld) = %mm;\n", n+1, p->Points[n].X, n+1, -p->Points[n].Y); + rnd_fprintf(ctx->f, "outline_xy(1, %ld) = %mm; outline_xy(2, %ld) = %mm;\n", n+1, p->Points[n].X, n+1, -p->Points[n].Y); pcb_poly_free(p); } else { /* rectangular board size */ - pcb_fprintf(ctx->f, "outline_xy(1, 1) = 0; outline_xy(2, 1) = 0;\n"); - pcb_fprintf(ctx->f, "outline_xy(1, 2) = %mm; outline_xy(2, 2) = 0;\n", ctx->pcb->hidlib.size_x); - pcb_fprintf(ctx->f, "outline_xy(1, 3) = %mm; outline_xy(2, 3) = %mm;\n", ctx->pcb->hidlib.size_x, -ctx->pcb->hidlib.size_y); - pcb_fprintf(ctx->f, "outline_xy(1, 4) = 0; outline_xy(2, 4) = %mm;\n", -ctx->pcb->hidlib.size_y); + rnd_fprintf(ctx->f, "outline_xy(1, 1) = 0; outline_xy(2, 1) = 0;\n"); + rnd_fprintf(ctx->f, "outline_xy(1, 2) = %mm; outline_xy(2, 2) = 0;\n", ctx->pcb->hidlib.size_x); + rnd_fprintf(ctx->f, "outline_xy(1, 3) = %mm; outline_xy(2, 3) = %mm;\n", ctx->pcb->hidlib.size_x, -ctx->pcb->hidlib.size_y); + rnd_fprintf(ctx->f, "outline_xy(1, 4) = 0; outline_xy(2, 4) = %mm;\n", -ctx->pcb->hidlib.size_y); } /* create all substrate layers using this polygon*/ @@ -392,7 +392,7 @@ if (!isalnum(*s)) *s = '_'; - pcb_fprintf(ctx->f, "\npoint%s(1, 1) = %mm; point%s(2, 1) = %mm;\n", safe_name, x, safe_name, -y); + rnd_fprintf(ctx->f, "\npoint%s(1, 1) = %mm; point%s(2, 1) = %mm;\n", safe_name, x, safe_name, -y); fprintf(ctx->f, "[start%s, stop%s] = CalcPcbrnd2PortV(PCBRND, point%s, %d, %d);\n", safe_name, safe_name, safe_name, ctx->lg_pcb2ems[gid1], ctx->lg_pcb2ems[gid2]); fprintf(ctx->f, "[CSX, port{%ld}] = AddLumpedPort(CSX, 999, %ld, %f, start%s, stop%s, [0 0 -1]%s);\n", ctx->port_id, ctx->port_id, resistance, safe_name, safe_name, act ? ", true" : ""); @@ -512,7 +512,7 @@ { rnd_cardinal_t n; for(n = 0; n < vtc0_len(&l->result); n++) - pcb_fprintf(ctx->f, "%s%mm", (n == 0 ? "" : " "), l->result.array[n]); + rnd_fprintf(ctx->f, "%s%mm", (n == 0 ? "" : " "), l->result.array[n]); } static void openems_write_mesh1(wctx_t *ctx) @@ -554,7 +554,7 @@ } fprintf(ctx->f, "%%%%%% Board mesh, part 2\n"); - pcb_fprintf(ctx->f, "z_bottom_copper=%mm\n", mesh->z_bottom_copper); + rnd_fprintf(ctx->f, "z_bottom_copper=%mm\n", mesh->z_bottom_copper); fprintf(ctx->f, "mesh.y=["); openems_write_mesh_lines(ctx, &mesh->line[PCB_MESH_HORIZONTAL]); @@ -761,9 +761,9 @@ wctx_t *ctx = ems_ctx; long oid = ctx->oid++; - pcb_fprintf(ctx->f, "points%ld(1, 1) = %mm; points%ld(2, 1) = %mm;\n", oid, cx, oid, -cy); - pcb_fprintf(ctx->f, "points%ld(1, 2) = %mm; points%ld(2, 2) = %mm;\n", oid, cx, oid, -cy); - pcb_fprintf(ctx->f, "CSX = AddPcbrndTrace(CSX, PCBRND, %d, points%ld, %mm, 0);\n", ctx->clayer, oid, radius*2); + rnd_fprintf(ctx->f, "points%ld(1, 1) = %mm; points%ld(2, 1) = %mm;\n", oid, cx, oid, -cy); + rnd_fprintf(ctx->f, "points%ld(1, 2) = %mm; points%ld(2, 2) = %mm;\n", oid, cx, oid, -cy); + rnd_fprintf(ctx->f, "CSX = AddPcbrndTrace(CSX, PCBRND, %d, points%ld, %mm, 0);\n", ctx->clayer, oid, radius*2); } static void openems_fill_polygon_offs(rnd_hid_gc_t gc, int n_coords, rnd_coord_t *x, rnd_coord_t *y, rnd_coord_t dx, rnd_coord_t dy) @@ -773,7 +773,7 @@ long oid = ctx->oid++; for(n = 0; n < n_coords; n++) - pcb_fprintf(ctx->f, "poly%ld_xy(1, %ld) = %mm; poly%ld_xy(2, %ld) = %mm;\n", oid, n+1, x[n]+dx, oid, n+1, -(y[n]+dy)); + rnd_fprintf(ctx->f, "poly%ld_xy(1, %ld) = %mm; poly%ld_xy(2, %ld) = %mm;\n", oid, n+1, x[n]+dx, oid, n+1, -(y[n]+dy)); fprintf(ctx->f, "CSX = AddPcbrndPoly(CSX, PCBRND, %d, poly%ld_xy, 1);\n", ctx->clayer, oid); } @@ -799,9 +799,9 @@ } else { long oid = ctx->oid++; - pcb_fprintf(ctx->f, "points%ld(1, 1) = %mm; points%ld(2, 1) = %mm;\n", oid, x1, oid, -y1); - pcb_fprintf(ctx->f, "points%ld(1, 2) = %mm; points%ld(2, 2) = %mm;\n", oid, x2, oid, -y2); - pcb_fprintf(ctx->f, "CSX = AddPcbrndTrace(CSX, PCBRND, %d, points%ld, %mm, 0);\n", ctx->clayer, oid, gc->width); + rnd_fprintf(ctx->f, "points%ld(1, 1) = %mm; points%ld(2, 1) = %mm;\n", oid, x1, oid, -y1); + rnd_fprintf(ctx->f, "points%ld(1, 2) = %mm; points%ld(2, 2) = %mm;\n", oid, x2, oid, -y2); + rnd_fprintf(ctx->f, "CSX = AddPcbrndTrace(CSX, PCBRND, %d, points%ld, %mm, 0);\n", ctx->clayer, oid, gc->width); } } Index: trunk/src_plugins/export_openems/mesh.c =================================================================== --- trunk/src_plugins/export_openems/mesh.c (revision 31006) +++ trunk/src_plugins/export_openems/mesh.c (revision 31007) @@ -125,9 +125,9 @@ static void mesh_auto_add_smooth(vtc0_t *v, rnd_coord_t c1, rnd_coord_t c2, rnd_coord_t d1, rnd_coord_t d, rnd_coord_t d2); #define SAVE_INT(name) \ - pcb_append_printf(dst, "%s " #name" = %d\n", prefix, (int)me->dlg[me->name].val.lng); + rnd_append_printf(dst, "%s " #name" = %d\n", prefix, (int)me->dlg[me->name].val.lng); #define SAVE_COORD(name) \ - pcb_append_printf(dst, "%s " #name" = %.08$$mm\n", prefix, (rnd_coord_t)me->dlg[me->name].val.crd); + rnd_append_printf(dst, "%s " #name" = %.08$$mm\n", prefix, (rnd_coord_t)me->dlg[me->name].val.crd); void pcb_mesh_save(const mesh_dlg_t *me, gds_t *dst, const char *prefix) { int n; @@ -135,7 +135,7 @@ if (prefix == NULL) prefix = ""; - pcb_append_printf(dst, "%sha:pcb-rnd-mesh-v1 {\n", prefix); + rnd_append_printf(dst, "%sha:pcb-rnd-mesh-v1 {\n", prefix); SAVE_COORD(dens_obj); SAVE_COORD(dens_gap); SAVE_COORD(min_space); @@ -151,7 +151,7 @@ SAVE_COORD(max_air); SAVE_COORD(def_subs_thick); SAVE_COORD(def_copper_thick); - pcb_append_printf(dst, "%s li:boundary = {", prefix); + rnd_append_printf(dst, "%s li:boundary = {", prefix); for(n = 0; n < 6; n++) { int bidx = me->dlg[me->bnd[n]].val.lng; const char *bs; @@ -171,10 +171,10 @@ bs = "invalid"; else bs = subslines[sidx]; - pcb_append_printf(dst, "%s subslines = %s\n", prefix, bs); + rnd_append_printf(dst, "%s subslines = %s\n", prefix, bs); } - pcb_append_printf(dst, "%s}\n", prefix); + rnd_append_printf(dst, "%s}\n", prefix); } #undef SAVE_INT #undef SAVE_COORD @@ -1038,7 +1038,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_name_xy = rnd_strdup_printf("mesh 0: %s", mesh.layer->name); mesh.ui_layer_xy->name = rnd_strdup(mesh.ui_name_xy); rnd_event(&PCB->hidlib, PCB_EVENT_LAYERS_CHANGED, NULL); Index: trunk/src_plugins/export_openscad/export_openscad.c =================================================================== --- trunk/src_plugins/export_openscad/export_openscad.c (revision 31006) +++ trunk/src_plugins/export_openscad/export_openscad.c (revision 31007) @@ -235,7 +235,7 @@ scad_dump_comp(); fprintf(f, "}\n\n"); - pcb_append_printf(&layer_group_calls, " layer_group_%s();\n", scad_group_name); + rnd_append_printf(&layer_group_calls, " layer_group_%s();\n", scad_group_name); scad_group_name = NULL; scad_group_color = NULL; scad_group_level = 0; @@ -488,7 +488,7 @@ TRX(x2); TRY(y2); fix_rect_coords(); - pcb_fprintf(f, " pcb_fill_rect(%mm, %mm, %mm, %mm, %f, %f);\n", + rnd_fprintf(f, " pcb_fill_rect(%mm, %mm, %mm, %mm, %f, %f);\n", x1, y1, x2, y2, 0.0, effective_layer_thickness); } @@ -508,7 +508,7 @@ else cap_style = "rc"; - pcb_fprintf(f, " pcb_line_%s(%mm, %mm, %mm, %f, %mm, %f);\n", cap_style, + rnd_fprintf(f, " pcb_line_%s(%mm, %mm, %mm, %f, %mm, %f);\n", cap_style, x1, y1, (rnd_coord_t)rnd_round(length), angle * RND_RAD_TO_DEG, gc->width, effective_layer_thickness); } @@ -566,7 +566,7 @@ { TRX(cx); TRY(cy); - pcb_fprintf(f, " pcb_fcirc(%mm, %mm, %mm, %f);\n", cx, cy, radius, effective_layer_thickness); + rnd_fprintf(f, " pcb_fcirc(%mm, %mm, %mm, %f);\n", cx, cy, radius, effective_layer_thickness); } static void openscad_fill_polygon_offs(rnd_hid_gc_t gc, int n_coords, rnd_coord_t *x, rnd_coord_t *y, rnd_coord_t dx, rnd_coord_t dy) @@ -574,8 +574,8 @@ int n; fprintf(f, " pcb_fill_poly(["); for(n = 0; n < n_coords-1; n++) - pcb_fprintf(f, "[%mm,%mm],", TRX_(x[n]+dx), TRY_(y[n]+dy)); - pcb_fprintf(f, "[%mm,%mm]], %f);\n", TRX_(x[n]+dx), TRY_(y[n]+dy), effective_layer_thickness); + rnd_fprintf(f, "[%mm,%mm],", TRX_(x[n]+dx), TRY_(y[n]+dy)); + rnd_fprintf(f, "[%mm,%mm]], %f);\n", TRX_(x[n]+dx), TRY_(y[n]+dy), effective_layer_thickness); } static void openscad_fill_polygon(rnd_hid_gc_t gc, int n_coords, rnd_coord_t *x, rnd_coord_t *y) @@ -640,7 +640,7 @@ fprintf(f, "polygon(["); /* iterate over the vectors of the contour */ for(go = pcb_poly_vect_first(&it, &x, &y),cnt = 0; go; go = pcb_poly_vect_next(&it, &x, &y), cnt++) - pcb_fprintf(f, "%s[%mm,%mm]", (cnt > 0 ? "," : ""), x, y); + rnd_fprintf(f, "%s[%mm,%mm]", (cnt > 0 ? "," : ""), x, y); fprintf(f, "]);\n"); } } Index: trunk/src_plugins/export_openscad/scad_draw.c =================================================================== --- trunk/src_plugins/export_openscad/scad_draw.c (revision 31006) +++ trunk/src_plugins/export_openscad/scad_draw.c (revision 31007) @@ -90,7 +90,7 @@ fprintf(f, " polygon([\n\t\t"); /* we need the as-drawn polygon and we know there are no holes */ for(n = 0; n < poly->PointN; n++) - pcb_fprintf(f, "[%mm,%mm]%s", TRX_(poly->Points[n].X), TRY_(poly->Points[n].Y), ((n < (poly->PointN-1)) ? "," : "\n")); + rnd_fprintf(f, "[%mm,%mm]%s", TRX_(poly->Points[n].X), TRY_(poly->Points[n].Y), ((n < (poly->PointN-1)) ? "," : "\n")); fprintf(f, " ]);\n"); fprintf(f, "}\n"); @@ -110,8 +110,8 @@ TODO("padstack: this ignores bbvias") TODO("slot: this ignores slots") if (proto->hdia > 0) { - pcb_fprintf(f, " translate([%mm,%mm,0])\n", TRX_(ps->x), TRY_(ps->y)); - pcb_fprintf(f, " cylinder(r=%mm, h=4, center=true, $fn=30);\n", proto->hdia/2); + rnd_fprintf(f, " translate([%mm,%mm,0])\n", TRX_(ps->x), TRY_(ps->y)); + rnd_fprintf(f, " cylinder(r=%mm, h=4, center=true, $fn=30);\n", proto->hdia/2); } } Index: trunk/src_plugins/export_openscad/scad_models.c =================================================================== --- trunk/src_plugins/export_openscad/scad_models.c (revision 31006) +++ trunk/src_plugins/export_openscad/scad_models.c (revision 31007) @@ -62,7 +62,7 @@ fprintf(f, "%s", buff); } fclose(fin); - pcb_snprintf(buff, sizeof(buff), "pcb_part_%s", safe_name); + rnd_snprintf(buff, sizeof(buff), "pcb_part_%s", safe_name); htsp_set(models, (char *)name, rnd_strdup(buff)); free(safe_name); } @@ -75,28 +75,28 @@ if (ref != NULL) { char tab[] = "\t\t\t\t\t\t\t\t"; int ind = 0; - pcb_append_printf(&model_calls, " translate([%mm,%mm,%c0.8])\n", x0, y0, on_bottom ? '-' : '+'); + rnd_append_printf(&model_calls, " translate([%mm,%mm,%c0.8])\n", x0, y0, on_bottom ? '-' : '+'); ind++; tab[ind] = '\0'; if (on_bottom) { - pcb_append_printf(&model_calls, " %smirror([0,0,1])\n", tab); + rnd_append_printf(&model_calls, " %smirror([0,0,1])\n", tab); tab[ind] = '\t'; ind++; tab[ind] = '\0'; } if (rot != 0) { - pcb_append_printf(&model_calls, " %srotate([0,0,%f])\n", tab, rot); + rnd_append_printf(&model_calls, " %srotate([0,0,%f])\n", tab, rot); tab[ind] = '\t'; ind++; tab[ind] = '\0'; } if (transf != NULL) { - pcb_append_printf(&model_calls, " %s%s\n", tab, transf); + rnd_append_printf(&model_calls, " %s%s\n", tab, transf); tab[ind] = '\t'; ind++; tab[ind] = '\0'; } if (param != NULL) - pcb_append_printf(&model_calls, " %s%s(%s);\n", tab, ref, param); + rnd_append_printf(&model_calls, " %s%s(%s);\n", tab, ref, param); else - pcb_append_printf(&model_calls, " %s%s();\n", tab, ref); + rnd_append_printf(&model_calls, " %s%s();\n", tab, ref); } } Index: trunk/src_plugins/export_ps/eps.c =================================================================== --- trunk/src_plugins/export_ps/eps.c (revision 31006) +++ trunk/src_plugins/export_ps/eps.c (revision 31007) @@ -184,12 +184,12 @@ fprintf(f, "72 72 scale\n"); fprintf(f, "1 dup neg scale\n"); fprintf(f, "%g dup scale\n", options_[HA_scale].dbl); - pcb_fprintf(f, "%mi %mi translate\n", -bounds->X1, -bounds->Y2); + rnd_fprintf(f, "%mi %mi translate\n", -bounds->X1, -bounds->Y2); if (options_[HA_as_shown].lng && conf_core.editor.show_solder_side) - pcb_fprintf(f, "-1 1 scale %mi 0 translate\n", bounds->X1 - bounds->X2); + rnd_fprintf(f, "-1 1 scale %mi 0 translate\n", bounds->X1 - bounds->X2); #define Q (rnd_coord_t) PCB_MIL_TO_COORD(10) - pcb_fprintf(f, + rnd_fprintf(f, "/nclip { %mi %mi moveto %mi %mi lineto %mi %mi lineto %mi %mi lineto %mi %mi lineto eoclip newpath } def\n", bounds->X1 - Q, bounds->Y1 - Q, bounds->X1 - Q, bounds->Y2 + Q, bounds->X2 + Q, bounds->Y2 + Q, bounds->X2 + Q, bounds->Y1 - Q, bounds->X1 - Q, bounds->Y1 - Q); @@ -506,7 +506,7 @@ { eps_drawn_objs++; if (linewidth != gc->width) { - pcb_fprintf(f, "%mi setlinewidth\n", gc->width); + rnd_fprintf(f, "%mi setlinewidth\n", gc->width); linewidth = gc->width; } if (lastcap != gc->cap) { @@ -539,7 +539,7 @@ static void eps_draw_rect(rnd_hid_gc_t gc, rnd_coord_t x1, rnd_coord_t y1, rnd_coord_t x2, rnd_coord_t y2) { use_gc(gc); - pcb_fprintf(f, "%mi %mi %mi %mi r\n", x1, y1, x2, y2); + rnd_fprintf(f, "%mi %mi %mi %mi r\n", x1, y1, x2, y2); } static void eps_draw_line(rnd_hid_gc_t gc, rnd_coord_t x1, rnd_coord_t y1, rnd_coord_t x2, rnd_coord_t y2) @@ -561,14 +561,14 @@ rnd_coord_t vx1 = x1 + dx; rnd_coord_t vy1 = y1 + dy; - pcb_fprintf(f, "%mi %mi moveto ", vx1, vy1); - pcb_fprintf(f, "%mi %mi %mi %g %g arc\n", x2, y2, w, deg - 90, deg + 90); - pcb_fprintf(f, "%mi %mi %mi %g %g arc\n", x1, y1, w, deg + 90, deg + 270); + rnd_fprintf(f, "%mi %mi moveto ", vx1, vy1); + rnd_fprintf(f, "%mi %mi %mi %g %g arc\n", x2, y2, w, deg - 90, deg + 90); + rnd_fprintf(f, "%mi %mi %mi %g %g arc\n", x1, y1, w, deg + 90, deg + 270); fprintf(f, "nclip\n"); return; } - pcb_fprintf(f, "%mi %mi %mi %mi %s\n", x1, y1, x2, y2, gc->erase ? "tc" : "t"); + rnd_fprintf(f, "%mi %mi %mi %mi %s\n", x1, y1, x2, y2, gc->erase ? "tc" : "t"); } static void eps_draw_arc(rnd_hid_gc_t gc, rnd_coord_t cx, rnd_coord_t cy, rnd_coord_t width, rnd_coord_t height, rnd_angle_t start_angle, rnd_angle_t delta_angle) @@ -597,13 +597,13 @@ w = width; if (w == 0) /* make sure not to div by zero; this hack will have very similar effect */ w = 0.0001; - pcb_fprintf(f, "%ma %ma %mi %mi %mi %mi %f a\n", sa, ea, -width, height, cx, cy, (double) linewidth / w); + rnd_fprintf(f, "%ma %ma %mi %mi %mi %mi %f a\n", sa, ea, -width, height, cx, cy, (double) linewidth / w); } static void eps_fill_circle(rnd_hid_gc_t gc, rnd_coord_t cx, rnd_coord_t cy, rnd_coord_t radius) { use_gc(gc); - pcb_fprintf(f, "%mi %mi %mi %s\n", cx, cy, radius, gc->erase ? "cc" : "c"); + rnd_fprintf(f, "%mi %mi %mi %s\n", cx, cy, radius, gc->erase ? "cc" : "c"); } static void eps_fill_polygon_offs(rnd_hid_gc_t gc, int n_coords, rnd_coord_t *x, rnd_coord_t *y, rnd_coord_t dx, rnd_coord_t dy) @@ -612,7 +612,7 @@ const char *op = "moveto"; use_gc(gc); for (i = 0; i < n_coords; i++) { - pcb_fprintf(f, "%mi %mi %s\n", x[i] + dx, y[i] + dy, op); + rnd_fprintf(f, "%mi %mi %s\n", x[i] + dx, y[i] + dy, op); op = "lineto"; } @@ -628,7 +628,7 @@ static void eps_fill_rect(rnd_hid_gc_t gc, rnd_coord_t x1, rnd_coord_t y1, rnd_coord_t x2, rnd_coord_t y2) { use_gc(gc); - pcb_fprintf(f, "%mi %mi %mi %mi r\n", x1, y1, x2, y2); + rnd_fprintf(f, "%mi %mi %mi %mi r\n", x1, y1, x2, y2); } static void eps_calibrate(rnd_hid_t *hid, double xval, double yval) Index: trunk/src_plugins/export_ps/ps.c =================================================================== --- trunk/src_plugins/export_ps/ps.c (revision 31006) +++ trunk/src_plugins/export_ps/ps.c (revision 31007) @@ -444,11 +444,11 @@ * * Media sizes are in PCB units */ - pcb_fprintf(f, "%%%%DocumentMedia: %s %f %f 0 \"\" \"\"\n", + rnd_fprintf(f, "%%%%DocumentMedia: %s %f %f 0 \"\" \"\"\n", pcb_media_data[global.media_idx].name, 72 * PCB_COORD_TO_INCH(pcb_media_data[global.media_idx].width), 72 * PCB_COORD_TO_INCH(pcb_media_data[global.media_idx].height)); - pcb_fprintf(f, "%%%%DocumentPaperSizes: %s\n", pcb_media_data[global.media_idx].name); + rnd_fprintf(f, "%%%%DocumentPaperSizes: %s\n", pcb_media_data[global.media_idx].name); /* End General Header Comments. */ @@ -690,10 +690,10 @@ * of the thick line. */ - pcb_fprintf(fh, "gsave %mi setlinewidth %mi %mi translate %d %d scale\n", thick * 2, x, y, dx, dy); - pcb_fprintf(fh, "%mi %mi moveto %mi %mi %mi 0 90 arc %mi %mi lineto\n", len, thick, thick, thick, len2 + thick, thick, len); + rnd_fprintf(fh, "gsave %mi setlinewidth %mi %mi translate %d %d scale\n", thick * 2, x, y, dx, dy); + rnd_fprintf(fh, "%mi %mi moveto %mi %mi %mi 0 90 arc %mi %mi lineto\n", len, thick, thick, thick, len2 + thick, thick, len); if (dx < 0 && dy < 0) - pcb_fprintf(fh, "%mi %mi moveto 0 %mi rlineto\n", len2 * 2 + thick, thick, -len2); + rnd_fprintf(fh, "%mi %mi moveto 0 %mi rlineto\n", len2 * 2 + thick, thick, -len2); fprintf(fh, "stroke grestore\n"); } @@ -784,7 +784,7 @@ lastgroup = group; if ((!ps_cam.active) && (global.pagecount != 0)) { - pcb_fprintf(global.f, "showpage\n"); + rnd_fprintf(global.f, "showpage\n"); } global.pagecount++; if ((!ps_cam.active && global.multi_file) || (ps_cam.active && ps_cam.fn_changed)) { @@ -851,7 +851,7 @@ } fprintf(global.f, "newpath\n"); - pcb_fprintf(global.f, "72 72 scale %mi %mi translate\n", global.media_width / 2, global.media_height / 2); + rnd_fprintf(global.f, "72 72 scale %mi %mi translate\n", global.media_width / 2, global.media_height / 2); boffset = global.media_height / 2; if (PCB->hidlib.size_x > PCB->hidlib.size_y) { @@ -866,7 +866,7 @@ fprintf(global.f, "1 -1 scale\n"); fprintf(global.f, "%g dup neg scale\n", PCB_LAYER_IS_FAB(flags, purpi) ? 1.0 : global.scale_factor); - pcb_fprintf(global.f, "%mi %mi translate\n", -PCB->hidlib.size_x / 2, -PCB->hidlib.size_y / 2); + rnd_fprintf(global.f, "%mi %mi translate\n", -PCB->hidlib.size_x / 2, -PCB->hidlib.size_y / 2); /* Keep the drill list from falling off the left edge of the paper, * even if it means some of the board falls off the right edge. @@ -875,9 +875,9 @@ if (PCB_LAYER_IS_FAB(flags, purpi)) { rnd_coord_t natural = boffset - PCB_MIL_TO_COORD(500) - PCB->hidlib.size_y / 2; rnd_coord_t needed = pcb_stub_draw_fab_overhang(); - pcb_fprintf(global.f, "%% PrintFab overhang natural %mi, needed %mi\n", natural, needed); + rnd_fprintf(global.f, "%% PrintFab overhang natural %mi, needed %mi\n", natural, needed); if (needed > natural) - pcb_fprintf(global.f, "0 %mi translate\n", needed - natural); + rnd_fprintf(global.f, "0 %mi translate\n", needed - natural); } if (global.invert) { @@ -891,7 +891,7 @@ if (!global.has_outline || global.invert) { if ((PCB_LAYER_IS_ROUTE(flags, purpi)) || (global.outline)) { - pcb_fprintf(global.f, + rnd_fprintf(global.f, "0 setgray %mi setlinewidth 0 0 moveto 0 " "%mi lineto %mi %mi lineto %mi 0 lineto closepath %s\n", conf_core.design.min_wid, @@ -920,7 +920,7 @@ "/c { 0 360 arc fill } bind def\n" "/a { gsave setlinewidth translate scale 0 0 1 5 3 roll arc stroke grestore} bind def\n"); if (global.drill_helper) - pcb_fprintf(global.f, + rnd_fprintf(global.f, "/dh { gsave %mi setlinewidth 0 gray %mi 0 360 arc stroke grestore} bind def\n", (rnd_coord_t) global.drill_helper_size, (rnd_coord_t) (global.drill_helper_size * 3 / 2)); } @@ -1026,7 +1026,7 @@ abort(); } if (global.linewidth != gc->width) { - pcb_fprintf(global.f, "%mi setlinewidth\n", gc->width); + rnd_fprintf(global.f, "%mi setlinewidth\n", gc->width); global.linewidth = gc->width; } if (lastcap != gc->cap) { @@ -1073,7 +1073,7 @@ static void ps_draw_rect(rnd_hid_gc_t gc, rnd_coord_t x1, rnd_coord_t y1, rnd_coord_t x2, rnd_coord_t y2) { use_gc(gc); - pcb_fprintf(global.f, "%mi %mi %mi %mi dr\n", x1, y1, x2, y2); + rnd_fprintf(global.f, "%mi %mi %mi %mi dr\n", x1, y1, x2, y2); } static void ps_fill_rect(rnd_hid_gc_t gc, rnd_coord_t x1, rnd_coord_t y1, rnd_coord_t x2, rnd_coord_t y2); @@ -1111,7 +1111,7 @@ return; } use_gc(gc); - pcb_fprintf(global.f, "%mi %mi %mi %mi t\n", x1, y1, x2, y2); + rnd_fprintf(global.f, "%mi %mi %mi %mi t\n", x1, y1, x2, y2); } static void ps_draw_arc(rnd_hid_gc_t gc, rnd_coord_t cx, rnd_coord_t cy, rnd_coord_t width, rnd_coord_t height, rnd_angle_t start_angle, rnd_angle_t delta_angle) @@ -1140,7 +1140,7 @@ w = width; if (w == 0) /* make sure not to div by zero; this hack will have very similar effect */ w = 0.0001; - pcb_fprintf(global.f, "%ma %ma %mi %mi %mi %mi %f a\n", + rnd_fprintf(global.f, "%ma %ma %mi %mi %mi %mi %f a\n", sa, ea, -width, height, cx, cy, (double)(global.linewidth) / w); } @@ -1150,7 +1150,7 @@ if (!gc->erase || !global.is_copper || global.drillcopper) { if (gc->erase && global.is_copper && global.drill_helper && radius >= global.drill_helper_size) radius = global.drill_helper_size; - pcb_fprintf(global.f, "%mi %mi %mi c\n", cx, cy, radius); + rnd_fprintf(global.f, "%mi %mi %mi c\n", cx, cy, radius); } } @@ -1160,7 +1160,7 @@ const char *op = "moveto"; use_gc(gc); for (i = 0; i < n_coords; i++) { - pcb_fprintf(global.f, "%mi %mi %s\n", x[i]+dx, y[i]+dy, op); + rnd_fprintf(global.f, "%mi %mi %s\n", x[i]+dx, y[i]+dy, op); op = "lineto"; } fprintf(global.f, "fill\n"); @@ -1210,8 +1210,8 @@ #define lseg_line(x1_, y1_, x2_, y2_) \ do { \ fprintf(global.f, "newpath\n"); \ - pcb_fprintf(global.f, "%mi %mi moveto\n", x1_, y1_); \ - pcb_fprintf(global.f, "%mi %mi lineto\n", x2_, y2_); \ + rnd_fprintf(global.f, "%mi %mi moveto\n", x1_, y1_); \ + rnd_fprintf(global.f, "%mi %mi lineto\n", x2_, y2_); \ fprintf (global.f, "stroke\n"); \ } while(0) @@ -1246,7 +1246,7 @@ return; } #endif - pcb_fprintf(global.f, "%mi %mi %mi %mi r\n", x1, y1, x2, y2); + rnd_fprintf(global.f, "%mi %mi %mi %mi r\n", x1, y1, x2, y2); } rnd_hid_attribute_t ps_calib_attribute_list[] = { Index: trunk/src_plugins/export_stat/stat.c =================================================================== --- trunk/src_plugins/export_stat/stat.c (revision 31006) +++ trunk/src_plugins/export_stat/stat.c (revision 31007) @@ -243,7 +243,7 @@ fprintf(f, " lines=%lu\n", ls.lines); fprintf(f, " arcs=%lu\n", ls.arcs); fprintf(f, " polys=%lu\n", ls.polys); - pcb_fprintf(f, " trace_len=%$mm\n", ls.trace_len); + rnd_fprintf(f, " trace_len=%$mm\n", ls.trace_len); fprintf(f, " copper_area={%f mm^2}\n", (double)ls.copper_area / (double)PCB_MM_TO_COORD(1) / (double)PCB_MM_TO_COORD(1)); } fprintf(f, " }\n"); @@ -259,7 +259,7 @@ fprintf(f, " lines=%lu\n", lgss[lgid].lines); fprintf(f, " arcs=%lu\n", lgss[lgid].arcs); fprintf(f, " polys=%lu\n", lgss[lgid].polys); - pcb_fprintf(f, " trace_len=%$mm\n", lgss[lgid].trace_len); + rnd_fprintf(f, " trace_len=%$mm\n", lgss[lgid].trace_len); fprintf(f, " copper_area={%f mm^2}\n", (double)lgss[lgid].copper_area / (double)PCB_MM_TO_COORD(1) / (double)PCB_MM_TO_COORD(1)); fprintf(f, " }\n"); } @@ -348,8 +348,8 @@ fprintf(f, " id={%s}\n", options[HA_board_id].str == NULL ? "" : options[HA_board_id].str); fprintf(f, " license={%s}\n", options[HA_license].str); fprintf(f, " format={%s}\n", PCB->Data->loader == NULL ? "unknown" : PCB->Data->loader->description); - pcb_fprintf(f, " width=%$mm\n", width); - pcb_fprintf(f, " height=%$mm\n", height); + rnd_fprintf(f, " width=%$mm\n", width); + rnd_fprintf(f, " height=%$mm\n", height); fprintf(f, " gross_area={%.4f mm^2}\n", (double)PCB_COORD_TO_MM(width) * (double)PCB_COORD_TO_MM(height)); fprintf(f, " holes_plated=%d\n", hp); fprintf(f, " holes_unplated=%d\n", hup); Index: trunk/src_plugins/export_stl/export_stl.c =================================================================== --- trunk/src_plugins/export_stl/export_stl.c (revision 31006) +++ trunk/src_plugins/export_stl/export_stl.c (revision 31007) @@ -88,14 +88,14 @@ fprintf(f, " outer loop\n"); if (up) { - pcb_fprintf(f, " vertex %.09mm %.09mm %.09mm\n", (rnd_coord_t)t->Points[0]->X, (rnd_coord_t)t->Points[0]->Y, z); - pcb_fprintf(f, " vertex %.09mm %.09mm %.09mm\n", (rnd_coord_t)t->Points[1]->X, (rnd_coord_t)t->Points[1]->Y, z); - pcb_fprintf(f, " vertex %.09mm %.09mm %.09mm\n", (rnd_coord_t)t->Points[2]->X, (rnd_coord_t)t->Points[2]->Y, z); + rnd_fprintf(f, " vertex %.09mm %.09mm %.09mm\n", (rnd_coord_t)t->Points[0]->X, (rnd_coord_t)t->Points[0]->Y, z); + rnd_fprintf(f, " vertex %.09mm %.09mm %.09mm\n", (rnd_coord_t)t->Points[1]->X, (rnd_coord_t)t->Points[1]->Y, z); + rnd_fprintf(f, " vertex %.09mm %.09mm %.09mm\n", (rnd_coord_t)t->Points[2]->X, (rnd_coord_t)t->Points[2]->Y, z); } else { - pcb_fprintf(f, " vertex %.09mm %.09mm %.09mm\n", (rnd_coord_t)t->Points[2]->X, (rnd_coord_t)t->Points[2]->Y, z); - pcb_fprintf(f, " vertex %.09mm %.09mm %.09mm\n", (rnd_coord_t)t->Points[1]->X, (rnd_coord_t)t->Points[1]->Y, z); - pcb_fprintf(f, " vertex %.09mm %.09mm %.09mm\n", (rnd_coord_t)t->Points[0]->X, (rnd_coord_t)t->Points[0]->Y, z); + rnd_fprintf(f, " vertex %.09mm %.09mm %.09mm\n", (rnd_coord_t)t->Points[2]->X, (rnd_coord_t)t->Points[2]->Y, z); + rnd_fprintf(f, " vertex %.09mm %.09mm %.09mm\n", (rnd_coord_t)t->Points[1]->X, (rnd_coord_t)t->Points[1]->Y, z); + rnd_fprintf(f, " vertex %.09mm %.09mm %.09mm\n", (rnd_coord_t)t->Points[0]->X, (rnd_coord_t)t->Points[0]->Y, z); } fprintf(f, " endloop\n"); @@ -114,17 +114,17 @@ fprintf(f, " facet normal %f %f 0\n", nx, ny); fprintf(f, " outer loop\n"); - pcb_fprintf(f, " vertex %.09mm %.09mm %.09mm\n", x2, y2, z1); - pcb_fprintf(f, " vertex %.09mm %.09mm %.09mm\n", x1, y1, z1); - pcb_fprintf(f, " vertex %.09mm %.09mm %.09mm\n", x1, y1, z0); + rnd_fprintf(f, " vertex %.09mm %.09mm %.09mm\n", x2, y2, z1); + rnd_fprintf(f, " vertex %.09mm %.09mm %.09mm\n", x1, y1, z1); + rnd_fprintf(f, " vertex %.09mm %.09mm %.09mm\n", x1, y1, z0); fprintf(f, " endloop\n"); fprintf(f, " endfacet\n"); fprintf(f, " facet normal %f %f 0\n", nx, ny); fprintf(f, " outer loop\n"); - pcb_fprintf(f, " vertex %.09mm %.09mm %.09mm\n", x2, y2, z1); - pcb_fprintf(f, " vertex %.09mm %.09mm %.09mm\n", x1, y1, z0); - pcb_fprintf(f, " vertex %.09mm %.09mm %.09mm\n", x2, y2, z0); + rnd_fprintf(f, " vertex %.09mm %.09mm %.09mm\n", x2, y2, z1); + rnd_fprintf(f, " vertex %.09mm %.09mm %.09mm\n", x1, y1, z0); + rnd_fprintf(f, " vertex %.09mm %.09mm %.09mm\n", x2, y2, z0); fprintf(f, " endloop\n"); fprintf(f, " endfacet\n"); } Index: trunk/src_plugins/export_svg/svg.c =================================================================== --- trunk/src_plugins/export_svg/svg.c (revision 31006) +++ trunk/src_plugins/export_svg/svg.c (revision 31007) @@ -239,7 +239,7 @@ } if (photo_mode) { - pcb_fprintf(f, "\n", + rnd_fprintf(f, "\n", 0, 0, PCB->hidlib.size_x, PCB->hidlib.size_y, board_color); } @@ -304,7 +304,7 @@ y2 = PCB->hidlib.size_y; x2 += PCB_MM_TO_COORD(5); y2 += PCB_MM_TO_COORD(5); - pcb_fprintf(f, "\n", w, h, x1, y1, x2, y2); + rnd_fprintf(f, "\n", w, h, x1, y1, x2, y2); } static void svg_footer(void) @@ -497,10 +497,10 @@ case RND_HID_COMP_RESET: comp_cnt++; gds_init(&sclip); - pcb_append_printf(&snormal, "\n"); - pcb_append_printf(&snormal, "\n"); - pcb_append_printf(&snormal, "\n", comp_cnt); - pcb_append_printf(&sclip, "\n", comp_cnt, PCB->hidlib.size_x, PCB->hidlib.size_y); + rnd_append_printf(&snormal, "\n"); + rnd_append_printf(&snormal, "\n"); + rnd_append_printf(&snormal, "\n", comp_cnt); + rnd_append_printf(&sclip, "\n", comp_cnt, PCB->hidlib.size_x, PCB->hidlib.size_y); break; case RND_HID_COMP_POSITIVE: @@ -509,12 +509,12 @@ break; case RND_HID_COMP_FLUSH: - pcb_append_printf(&snormal, "\n"); - pcb_append_printf(&sclip, "\n"); + rnd_append_printf(&snormal, "\n"); + rnd_append_printf(&sclip, "\n"); gds_append_str(&snormal, sclip.array); - pcb_append_printf(&snormal, "\n"); - pcb_append_printf(&snormal, "\n", comp_cnt, comp_cnt); - pcb_append_printf(&snormal, "\n"); + rnd_append_printf(&snormal, "\n"); + rnd_append_printf(&snormal, "\n", comp_cnt, comp_cnt); + rnd_append_printf(&snormal, "\n"); gds_uninit(&sclip); break; } @@ -572,17 +572,17 @@ if (group_open < sizeof(ind)-1) { ind[group_open] = '\0'; if (s == NULL) - pcb_fprintf(f, ind); + rnd_fprintf(f, ind); else - pcb_append_printf(s, ind); + rnd_append_printf(s, ind); ind[group_open] = ' '; return; } if (s == NULL) - pcb_fprintf(f, ind); + rnd_fprintf(f, ind); else - pcb_append_printf(s, ind); + rnd_append_printf(s, ind); } static void svg_set_draw_xor(rnd_hid_gc_t gc, int xor_) @@ -607,11 +607,11 @@ const char *clip_color = svg_clip_color(gc); indent(&snormal); - pcb_append_printf(&snormal, "\n", + rnd_append_printf(&snormal, "\n", x1, y1, w, h, stroke, svg_color(gc), CAPS(gc->cap)); if (clip_color != NULL) { indent(&sclip); - pcb_append_printf(&sclip, "\n", + rnd_append_printf(&sclip, "\n", x1, y1, w, h, stroke, clip_color, CAPS(gc->cap)); } } @@ -630,22 +630,22 @@ rnd_coord_t photo_offs = photo_palette[photo_color].offs; if (photo_offs != 0) { indent(&sdark); - pcb_append_printf(&sdark, "\n", + rnd_append_printf(&sdark, "\n", x1+photo_offs, y1+photo_offs, w, h, photo_palette[photo_color].dark); indent(&sbright); - pcb_append_printf(&sbright, "\n", + rnd_append_printf(&sbright, "\n", x1-photo_offs, y1-photo_offs, w, h, photo_palette[photo_color].bright); } indent(&snormal); - pcb_append_printf(&snormal, "\n", + rnd_append_printf(&snormal, "\n", x1, y1, w, h, photo_palette[photo_color].normal); } else { indent(&snormal); - pcb_append_printf(&snormal, "\n", + rnd_append_printf(&snormal, "\n", x1, y1, w, h, svg_color(gc)); if (clip_color != NULL) - pcb_append_printf(&sclip, "\n", + rnd_append_printf(&sclip, "\n", x1, y1, w, h, clip_color); } } @@ -665,22 +665,22 @@ rnd_coord_t photo_offs = photo_palette[photo_color].offs; if (photo_offs != 0) { indent(&sbright); - pcb_append_printf(&sbright, "\n", + rnd_append_printf(&sbright, "\n", x1-photo_offs, y1-photo_offs, x2-photo_offs, y2-photo_offs, gc->width, photo_palette[photo_color].bright, CAPS(gc->cap)); indent(&sdark); - pcb_append_printf(&sdark, "\n", + rnd_append_printf(&sdark, "\n", x1+photo_offs, y1+photo_offs, x2+photo_offs, y2+photo_offs, gc->width, photo_palette[photo_color].dark, CAPS(gc->cap)); } indent(&snormal); - pcb_append_printf(&snormal, "\n", + rnd_append_printf(&snormal, "\n", x1, y1, x2, y2, gc->width, photo_palette[photo_color].normal, CAPS(gc->cap)); } else { indent(&snormal); - pcb_append_printf(&snormal, "\n", + rnd_append_printf(&snormal, "\n", x1, y1, x2, y2, gc->width, svg_color(gc), CAPS(gc->cap)); if (clip_color != NULL) { - pcb_append_printf(&sclip, "\n", + rnd_append_printf(&sclip, "\n", x1, y1, x2, y2, gc->width, clip_color, CAPS(gc->cap)); } } @@ -700,22 +700,22 @@ rnd_coord_t photo_offs = photo_palette[photo_color].offs; if (photo_offs != 0) { indent(&sbright); - pcb_append_printf(&sbright, "\n", + rnd_append_printf(&sbright, "\n", x1-photo_offs, y1-photo_offs, r, r, large, sweep, x2-photo_offs, y2-photo_offs, gc->width, photo_palette[photo_color].bright, CAPS(gc->cap)); indent(&sdark); - pcb_append_printf(&sdark, "\n", + rnd_append_printf(&sdark, "\n", x1+photo_offs, y1+photo_offs, r, r, large, sweep, x2+photo_offs, y2+photo_offs, gc->width, photo_palette[photo_color].dark, CAPS(gc->cap)); } indent(&snormal); - pcb_append_printf(&snormal, "\n", + rnd_append_printf(&snormal, "\n", x1, y1, r, r, large, sweep, x2, y2, gc->width, photo_palette[photo_color].normal, CAPS(gc->cap)); } else { indent(&snormal); - pcb_append_printf(&snormal, "\n", + rnd_append_printf(&snormal, "\n", x1, y1, r, r, large, sweep, x2, y2, gc->width, svg_color(gc), CAPS(gc->cap)); if (clip_color != NULL) - pcb_append_printf(&sclip, "\n", + rnd_append_printf(&sclip, "\n", x1, y1, r, r, large, sweep, x2, y2, gc->width, clip_color, CAPS(gc->cap)); } } @@ -790,29 +790,29 @@ rnd_coord_t photo_offs = photo_palette[photo_color].offs; if ((!gc->drill) && (photo_offs != 0)) { indent(&sbright); - pcb_append_printf(&sbright, "\n", + rnd_append_printf(&sbright, "\n", cx-photo_offs, cy-photo_offs, r, stroke, photo_palette[photo_color].bright); indent(&sdark); - pcb_append_printf(&sdark, "\n", + rnd_append_printf(&sdark, "\n", cx+photo_offs, cy+photo_offs, r, stroke, photo_palette[photo_color].dark); } indent(&snormal); - pcb_append_printf(&snormal, "\n", + rnd_append_printf(&snormal, "\n", cx, cy, r, stroke, photo_palette[photo_color].normal); } else { indent(&snormal); - pcb_append_printf(&snormal, "\n", + rnd_append_printf(&snormal, "\n", cx, cy, r, stroke, "#000000"); } } else{ indent(&snormal); - pcb_append_printf(&snormal, "\n", + rnd_append_printf(&snormal, "\n", cx, cy, r, stroke, svg_color(gc)); if (clip_color != NULL) - pcb_append_printf(&sclip, "\n", + rnd_append_printf(&sclip, "\n", cx, cy, r, stroke, clip_color); } } @@ -834,9 +834,9 @@ for (i = 0; i < n_coords; i++) { rnd_coord_t px = x[i], py = y[i]; TRX(px); TRY(py); - pcb_append_printf(s, "%mm,%mm ", px+dx, py+dy); + rnd_append_printf(s, "%mm,%mm ", px+dx, py+dy); } - pcb_append_printf(s, "\" stroke-width=\"%.3f\" stroke=\"%s\" fill=\"%s\"/>\n", poly_bloat, clr, clr); + rnd_append_printf(s, "\" stroke-width=\"%.3f\" stroke=\"%s\" fill=\"%s\"/>\n", poly_bloat, clr, clr); } static void svg_fill_polygon_offs(rnd_hid_gc_t gc, int n_coords, rnd_coord_t *x, rnd_coord_t *y, rnd_coord_t dx, rnd_coord_t dy) Index: trunk/src_plugins/export_vfs_fuse/export_vfs_fuse.c =================================================================== --- trunk/src_plugins/export_vfs_fuse/export_vfs_fuse.c (revision 31006) +++ trunk/src_plugins/export_vfs_fuse/export_vfs_fuse.c (revision 31007) @@ -244,7 +244,7 @@ /* pwd is lost during daemonisation */ if (!rnd_is_path_abs(PCB->hidlib.filename)) - fn = pcb_strdup_printf("%s%c%s", fuse_cwd, RND_DIR_SEPARATOR_C, PCB->hidlib.filename); + fn = rnd_strdup_printf("%s%c%s", fuse_cwd, RND_DIR_SEPARATOR_C, PCB->hidlib.filename); if (pcb_save_pcb(fn, NULL) != 0) { fprintf(stderr, "Failed to save the modified board file\n"); Index: trunk/src_plugins/export_xy/xy.c =================================================================== --- trunk/src_plugins/export_xy/xy.c (revision 31006) +++ trunk/src_plugins/export_xy/xy.c (revision 31007) @@ -185,7 +185,7 @@ pcb_data_it_t it; pcb_any_obj_t *obj; - pcb_snprintf(tmp, sizeof(tmp), "pnp-origin-%s", format_name); + rnd_snprintf(tmp, sizeof(tmp), "pnp-origin-%s", format_name); ctx->origin_score = 0; ctx->ox = ctx->oy = 0; @@ -365,12 +365,12 @@ } if (strncmp(*input, "boardw%", 7) == 0) { *input += 7; - pcb_append_printf(s, "%m+%mN", xy_unit->allow, PCB->hidlib.size_x); + rnd_append_printf(s, "%m+%mN", xy_unit->allow, PCB->hidlib.size_x); return 0; } if (strncmp(*input, "boardh%", 7) == 0) { *input += 7; - pcb_append_printf(s, "%m+%mN", xy_unit->allow, PCB->hidlib.size_y); + rnd_append_printf(s, "%m+%mN", xy_unit->allow, PCB->hidlib.size_y); return 0; } if (strncmp(*input, "subc.", 5) == 0) { @@ -480,69 +480,69 @@ } if (strncmp(*input, "x%", 2) == 0) { *input += 2; - pcb_append_printf(s, "%m+%mN", xy_unit->allow, ctx->x); + rnd_append_printf(s, "%m+%mN", xy_unit->allow, ctx->x); return 0; } if (strncmp(*input, "y%", 2) == 0) { *input += 2; - pcb_append_printf(s, "%m+%mN", xy_unit->allow, ctx->y); + rnd_append_printf(s, "%m+%mN", xy_unit->allow, ctx->y); return 0; } if (strncmp(*input, "padcx%", 6) == 0) { *input += 6; - pcb_append_printf(s, "%m+%mN", xy_unit->allow, ctx->pad_cx); + rnd_append_printf(s, "%m+%mN", xy_unit->allow, ctx->pad_cx); return 0; } if (strncmp(*input, "padcy%", 6) == 0) { *input += 6; - pcb_append_printf(s, "%m+%mN", xy_unit->allow, ctx->pad_cy); + rnd_append_printf(s, "%m+%mN", xy_unit->allow, ctx->pad_cy); return 0; } if (strncmp(*input, "padcx_prerot%", 13) == 0) { *input += 13; - pcb_append_printf(s, "%m+%mN", xy_unit->allow, ctx->prpad_cx); + rnd_append_printf(s, "%m+%mN", xy_unit->allow, ctx->prpad_cx); return 0; } if (strncmp(*input, "padcy_prerot%", 13) == 0) { *input += 13; - pcb_append_printf(s, "%m+%mN", xy_unit->allow, ctx->prpad_cy); + rnd_append_printf(s, "%m+%mN", xy_unit->allow, ctx->prpad_cy); return 0; } if (strncmp(*input, "rot%", 4) == 0) { *input += 4; - pcb_append_printf(s, "%g", ctx->theta); + rnd_append_printf(s, "%g", ctx->theta); return 0; } if (strncmp(*input, "negrot%", 7) == 0) { *input += 7; - pcb_append_printf(s, "%g", -ctx->theta); + rnd_append_printf(s, "%g", -ctx->theta); return 0; } if (strncmp(*input, "siderot%", 8) == 0) { *input += 8; - pcb_append_printf(s, "%g", ctx->xray_theta); + rnd_append_printf(s, "%g", ctx->xray_theta); return 0; } if (strncmp(*input, "270-rot%", 8) == 0) { *input += 8; - pcb_append_printf(s, "%g", (270-ctx->theta)); + rnd_append_printf(s, "%g", (270-ctx->theta)); return 0; } if (strncmp(*input, "side270-rot%", 12) == 0) { *input += 12; - pcb_append_printf(s, "%g", (270-ctx->theta)); + rnd_append_printf(s, "%g", (270-ctx->theta)); return 0; } if (strncmp(*input, "90rot%", 6) == 0) { *input += 6; if (ctx->theta == 0) { - pcb_append_printf(s, "0"); + rnd_append_printf(s, "0"); } else if (ctx->theta == 90) { - pcb_append_printf(s, "1"); + rnd_append_printf(s, "1"); } else if (ctx->theta == 180) { - pcb_append_printf(s, "2"); + rnd_append_printf(s, "2"); } else { - pcb_append_printf(s, "3"); + rnd_append_printf(s, "3"); } return 0; } @@ -558,7 +558,7 @@ } if (strncmp(*input, "count%", 6) == 0) { *input += 6; - pcb_append_printf(s, "%d", ctx->count); + rnd_append_printf(s, "%d", ctx->count); return 0; } if (strncmp(*input, "num-side%", 9) == 0) { @@ -568,22 +568,22 @@ } if (strncmp(*input, "pad_width%", 10) == 0) { *input += 10; - pcb_append_printf(s, "%m+%mN", xy_unit->allow, ctx->pad_w); + rnd_append_printf(s, "%m+%mN", xy_unit->allow, ctx->pad_w); return 0; } if (strncmp(*input, "pad_height%", 11) == 0) { *input += 11; - pcb_append_printf(s, "%m+%mN", xy_unit->allow, ctx->pad_h); + rnd_append_printf(s, "%m+%mN", xy_unit->allow, ctx->pad_h); return 0; } if (strncmp(*input, "pad_width_prerot%", 17) == 0) { *input += 17; - pcb_append_printf(s, "%m+%mN", xy_unit->allow, ctx->prpad_w); + rnd_append_printf(s, "%m+%mN", xy_unit->allow, ctx->prpad_w); return 0; } if (strncmp(*input, "pad_height_prerot%", 18) == 0) { *input += 18; - pcb_append_printf(s, "%m+%mN", xy_unit->allow, ctx->prpad_h); + rnd_append_printf(s, "%m+%mN", xy_unit->allow, ctx->prpad_h); return 0; } if (strncmp(*input, "smdvsthru%", 10) == 0) { @@ -590,11 +590,11 @@ *input += 10; count_pins_pads(ctx, &pin_cnt, &pad_cnt); if (pin_cnt > 0) { - pcb_append_printf(s, "PTH"); + rnd_append_printf(s, "PTH"); } else if (pad_cnt > 0) { - pcb_append_printf(s, "SMD"); + rnd_append_printf(s, "SMD"); } else { - pcb_append_printf(s, "0"); + rnd_append_printf(s, "0"); } return 0; } @@ -602,11 +602,11 @@ *input += 13; count_pins_pads(ctx, &pin_cnt, &pad_cnt); if (pin_cnt > 0) { - pcb_append_printf(s, "2"); + rnd_append_printf(s, "2"); } else if (pad_cnt > 0) { - pcb_append_printf(s, "1"); + rnd_append_printf(s, "1"); } else { - pcb_append_printf(s, "0"); + rnd_append_printf(s, "0"); } return 0; } @@ -614,11 +614,11 @@ *input += 9; count_pins_pads(ctx, &pin_cnt, &pad_cnt); if (pin_cnt > 0) { - pcb_append_printf(s, "%d", pin_cnt); + rnd_append_printf(s, "%d", pin_cnt); } else if (pad_cnt > 0) { - pcb_append_printf(s, "%d", pad_cnt); + rnd_append_printf(s, "%d", pad_cnt); } else { - pcb_append_printf(s, "0"); + rnd_append_printf(s, "0"); } return 0; } @@ -628,9 +628,9 @@ if (strncmp(*input, "netname%", 8) == 0) { *input += 8; if (*ctx->pad_netname != '\0') - pcb_append_printf(s, "%s", ctx->pad_netname); + rnd_append_printf(s, "%s", ctx->pad_netname); else - pcb_append_printf(s, "NC"); + rnd_append_printf(s, "NC"); return 0; } } @@ -640,7 +640,7 @@ static void fprintf_templ(FILE *f, subst_ctx_t *ctx, const char *templ) { if (templ != NULL) { - char *tmp = pcb_strdup_subst(templ, subst_cb, ctx, PCB_SUBST_PERCENT); + char *tmp = rnd_strdup_subst(templ, subst_cb, ctx, RND_SUBST_PERCENT); fprintf(f, "%s", tmp); free(tmp); } Index: trunk/src_plugins/exto_std/bus.c =================================================================== --- trunk/src_plugins/exto_std/bus.c (revision 31006) +++ trunk/src_plugins/exto_std/bus.c (revision 31007) @@ -322,11 +322,11 @@ if (copy_from == NULL) { char tmp[32]; rnd_attribute_put(&subc->Attributes, "extobj::width", "2"); - pcb_sprintf(tmp, "%$$mH", conf_core.design.line_thickness + conf_core.design.clearance/2); + rnd_sprintf(tmp, "%$$mH", conf_core.design.line_thickness + conf_core.design.clearance/2); rnd_attribute_put(&subc->Attributes, "extobj::pitch", tmp); - pcb_sprintf(tmp, "%$$mH", conf_core.design.line_thickness); + rnd_sprintf(tmp, "%$$mH", conf_core.design.line_thickness); rnd_attribute_put(&subc->Attributes, "extobj::thickness", tmp); - pcb_sprintf(tmp, "%$$mH", conf_core.design.clearance); + rnd_sprintf(tmp, "%$$mH", conf_core.design.clearance); rnd_attribute_put(&subc->Attributes, "extobj::clearance", tmp); } Index: trunk/src_plugins/exto_std/dimension.c =================================================================== --- trunk/src_plugins/exto_std/dimension.c (revision 31006) +++ trunk/src_plugins/exto_std/dimension.c (revision 31007) @@ -214,7 +214,7 @@ draw_arrow(dim, subc->data, ly, x2, y2, -arrx, arry); /* text */ - if (pcb_safe_snprintf(ttmp, sizeof(ttmp), PCB_SAFEPRINT_COORD_ONLY | 1, dim->fmt, (rnd_coord_t)dim->len) < 0) + if (rnd_safe_snprintf(ttmp, sizeof(ttmp), PCB_SAFEPRINT_COORD_ONLY | 1, dim->fmt, (rnd_coord_t)dim->len) < 0) strcpy(ttmp, ""); t = pcb_text_new(ly, pcb_font(PCB, 0, 0), 0, 0, 0, 100, 0, ttmp, pcb_flag_make(0)); tx = t->BoundingBox.X2 - t->BoundingBox.X1; @@ -297,7 +297,7 @@ dimension_clear(subc); dim->displace = d; - pcb_snprintf(tmp, sizeof(tmp), "%.08$mH", (rnd_coord_t)d); + rnd_snprintf(tmp, sizeof(tmp), "%.08$mH", (rnd_coord_t)d); rnd_attribute_put(&subc->Attributes, "extobj::displace", tmp); dimension_gen(subc); } Index: trunk/src_plugins/fp_board/fp_board.c =================================================================== --- trunk/src_plugins/fp_board/fp_board.c (revision 31006) +++ trunk/src_plugins/fp_board/fp_board.c (revision 31007) @@ -64,7 +64,7 @@ /* remember location by ID - because of the dedup search by name is unsafe */ if (e != NULL) - e->data.fp.loc_info = pcb_strdup_printf("%s@%lu", path, id); + e->data.fp.loc_info = rnd_strdup_printf("%s@%lu", path, id); } PCB_END_LOOP; Index: trunk/src_plugins/fp_wget/edakrill.c =================================================================== --- trunk/src_plugins/fp_wget/edakrill.c (revision 31006) +++ trunk/src_plugins/fp_wget/edakrill.c (revision 31007) @@ -81,7 +81,7 @@ while(*val == ' ') val++; if (*val == '\0') break; - tmp = pcb_strdup_printf("%s:%s", key, val); + tmp = rnd_strdup_printf("%s:%s", key, val); tag_add_(tmp); free(tmp); } @@ -146,7 +146,7 @@ if (strncmp(path, REQUIRE_PATH_PREFIX, strlen(REQUIRE_PATH_PREFIX)) != 0) return -1; - pcb_snprintf(last_sum_fn, sizeof(last_sum_fn), "%s" RND_DIR_SEPARATOR_S "edakrill.last", conf_fp_wget.plugins.fp_wget.cache_dir); + rnd_snprintf(last_sum_fn, sizeof(last_sum_fn), "%s" RND_DIR_SEPARATOR_S "edakrill.last", conf_fp_wget.plugins.fp_wget.cache_dir); gds_init(&vpath); gds_append_str(&vpath, REQUIRE_PATH_PREFIX); Index: trunk/src_plugins/fp_wget/gedasymbols.c =================================================================== --- trunk/src_plugins/fp_wget/gedasymbols.c (revision 31006) +++ trunk/src_plugins/fp_wget/gedasymbols.c (revision 31007) @@ -67,7 +67,7 @@ if (strncmp(path, REQUIRE_PATH_PREFIX, strlen(REQUIRE_PATH_PREFIX)) != 0) return -1; - pcb_snprintf(last_sum_fn, sizeof(last_sum_fn), "%s" RND_DIR_SEPARATOR_S "gedasymbols.last", conf_fp_wget.plugins.fp_wget.cache_dir); + rnd_snprintf(last_sum_fn, sizeof(last_sum_fn), "%s" RND_DIR_SEPARATOR_S "gedasymbols.last", conf_fp_wget.plugins.fp_wget.cache_dir); gds_init(&vpath); gds_append_str(&vpath, REQUIRE_PATH_PREFIX); Index: trunk/src_plugins/fp_wget/wget_common.c =================================================================== --- trunk/src_plugins/fp_wget/wget_common.c (revision 31006) +++ trunk/src_plugins/fp_wget/wget_common.c (revision 31007) @@ -48,7 +48,7 @@ { int len; char buff[RND_PATH_MAX+32]; - len = pcb_snprintf(buff, sizeof(buff), "mkdir -p '%s'", dir); + len = rnd_snprintf(buff, sizeof(buff), "mkdir -p '%s'", dir); if (len >= sizeof(buff)-1) return -1; return pcb_system(NULL, buff); Index: trunk/src_plugins/hid_lesstif/dlg_attr_misc.c =================================================================== --- trunk/src_plugins/hid_lesstif/dlg_attr_misc.c (revision 31006) +++ trunk/src_plugins/hid_lesstif/dlg_attr_misc.c (revision 31007) @@ -256,7 +256,7 @@ argv[0].type = FGW_VOID; argv[1].type = FGW_STR | FGW_DYN; - argv[1].val.str = pcb_strdup_printf("#%02x%02x%02x", clr->r, clr->g, clr->b); + argv[1].val.str = rnd_strdup_printf("#%02x%02x%02x", clr->r, clr->g, clr->b); rs = rnd_actionv_bin(ltf_hidlib, CPACT, &res, 2, argv); if (rs != 0) return; Index: trunk/src_plugins/hid_lesstif/main.c =================================================================== --- trunk/src_plugins/hid_lesstif/main.c (revision 31006) +++ trunk/src_plugins/hid_lesstif/main.c (revision 31007) @@ -407,7 +407,7 @@ ltf_hidlib = hidlib; if ((work_area == 0) || (hidlib == NULL)) return; - /*pcb_printf("PCB Changed! %$mD\n", ltf_hidlib->size_x, ltf_hidlib->size_y); */ + /*rnd_printf("PCB Changed! %$mD\n", ltf_hidlib->size_x, ltf_hidlib->size_y); */ stdarg_n = 0; stdarg(XmNminimum, 0); stdarg(XmNvalue, 0); @@ -1073,7 +1073,7 @@ #else alt_pressed = (keys_buttons & Mod1Mask); #endif - /*pcb_printf("m %#mS %#mS\n", Px(e->xmotion.x), Py(e->xmotion.y)); */ + /*rnd_printf("m %#mS %#mS\n", Px(e->xmotion.x), Py(e->xmotion.y)); */ crosshair_in_window = 1; in_move_event = 1; if (panning) @@ -2301,7 +2301,7 @@ abort(); } #if 0 - pcb_printf("set_gc c%s %08lx w%#mS c%d x%d e%d\n", gc->colorname, gc->color, gc->width, gc->cap, gc->xor_set, gc->erase); + rnd_printf("set_gc c%s %08lx w%#mS c%d x%d e%d\n", gc->colorname, gc->color, gc->width, gc->cap, gc->xor_set, gc->erase); #endif switch (gc->cap) { case rnd_cap_square: @@ -2362,7 +2362,7 @@ if ((conf_core.editor.thin_draw || conf_core.editor.thin_draw_poly) && gc->erase) return; #if 0 - pcb_printf("draw_line %#mD-%#mD @%#mS", x1, y1, x2, y2, gc->width); + rnd_printf("draw_line %#mD-%#mD @%#mS", x1, y1, x2, y2, gc->width); #endif dx1 = Vx(x1); dy1 = Vy(y1); @@ -2369,7 +2369,7 @@ dx2 = Vx(x2); dy2 = Vy(y2); #if 0 - pcb_printf(" = %#mD-%#mD %s\n", x1, y1, x2, y2, gc->colorname); + rnd_printf(" = %#mD-%#mD %s\n", x1, y1, x2, y2, gc->colorname); #endif #if 1 @@ -2400,7 +2400,7 @@ if (conf_core.editor.thin_draw && gc->erase) return; #if 0 - pcb_printf("draw_arc %#mD %#mSx%#mS s %d d %d", cx, cy, width, height, start_angle, delta_angle); + rnd_printf("draw_arc %#mD %#mSx%#mS s %d d %d", cx, cy, width, height, start_angle, delta_angle); #endif width = Vz(width); height = Vz(height); @@ -2424,7 +2424,7 @@ if (start_angle >= 180) start_angle -= 360; #if 0 - pcb_printf(" = %#mD %#mSx%#mS %d %s\n", cx, cy, width, height, gc->width, gc->colorname); + rnd_printf(" = %#mD %#mSx%#mS %d %s\n", cx, cy, width, height, gc->width, gc->colorname); #endif set_gc(gc); XDrawArc(display, pixmap, my_gc, cx, cy, width * 2, height * 2, (start_angle + 180) * 64, delta_angle * 64); @@ -2470,7 +2470,7 @@ if ((conf_core.editor.thin_draw || conf_core.editor.thin_draw_poly) && gc->erase) return; #if 0 - pcb_printf("fill_circle %#mD %#mS", cx, cy, radius); + rnd_printf("fill_circle %#mD %#mS", cx, cy, radius); #endif radius = Vz(radius); cx = Vx(cx) - radius; @@ -2480,7 +2480,7 @@ if (cy < -2 * radius || cy > view_height) return; #if 0 - pcb_printf(" = %#mD %#mS %lx %s\n", cx, cy, radius, gc->color, gc->colorname); + rnd_printf(" = %#mD %#mS %lx %s\n", cx, cy, radius, gc->color, gc->colorname); #endif set_gc(gc); XFillArc(display, pixmap, my_gc, cx, cy, radius * 2, radius * 2, 0, 360 * 64); Index: trunk/src_plugins/hid_lesstif/menu.c =================================================================== --- trunk/src_plugins/hid_lesstif/menu.c (revision 31006) +++ trunk/src_plugins/hid_lesstif/menu.c (revision 31007) @@ -212,7 +212,7 @@ if (p == aw) have_xy = 1; } - /*pcb_printf("have xy from %s: %$mD\n", XtName(aw), action_x, action_y); */ + /*rnd_printf("have xy from %s: %$mD\n", XtName(aw), action_x, action_y); */ } lesstif_need_idle_proc(); Index: trunk/src_plugins/hid_remote/proto.c =================================================================== --- trunk/src_plugins/hid_remote/proto.c (revision 31006) +++ trunk/src_plugins/hid_remote/proto.c (revision 31007) @@ -27,7 +27,7 @@ #include #include #include -#define proto_vsnprintf pcb_vsnprintf +#define proto_vsnprintf rnd_vsnprintf #include "proto_lowcommon.h" #include "proto_lowsend.h" #include "proto_lowparse.h" Index: trunk/src_plugins/import_dsn/dsn.c =================================================================== --- trunk/src_plugins/import_dsn/dsn.c (revision 31006) +++ trunk/src_plugins/import_dsn/dsn.c (revision 31007) @@ -130,7 +130,7 @@ /*pcb_line_t *line = */pcb_line_new_merge(layer, lx, PCB->hidlib.size_y - ly, x, PCB->hidlib.size_y - y, thick, clear, pcb_flag_make(PCB_FLAG_AUTO | PCB_FLAG_CLEARLINE)); /* pcb_poly_clear_from_poly(PCB->Data, PCB_OBJ_LINE, layer, line);*/ -/* pcb_printf("LINE: %$mm %$mm .. %$mm %$mm\n", lx, ly, x, y);*/ +/* rnd_printf("LINE: %$mm %$mm .. %$mm %$mm\n", lx, ly, x, y);*/ } lx = x; ly = y; Index: trunk/src_plugins/import_hpgl/hpgl.c =================================================================== --- trunk/src_plugins/import_hpgl/hpgl.c (revision 31006) +++ trunk/src_plugins/import_hpgl/hpgl.c (revision 31007) @@ -66,7 +66,7 @@ memset(&data->Layer[n], 0, sizeof(pcb_layer_t)); pcb_layer_real2bound(&data->Layer[n], &PCB->Data->Layer[n], 0); free((char *)data->Layer[n].name); - data->Layer[n].name = pcb_strdup_printf("hpgl_pen_%d", n); + data->Layer[n].name = rnd_strdup_printf("hpgl_pen_%d", n); data->Layer[n].parent.data = data; data->Layer[n].parent_type = PCB_PARENT_DATA; data->Layer[n].type = PCB_OBJ_LAYER; Index: trunk/src_plugins/import_ipcd356/ipcd356.c =================================================================== --- trunk/src_plugins/import_ipcd356/ipcd356.c (revision 31006) +++ trunk/src_plugins/import_ipcd356/ipcd356.c (revision 31007) @@ -51,7 +51,7 @@ static void set_src(rnd_attribute_list_t *a, const char *fn, long lineno) { char src[8192]; - pcb_snprintf(src, sizeof(src), "ipcd356::%s:%ld", fn, lineno); + rnd_snprintf(src, sizeof(src), "ipcd356::%s:%ld", fn, lineno); rnd_attribute_put(a, "source", src); } Index: trunk/src_plugins/import_ltspice/ltspice.c =================================================================== --- trunk/src_plugins/import_ltspice/ltspice.c (revision 31006) +++ trunk/src_plugins/import_ltspice/ltspice.c (revision 31007) @@ -280,8 +280,8 @@ if (fname_base == NULL) fname_base = rnd_strdup(fname); - *fname_net = pcb_strdup_printf("%s.net", fname_base); - *fname_asc = pcb_strdup_printf("%s.asc", fname_base); + *fname_net = rnd_strdup_printf("%s.net", fname_base); + *fname_asc = rnd_strdup_printf("%s.asc", fname_base); free(fname_base); } Index: trunk/src_plugins/import_mentor_sch/netlist_helper.c =================================================================== --- trunk/src_plugins/import_mentor_sch/netlist_helper.c (revision 31006) +++ trunk/src_plugins/import_mentor_sch/netlist_helper.c (revision 31007) @@ -295,7 +295,7 @@ if (refdes == NULL) { rnd_message(RND_MSG_ERROR, "nethelper: can't resolve refdes of part %s\n", part); } - pcb_snprintf(term, sizeof(term), "%s-%s", refdes, pin); + rnd_snprintf(term, sizeof(term), "%s-%s", refdes, pin); rnd_actionva(hl, "Netlist", "Add", nctx->netname, term, NULL); } Index: trunk/src_plugins/io_autotrax/write.c =================================================================== --- trunk/src_plugins/io_autotrax/write.c (revision 31006) +++ trunk/src_plugins/io_autotrax/write.c (revision 31007) @@ -99,7 +99,7 @@ static void wrax_map_layer_error(wctx_t *ctx, pcb_layergrp_t *grp, const char *msg, const char *hint) { char tmp[256]; - pcb_snprintf(tmp, sizeof(tmp), "%s (omitting layer group): %s", msg, grp->name); + rnd_snprintf(tmp, sizeof(tmp), "%s (omitting layer group): %s", msg, grp->name); pcb_io_incompat_save(ctx->pcb->Data, NULL, "layer", tmp, hint); } @@ -220,7 +220,7 @@ TODO("figure which is the gnd and which is the power plane") TODO("add checks for thermals: only gnd/pwr can have them, warn for others") - pcb_fprintf(ctx->f, "%.0ml %.0ml %.0ml %.0ml %d %.0ml 1 %d\r\n", + rnd_fprintf(ctx->f, "%.0ml %.0ml %.0ml %.0ml %d %.0ml 1 %d\r\n", x+dx, PCB->hidlib.size_y - (y+dy), w, h, ashape, drill_dia, alayer); @@ -247,7 +247,7 @@ static int wrax_line(wctx_t *ctx, pcb_line_t *line, rnd_cardinal_t layer, rnd_coord_t dx, rnd_coord_t dy) { int user_routed = 1; - pcb_fprintf(ctx->f, "%.0ml %.0ml %.0ml %.0ml %.0ml %d %d\r\n", line->Point1.X+dx, PCB->hidlib.size_y - (line->Point1.Y+dy), line->Point2.X+dx, PCB->hidlib.size_y - (line->Point2.Y+dy), line->Thickness, layer, user_routed); + rnd_fprintf(ctx->f, "%.0ml %.0ml %.0ml %.0ml %.0ml %d %d\r\n", line->Point1.X+dx, PCB->hidlib.size_y - (line->Point1.Y+dy), line->Point2.X+dx, PCB->hidlib.size_y - (line->Point2.Y+dy), line->Thickness, layer, user_routed); return 0; } @@ -255,7 +255,7 @@ static int wrax_pline_segment(wctx_t *ctx, rnd_coord_t x1, rnd_coord_t y1, rnd_coord_t x2, rnd_coord_t y2, rnd_coord_t Thickness, rnd_cardinal_t layer) { int user_routed = 1; - pcb_fprintf(ctx->f, "FT\r\n%.0ml %.0ml %.0ml %.0ml %.0ml %d %d\r\n", x1, PCB->hidlib.size_y - y1, x2, PCB->hidlib.size_y - y2, Thickness, layer, user_routed); + rnd_fprintf(ctx->f, "FT\r\n%.0ml %.0ml %.0ml %.0ml %.0ml %d %d\r\n", x1, PCB->hidlib.size_y - y1, x2, PCB->hidlib.size_y - y2, Thickness, layer, user_routed); return 0; } @@ -340,7 +340,7 @@ else { radius = arc->Width; } - pcb_fprintf(ctx->f, "%.0ml %.0ml %.0ml %d %.0ml %d\r\n", arc->X+dx, PCB->hidlib.size_y - (arc->Y+dy), radius, pcb_rnd_arc_to_autotrax_segments(arc->StartAngle, arc->Delta), arc->Thickness, current_layer); + rnd_fprintf(ctx->f, "%.0ml %.0ml %.0ml %d %.0ml %d\r\n", arc->X+dx, PCB->hidlib.size_y - (arc->Y+dy), radius, pcb_rnd_arc_to_autotrax_segments(arc->StartAngle, arc->Delta), arc->Thickness, current_layer); return 0; } @@ -361,11 +361,11 @@ pcb_net_t *net = e->value; fprintf(ctx->f, "NETDEF\r\n"); - pcb_fprintf(ctx->f, "%s\r\n", net->name); - pcb_fprintf(ctx->f, "%d\r\n", show_status); + rnd_fprintf(ctx->f, "%s\r\n", net->name); + rnd_fprintf(ctx->f, "%d\r\n", show_status); fprintf(ctx->f, "(\r\n"); for(t = pcb_termlist_first(&net->conns); t != NULL; t = pcb_termlist_next(t)) - pcb_fprintf(ctx->f, "%s-%s\r\n", t->refdes, t->term); + rnd_fprintf(ctx->f, "%s-%s\r\n", t->refdes, t->term); fprintf(ctx->f, ")\r\n"); } } @@ -384,9 +384,9 @@ int local_flag = 0; linelist_foreach(&layer->Line, &it, line) { if (in_subc) - pcb_fprintf(ctx->f, "CT\r\n"); + rnd_fprintf(ctx->f, "CT\r\n"); else - pcb_fprintf(ctx->f, "FT\r\n"); + rnd_fprintf(ctx->f, "FT\r\n"); wrax_line(ctx, line, current_layer, dx, dy); local_flag |= 1; } @@ -408,9 +408,9 @@ int local_flag = 0; arclist_foreach(&layer->Arc, &it, arc) { if (in_subc) - pcb_fprintf(ctx->f, "CA\r\n"); + rnd_fprintf(ctx->f, "CA\r\n"); else - pcb_fprintf(ctx->f, "FA\r\n"); + rnd_fprintf(ctx->f, "FA\r\n"); wrax_arc(ctx, arc, current_layer, dx, dy); local_flag |= 1; } @@ -469,7 +469,7 @@ else if (direction == 0) /*normal text */ rotation = 0; - pcb_fprintf(ctx->f, "%.0ml %.0ml %.0ml %d %.0ml %d\r\n", text->X+dx, PCB->hidlib.size_y - (text->Y+dy), textHeight, rotation + autotrax_mirrored, strokeThickness, current_layer); + rnd_fprintf(ctx->f, "%.0ml %.0ml %.0ml %d %.0ml %d\r\n", text->X+dx, PCB->hidlib.size_y - (text->Y+dy), textHeight, rotation + autotrax_mirrored, strokeThickness, current_layer); for(index = 0; index < 32; index++) { if (text->TextString[index] == '\0') index = 32; @@ -478,7 +478,7 @@ else /* need to truncate to 32 alphanumeric chars */ fputc(text->TextString[index], ctx->f); } - pcb_fprintf(ctx->f, "\r\n"); + rnd_fprintf(ctx->f, "\r\n"); } local_flag |= 1; } @@ -521,9 +521,9 @@ fprintf(ctx->f, "COMP\r\n%s\r\n", or_empty(subc->refdes)); fprintf(ctx->f, "%s\r\n", or_empty(rnd_attribute_get(&subc->Attributes, "footprint"))); fprintf(ctx->f, "%s\r\n", or_empty(rnd_attribute_get(&subc->Attributes, "value"))); - pcb_fprintf(ctx->f, "%.0ml %.0ml 100 0 10 %d\r\n", xPos, yPos, silk_layer); /* designator */ - pcb_fprintf(ctx->f, "%.0ml %.0ml 100 0 10 %d\r\n", xPos, yPos2, silk_layer); /* pattern */ - pcb_fprintf(ctx->f, "%.0ml %.0ml 100 0 10 %d\r\n", xPos, yPos3, silk_layer); /* comment field */ + rnd_fprintf(ctx->f, "%.0ml %.0ml 100 0 10 %d\r\n", xPos, yPos, silk_layer); /* designator */ + rnd_fprintf(ctx->f, "%.0ml %.0ml 100 0 10 %d\r\n", xPos, yPos2, silk_layer); /* pattern */ + rnd_fprintf(ctx->f, "%.0ml %.0ml 100 0 10 %d\r\n", xPos, yPos3, silk_layer); /* comment field */ res = wrax_data(ctx, subc->data, 0, 0); @@ -580,7 +580,7 @@ if (maxy < polygon->Points[i].Y) maxy = polygon->Points[i].Y; } - pcb_fprintf(ctx->f, "%cF\r\n%.0ml %.0ml %.0ml %.0ml %d\r\n", (in_subc ? 'C' : 'F'), minx+dx, PCB->hidlib.size_y - (miny+dy), maxx+dx, PCB->hidlib.size_y - (maxy+dy), current_layer); + rnd_fprintf(ctx->f, "%cF\r\n%.0ml %.0ml %.0ml %.0ml %d\r\n", (in_subc ? 'C' : 'F'), minx+dx, PCB->hidlib.size_y - (miny+dy), maxx+dx, PCB->hidlib.size_y - (maxy+dy), current_layer); local_flag |= 1; /* here we need to test for non rectangular polygons to flag imperfect export to easy/autotrax @@ -640,7 +640,7 @@ int alid = wrax_layer2id(ctx, ly); /* autotrax layer ID */ if (alid == 0) { char tmp[256]; - pcb_snprintf(tmp, sizeof(tmp), "Ignoring unmapped layer: %s", ly->name); + rnd_snprintf(tmp, sizeof(tmp), "Ignoring unmapped layer: %s", ly->name); pcb_io_incompat_save(data, NULL, "layer", tmp, NULL); continue; } Index: trunk/src_plugins/io_dsn/write.c =================================================================== --- trunk/src_plugins/io_dsn/write.c (revision 31006) +++ trunk/src_plugins/io_dsn/write.c (revision 31007) @@ -106,7 +106,7 @@ PCB_LINE_LOOP(ly); { net = htpp_get(&wctx->nmap.o2n, (pcb_any_obj_t *)line); - pcb_fprintf(wctx->f," (wire (path \"%s\" %[4] %[4] %[4] %[4] %[4])", gname, line->Thickness, + rnd_fprintf(wctx->f," (wire (path \"%s\" %[4] %[4] %[4] %[4] %[4])", gname, line->Thickness, COORDX(line->Point1.X), COORDY(line->Point1.Y), COORDX(line->Point2.X), COORDY(line->Point2.Y)); if (net != NULL) @@ -154,7 +154,7 @@ /* set units to mm with nm resolution */ fprintf(wctx->f, " (resolution mm 1000000)\n"); fprintf(wctx->f, " (unit mm)\n"); - pcb_printf_slot[4] = "%.07mm"; + rnd_printf_slot[4] = "%.07mm"; res |= dsn_write_structure(wctx); res |= dsn_write_wiring(wctx); Index: trunk/src_plugins/io_eagle/read.c =================================================================== --- trunk/src_plugins/io_eagle/read.c (revision 31006) +++ trunk/src_plugins/io_eagle/read.c (revision 31007) @@ -1296,10 +1296,10 @@ } if (elem != NULL && elem[0] == '-' && elem[1] == '\0') { - pcb_snprintf(conn, sizeof(conn), "%s-%s", "HYPHEN", pad); + rnd_snprintf(conn, sizeof(conn), "%s-%s", "HYPHEN", pad); rnd_message(RND_MSG_WARNING, "Substituted invalid element name '-' with 'HYPHEN'\n"); } else { - pcb_snprintf(conn, sizeof(conn), "%s-%s", elem, pad); + rnd_snprintf(conn, sizeof(conn), "%s-%s", elem, pad); } net = eagle_get_attrs(st, PARENT(subtree), "name", NULL); Index: trunk/src_plugins/io_hyp/parser.c =================================================================== --- trunk/src_plugins/io_hyp/parser.c (revision 31006) +++ trunk/src_plugins/io_hyp/parser.c (revision 31007) @@ -400,7 +400,7 @@ rnd_message(RND_MSG_DEBUG, "netlist net: '%s' device: '%s' pin: '%s'\n", net_name, device_name, pin_name); if ((net_name != NULL) && (device_name != NULL) && (pin_name != NULL)) { - pcb_snprintf(conn, sizeof(conn), "%s-%s", device_name, pin_name); + rnd_snprintf(conn, sizeof(conn), "%s-%s", device_name, pin_name); rnd_actionva(&PCB->hidlib, "Netlist", "Add", net_name, conn, NULL); } return; @@ -869,7 +869,7 @@ else { /* no layer name given. find unused layer name in range 1..PCB_MAX_LAYER */ for (n = 1; n < PCB_MAX_LAYER; n++) { - pcb_sprintf(new_layer_name, "%i", n); + rnd_sprintf(new_layer_name, "%i", n); if (pcb_layer_by_name(PCB->Data, new_layer_name) < 0) { lname = new_layer_name; break; @@ -1633,7 +1633,7 @@ 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); + rnd_snprintf(value, sizeof(value), "%f", h->value_float); new_device->value = rnd_strdup(value); } @@ -1903,12 +1903,12 @@ /* make sure device and pin name have valid values, even if reference has wrong format */ if ((device_name == NULL) || (strcmp(device_name, "") == 0)) { device_name = malloc(MAX_STRING); - pcb_sprintf(device_name, "NONAME%0d", unknown_device_number++); + rnd_sprintf(device_name, "NONAME%0d", unknown_device_number++); } if ((pin_name == NULL) || (strcmp(pin_name, "") == 0)) { pin_name = malloc(MAX_STRING); - pcb_sprintf(pin_name, "NONUMBER%0d", unknown_pin_number++); + rnd_sprintf(pin_name, "NONUMBER%0d", unknown_pin_number++); } /* find device by name */ Index: trunk/src_plugins/io_hyp/write.c =================================================================== --- trunk/src_plugins/io_hyp/write.c (revision 31006) +++ trunk/src_plugins/io_hyp/write.c (revision 31007) @@ -92,7 +92,7 @@ } } if (dup) - name = pcb_strdup_printf("%s___%d", name, n); + name = rnd_strdup_printf("%s___%d", name, n); else name = rnd_strdup(name); htpp_set(&wr->grp_names, grp, (char *)name); @@ -163,7 +163,7 @@ static void write_pr_line(hyp_wr_t * wr, rnd_coord_t x1, rnd_coord_t y1, rnd_coord_t x2, rnd_coord_t y2) { - pcb_fprintf(wr->f, " (PERIMETER_SEGMENT X1=%me Y1=%me X2=%me Y2=%me)\n", x1, flip(y1), x2, flip(y2)); + rnd_fprintf(wr->f, " (PERIMETER_SEGMENT X1=%me Y1=%me X2=%me Y2=%me)\n", x1, flip(y1), x2, flip(y2)); } static void hyp_pstk_init(hyp_wr_t *wr) @@ -215,7 +215,7 @@ shnum = 2; break; } - pcb_fprintf(wr->f, " (%s, %d, %me, %me, 0)\n", lynam, shnum, sx, sy); + rnd_fprintf(wr->f, " (%s, %d, %me, %me, 0)\n", lynam, shnum, sx, sy); } /* WARNING: not reentrant! */ @@ -240,7 +240,7 @@ int n; if (proto->hdia > 0) - pcb_fprintf(wr->f, "{PADSTACK=%s,%me\n", name, proto->hdia); + rnd_fprintf(wr->f, "{PADSTACK=%s,%me\n", name, proto->hdia); else fprintf(wr->f, "{PADSTACK=%s\n", name); @@ -272,9 +272,9 @@ pcb_pstk_proto_t *proto = pcb_pstk_get_proto(ps); if ((subc != NULL) && (ps->term != NULL)) - pcb_fprintf(wr->f, " (PIN X=%me Y=%me R=\"%s.%s\" P=%[4])\n", ps->x, flip(ps->y), safe_subc_name(wr, subc), ps->term, hyp_pstk_cache(wr, proto, 0)); + rnd_fprintf(wr->f, " (PIN X=%me Y=%me R=\"%s.%s\" P=%[4])\n", ps->x, flip(ps->y), safe_subc_name(wr, subc), ps->term, hyp_pstk_cache(wr, proto, 0)); else - pcb_fprintf(wr->f, " (VIA X=%me Y=%me P=%[4])\n", ps->x, flip(ps->y), hyp_pstk_cache(wr, proto, 0)); + rnd_fprintf(wr->f, " (VIA X=%me Y=%me P=%[4])\n", ps->x, flip(ps->y), hyp_pstk_cache(wr, proto, 0)); } static void write_poly(hyp_wr_t * wr, pcb_poly_t * poly) @@ -295,17 +295,17 @@ v = pl->head->next; if (pl == poly->Clipped->contours) - pcb_fprintf(wr->f, " {POLYGON L=%[4] T=POUR W=0.0 ID=%d X=%me Y=%me\n", + rnd_fprintf(wr->f, " {POLYGON L=%[4] T=POUR W=0.0 ID=%d X=%me Y=%me\n", get_layer_name(wr, poly->parent_type, poly->parent.layer), ++wr->poly_id, v->point[0], flip(v->point[1])); else /* hole. Use same ID as polygon. */ - pcb_fprintf(wr->f, " {POLYVOID ID=%d X=%me Y=%me\n", wr->poly_id, v->point[0], flip(v->point[1])); + rnd_fprintf(wr->f, " {POLYVOID ID=%d X=%me Y=%me\n", wr->poly_id, v->point[0], flip(v->point[1])); for (v = v->next; v != pl->head->next; v = v->next) - pcb_fprintf(wr->f, " (LINE X=%me Y=%me)\n", v->point[0], flip(v->point[1])); + rnd_fprintf(wr->f, " (LINE X=%me Y=%me)\n", v->point[0], flip(v->point[1])); v = pl->head->next; /* repeat first point */ - pcb_fprintf(wr->f, " (LINE X=%me Y=%me)\n", v->point[0], flip(v->point[1])); + rnd_fprintf(wr->f, " (LINE X=%me Y=%me)\n", v->point[0], flip(v->point[1])); fprintf(wr->f, " }\n"); } while ((pl = pl->next) != NULL); @@ -314,7 +314,7 @@ static void write_line(hyp_wr_t * wr, pcb_line_t * line) { - pcb_fprintf(wr->f, " (SEG X1=%me Y1=%me X2=%me Y2=%me W=%me L=%[4])\n", + rnd_fprintf(wr->f, " (SEG X1=%me Y1=%me X2=%me Y2=%me W=%me L=%[4])\n", line->Point1.X, flip(line->Point1.Y), line->Point2.X, flip(line->Point2.Y), line->Thickness, get_layer_name(wr, line->parent_type, line->parent.layer)); } @@ -340,10 +340,10 @@ pcb_arc_get_end(arc, 0, &x2, &y2); } - pcb_fprintf(wr->f, "(%s X1=%me Y1=%me X2=%me Y2=%me XC=%me YC=%me R=%me", cmd, x1, flip(y1), x2, flip(y2), arc->X, + rnd_fprintf(wr->f, "(%s X1=%me Y1=%me X2=%me Y2=%me XC=%me YC=%me R=%me", cmd, x1, flip(y1), x2, flip(y2), arc->X, flip(arc->Y), arc->Width); if (layer != NULL) - pcb_fprintf(wr->f, " W=%me L=%[4]", arc->Thickness, layer); + rnd_fprintf(wr->f, " W=%me L=%[4]", arc->Thickness, layer); fprintf(wr->f, ")\n"); } @@ -417,7 +417,7 @@ const char *name = grp->name; if (grp->ltype & PCB_LYT_COPPER) { - pcb_fprintf(wr->f, " (SIGNAL T=0.003500 L=%[4])\n", hyp_grp_name(wr, grp, name)); + rnd_fprintf(wr->f, " (SIGNAL T=0.003500 L=%[4])\n", hyp_grp_name(wr, grp, name)); if (grp->ltype & PCB_LYT_TOP) wr->ln_top = name; else if (grp->ltype & PCB_LYT_BOTTOM) @@ -429,7 +429,7 @@ sprintf(tmp, "dielectric layer %d", n); name = tmp; } - pcb_fprintf(wr->f, " (DIELECTRIC T=0.160000 L=%[4])\n", hyp_grp_name(wr, grp, name)); + rnd_fprintf(wr->f, " (DIELECTRIC T=0.160000 L=%[4])\n", hyp_grp_name(wr, grp, name)); } } @@ -460,7 +460,7 @@ if (descr == NULL) descr = "?"; - pcb_fprintf(wr->f, " (? REF=%[4] NAME=%[4] L=%[4])\n", safe_subc_name(wr, subc), descr, layer); + rnd_fprintf(wr->f, " (? REF=%[4] NAME=%[4] L=%[4])\n", safe_subc_name(wr, subc), descr, layer); cnt++; } @@ -499,7 +499,7 @@ for (e = htpp_first(&map.n2o); e != NULL; e = htpp_next(&map.n2o, e)) { dyn_obj_t *o; pcb_net_t *net = e->key; - pcb_fprintf(wr->f, "{NET=%[4]\n", net->name); + rnd_fprintf(wr->f, "{NET=%[4]\n", net->name); for (o = e->value; o != NULL; o = o->next) { switch (o->obj->type) { case PCB_OBJ_LINE: @@ -549,7 +549,7 @@ hyp_pstk_init(&wr); hyp_grp_init(&wr); - pcb_printf_slot[4] = "%{{\\}\\()\t\r\n \"=}mq"; + rnd_printf_slot[4] = "%{{\\}\\()\t\r\n \"=}mq"; if (write_hdr(&wr) != 0) goto err; Index: trunk/src_plugins/io_kicad/read.c =================================================================== --- trunk/src_plugins/io_kicad/read.c (revision 31006) +++ trunk/src_plugins/io_kicad/read.c (revision 31007) @@ -140,10 +140,10 @@ va_list ap; gds_init(&str); - pcb_append_printf(&str, "io_kicad parse error at %d.%d: ", subtree->line, subtree->col); + rnd_append_printf(&str, "io_kicad parse error at %d.%d: ", subtree->line, subtree->col); va_start(ap, fmt); - pcb_safe_append_vprintf(&str, 0, fmt, ap); + rnd_safe_append_vprintf(&str, 0, fmt, ap); va_end(ap); gds_append(&str, '\n'); @@ -160,10 +160,10 @@ va_list ap; gds_init(&str); - pcb_append_printf(&str, "io_kicad warning at %d.%d: ", subtree->line, subtree->col); + rnd_append_printf(&str, "io_kicad warning at %d.%d: ", subtree->line, subtree->col); va_start(ap, fmt); - pcb_safe_append_vprintf(&str, 0, fmt, ap); + rnd_safe_append_vprintf(&str, 0, fmt, ap); va_end(ap); gds_append(&str, '\n'); Index: trunk/src_plugins/io_kicad/read_net.c =================================================================== --- trunk/src_plugins/io_kicad/read_net.c (revision 31006) +++ trunk/src_plugins/io_kicad/read_net.c (revision 31007) @@ -163,7 +163,7 @@ rnd_message(RND_MSG_WARNING, "eeschema: ignoring incomplete connection to net %s: refdes=%s pin=%s \n", netname, ref, pin); continue; } - pcb_snprintf(refpin, sizeof(refpin), "%s-%s", ref, pin); + rnd_snprintf(refpin, sizeof(refpin), "%s-%s", ref, pin); rnd_actionva(&PCB->hidlib, "Netlist", "Add", netname, refpin, NULL); } } Index: trunk/src_plugins/io_kicad/write.c =================================================================== --- trunk/src_plugins/io_kicad/write.c (revision 31006) +++ trunk/src_plugins/io_kicad/write.c (revision 31007) @@ -234,7 +234,7 @@ const char *cmd[] = {"segment", "gr_line", "fp_line"}; fprintf(ctx->f, "%*s", ind, ""); - pcb_fprintf(ctx->f, + rnd_fprintf(ctx->f, "(%s (start %.3mm %.3mm) (end %.3mm %.3mm) (layer %s) (width %.3mm))\n", cmd[kly->type], line->Point1.X + dx, line->Point1.Y + dy, @@ -283,14 +283,14 @@ switch(kly->type) { case KLYT_COPPER: TODO(": this should be a proper line approximation using a helper (to be written)") - pcb_fprintf(ctx->f, "(segment (start %.3mm %.3mm) (end %.3mm %.3mm) (layer %s) (width %.3mm))\n", copperStartX, copperStartY, xEnd, yEnd, kly->name, arc->Thickness); /* neglect (net ___ ) for now */ + rnd_fprintf(ctx->f, "(segment (start %.3mm %.3mm) (end %.3mm %.3mm) (layer %s) (width %.3mm))\n", copperStartX, copperStartY, xEnd, yEnd, kly->name, arc->Thickness); /* neglect (net ___ ) for now */ pcb_io_incompat_save(ctx->pcb->Data, (pcb_any_obj_t *)arc, "copper-arc", "Kicad does not support copper arcs; using line approximation", NULL); break; case KLYT_GR: - pcb_fprintf(ctx->f, "(gr_arc (start %.3mm %.3mm) (end %.3mm %.3mm) (angle %ma) (layer %s) (width %.3mm))\n", xStart, yStart, xEnd, yEnd, arc->Delta, kly->name, arc->Thickness); + rnd_fprintf(ctx->f, "(gr_arc (start %.3mm %.3mm) (end %.3mm %.3mm) (angle %ma) (layer %s) (width %.3mm))\n", xStart, yStart, xEnd, yEnd, arc->Delta, kly->name, arc->Thickness); break; case KLYT_FP: - pcb_fprintf(ctx->f, "(fp_arc (start %.3mm %.3mm) (end %.3mm %.3mm) (angle %ma) (layer %s) (width %.3mm))\n", xStart, yStart, xEnd, yEnd, arc->Delta, kly->name, arc->Thickness); + rnd_fprintf(ctx->f, "(fp_arc (start %.3mm %.3mm) (end %.3mm %.3mm) (angle %ma) (layer %s) (width %.3mm))\n", xStart, yStart, xEnd, yEnd, arc->Delta, kly->name, arc->Thickness); break; } } @@ -316,7 +316,7 @@ } fprintf(ctx->f, "%*s", ind, ""); - pcb_fprintf(ctx->f, "(gr_text %[4] ", text->TextString); + rnd_fprintf(ctx->f, "(gr_text %[4] ", text->TextString); defaultXSize = 5 * PCB_SCALE_TEXT(mWidth, text->Scale) / 6; /* IIRC kicad treats this as kerned width of upper case m */ defaultYSize = defaultXSize; strokeThickness = PCB_SCALE_TEXT(defaultStrokeThickness, text->Scale / 2); @@ -388,12 +388,12 @@ } textOffsetX = halfStringWidth; } - pcb_fprintf(ctx->f, "(at %.3mm %.3mm", text->X + dx + textOffsetX, text->Y + dy + textOffsetY); + rnd_fprintf(ctx->f, "(at %.3mm %.3mm", text->X + dx + textOffsetX, text->Y + dy + textOffsetY); if (text->rot != 0.0) fprintf(ctx->f, " %f", text->rot); - pcb_fprintf(ctx->f, ") (layer %s)\n", kly->name); + rnd_fprintf(ctx->f, ") (layer %s)\n", kly->name); fprintf(ctx->f, "%*s", ind + 2, ""); - pcb_fprintf(ctx->f, "(effects (font (size %.3mm %.3mm) (thickness %.3mm))", defaultXSize, defaultYSize, strokeThickness); /* , rotation */ + rnd_fprintf(ctx->f, "(effects (font (size %.3mm %.3mm) (thickness %.3mm))", defaultXSize, defaultYSize, strokeThickness); /* , rotation */ if (kicadMirrored == 0) { fprintf(ctx->f, " (justify mirror)"); } @@ -422,9 +422,9 @@ /* now the zone outline is defined */ for(i = 0; i < polygon->PointN; i = i + 5) { /* kicad exports five coords per line in s-expr files */ - fprintf(ctx->f, "%*s", ind + 6, ""); /* pcb_fprintf does not support %*s */ + fprintf(ctx->f, "%*s", ind + 6, ""); /* rnd_fprintf does not support %*s */ for(j = 0; (j < polygon->PointN) && (j < 5); j++) { - pcb_fprintf(ctx->f, "(xy %.3mm %.3mm)", polygon->Points[i + j].X + dx, polygon->Points[i + j].Y + dy); + rnd_fprintf(ctx->f, "(xy %.3mm %.3mm)", polygon->Points[i + j].X + dx, polygon->Points[i + j].Y + dy); if ((j < 4) && ((i + j) < (polygon->PointN - 1))) { fputs(" ", ctx->f); } @@ -453,9 +453,9 @@ /* now the zone outline is defined */ for(i = 0; i < polygon->PointN; i = i + 5) { /* kicad exports five coords per line in s-expr files */ - fprintf(ctx->f, "%*s", ind + 4, ""); /* pcb_fprintf does not support %*s */ + fprintf(ctx->f, "%*s", ind + 4, ""); /* rnd_fprintf does not support %*s */ for(j = 0; (j < polygon->PointN) && (j < 5); j++) { - pcb_fprintf(ctx->f, "(xy %.3mm %.3mm)", polygon->Points[i + j].X + dx, polygon->Points[i + j].Y + dy); + rnd_fprintf(ctx->f, "(xy %.3mm %.3mm)", polygon->Points[i + j].X + dx, polygon->Points[i + j].Y + dy); if ((j < 4) && ((i + j) < (polygon->PointN - 1))) { fputs(" ", ctx->f); } @@ -552,7 +552,7 @@ if (pcb_pstk_export_compat_via(ps, &x, &y, &drill_dia, &pad_dia, &clearance, &mask, &cshape, &plated)) { fprintf(ctx->f, "%*s", ind, ""); TODO(": handle all cshapes (throw warnings)") - pcb_fprintf(ctx->f, "(pad %s thru_hole %s (at %.3mm %.3mm %f) (size %.3mm %.3mm) (drill %.3mm) (layers %s %s)", + rnd_fprintf(ctx->f, "(pad %s thru_hole %s (at %.3mm %.3mm %f) (size %.3mm %.3mm) (drill %.3mm) (layers %s %s)", ps->term, ((cshape == PCB_PSTK_COMPAT_SQUARE) ? "rect" : "oval"), x + dx, y + dy, psrot, pad_dia, pad_dia, @@ -618,7 +618,7 @@ } fprintf(ctx->f, "%*s", ind, ""); - pcb_fprintf(ctx->f, "(pad %s smd %s (at %.3mm %.3mm %f) (size %.3mm %.3mm) (layers", + rnd_fprintf(ctx->f, "(pad %s smd %s (at %.3mm %.3mm %f) (size %.3mm %.3mm) (layers", ps->term, shape_str, ps->x + dx, ps->y + dy, psrot, w, h, @@ -650,7 +650,7 @@ TODO(": set klayer_from and klayer_to using bb span of ps") fprintf(ctx->f, "%*s", ind, ""); - pcb_fprintf(ctx->f, "(via (at %.3mm %.3mm) (size %.3mm) (layers %s %s))\n", + rnd_fprintf(ctx->f, "(via (at %.3mm %.3mm) (size %.3mm) (layers %s %s))\n", x + dx, y + dy, pad_dia, kicad_sexpr_layer_to_text(ctx, klayer_from), kicad_sexpr_layer_to_text(ctx, klayer_to) ); /* skip (net 0) for now */ @@ -764,18 +764,18 @@ TODO(": why the heck do we hardwire timestamps?!!?!?!") fprintf(ctx->f, "%*s", ind, ""); rnd_trace("copper layer=\n", copperLayer); - pcb_fprintf(ctx->f, "(module %[4] (layer %s) (tedit 4E4C0E65) (tstamp 5127A136)\n", currentElementName, kicad_sexpr_layer_to_text(ctx, copperLayer)); + rnd_fprintf(ctx->f, "(module %[4] (layer %s) (tedit 4E4C0E65) (tstamp 5127A136)\n", currentElementName, kicad_sexpr_layer_to_text(ctx, copperLayer)); fprintf(ctx->f, "%*s", ind + 2, ""); - pcb_fprintf(ctx->f, "(at %.3mm %.3mm)\n", xPos, yPos); + rnd_fprintf(ctx->f, "(at %.3mm %.3mm)\n", xPos, yPos); fprintf(ctx->f, "%*s", ind + 2, ""); - pcb_fprintf(ctx->f, "(descr %[4])\n", currentElementName); + rnd_fprintf(ctx->f, "(descr %[4])\n", currentElementName); fprintf(ctx->f, "%*s", ind + 2, ""); TODO(": do not hardwire these coords, look up the first silk dyntext coords instead") - pcb_fprintf(ctx->f, "(fp_text reference %[4] (at 0.0 -2.56) ", currentElementRef); - pcb_fprintf(ctx->f, "(layer %s)\n", kicad_sexpr_layer_to_text(ctx, silkLayer)); + rnd_fprintf(ctx->f, "(fp_text reference %[4] (at 0.0 -2.56) ", currentElementRef); + rnd_fprintf(ctx->f, "(layer %s)\n", kicad_sexpr_layer_to_text(ctx, silkLayer)); TODO(": do not hardwire font sizes here, look up the first silk dyntext sizes instead") fprintf(ctx->f, "%*s", ind + 4, ""); @@ -784,8 +784,8 @@ TODO(": do not hardwire these coords, look up the first silk dyntext coords instead") fprintf(ctx->f, "%*s", ind + 2, ""); - pcb_fprintf(ctx->f, "(fp_text value %[4] (at 0.0 -1.27) ", currentElementVal); - pcb_fprintf(ctx->f, "(layer %s)\n", kicad_sexpr_layer_to_text(ctx, silkLayer)); + rnd_fprintf(ctx->f, "(fp_text value %[4] (at 0.0 -1.27) ", currentElementVal); + rnd_fprintf(ctx->f, "(layer %s)\n", kicad_sexpr_layer_to_text(ctx, silkLayer)); TODO(": do not hardwire font sizes here, look up the first silk dyntext sizes instead") fprintf(ctx->f, "%*s", ind + 4, ""); @@ -841,7 +841,7 @@ { TODO(": do not hardwire the drill size here - does kicad support only one size, or what?") fprintf(FP, "%*s", indentation, ""); - pcb_fprintf(FP, "(via_drill 0.635)\n"); /* mm format, default for now, ~= 0.635mm */ + rnd_fprintf(FP, "(via_drill 0.635)\n"); /* mm format, default for now, ~= 0.635mm */ return 0; } @@ -859,7 +859,7 @@ wctx_t wctx; TODO(": make this initialization a common function with write_kicad_layout()") - pcb_printf_slot[4] = "%{\\()\t\r\n \"}mq"; + rnd_printf_slot[4] = "%{\\()\t\r\n \"}mq"; wctx.f = f; wctx.pcb = PCB; @@ -892,7 +892,7 @@ netNumber++; fprintf(FP, "%*s(net %d ", indentation, "", netNumber); /* netlist 0 was used for unconnected pads */ - pcb_fprintf(FP, "%[4])\n", net->name); + rnd_fprintf(FP, "%[4])\n", net->name); net->export_tmp = netNumber; } return 0; @@ -942,7 +942,7 @@ LayoutXOffset = PCB_MIL_TO_COORD(sheetWidth) / 2 - PCB->hidlib.size_x / 2; } else { /* the layout is bigger than A0; most unlikely, but... */ - /* pcb_fprintf(ctx->f, "%.0ml ", PCB->hidlib.size_x); */ + /* rnd_fprintf(ctx->f, "%.0ml ", PCB->hidlib.size_x); */ LayoutXOffset = 0; } if (sheetHeight > PCB_COORD_TO_MIL(PCB->hidlib.size_y)) { @@ -950,7 +950,7 @@ LayoutYOffset = PCB_MIL_TO_COORD(sheetHeight) / 2 - PCB->hidlib.size_y / 2; } else { /* the layout is bigger than A0; most unlikely, but... */ - /* pcb_fprintf(ctx->f, "%.0ml", PCB->hidlib.size_y); */ + /* rnd_fprintf(ctx->f, "%.0ml", PCB->hidlib.size_y); */ LayoutYOffset = 0; } @@ -964,22 +964,22 @@ static void kicad_print_implicit_outline(wctx_t *ctx, const char *lynam, rnd_coord_t thick, int ind) { fprintf(ctx->f, "%*s", ind, ""); - pcb_fprintf(ctx->f, "(gr_line (start %.3mm %.3mm) (end %.3mm %.3mm) (layer %s) (width %.3mm))\n", + rnd_fprintf(ctx->f, "(gr_line (start %.3mm %.3mm) (end %.3mm %.3mm) (layer %s) (width %.3mm))\n", ctx->ox, ctx->oy, ctx->pcb->hidlib.size_x + ctx->ox, ctx->oy, lynam, thick); fprintf(ctx->f, "%*s", ind, ""); - pcb_fprintf(ctx->f, "(gr_line (start %.3mm %.3mm) (end %.3mm %.3mm) (layer %s) (width %.3mm))\n", + rnd_fprintf(ctx->f, "(gr_line (start %.3mm %.3mm) (end %.3mm %.3mm) (layer %s) (width %.3mm))\n", ctx->pcb->hidlib.size_x + ctx->ox, ctx->oy, ctx->pcb->hidlib.size_x + ctx->ox, ctx->pcb->hidlib.size_y + ctx->oy, lynam, thick); fprintf(ctx->f, "%*s", ind, ""); - pcb_fprintf(ctx->f, "(gr_line (start %.3mm %.3mm) (end %.3mm %.3mm) (layer %s) (width %.3mm))\n", + rnd_fprintf(ctx->f, "(gr_line (start %.3mm %.3mm) (end %.3mm %.3mm) (layer %s) (width %.3mm))\n", ctx->pcb->hidlib.size_x + ctx->ox, ctx->pcb->hidlib.size_y + ctx->oy, ctx->ox, ctx->pcb->hidlib.size_y + ctx->oy, lynam, thick); fprintf(ctx->f, "%*s", ind, ""); - pcb_fprintf(ctx->f, "(gr_line (start %.3mm %.3mm) (end %.3mm %.3mm) (layer %s) (width %.3mm))\n", + rnd_fprintf(ctx->f, "(gr_line (start %.3mm %.3mm) (end %.3mm %.3mm) (layer %s) (width %.3mm))\n", ctx->ox, ctx->pcb->hidlib.size_y + ctx->oy, ctx->ox, ctx->oy, lynam, thick); @@ -1014,7 +1014,7 @@ wctx.f = FP; /* Kicad string quoting pattern: protect parenthesis, whitespace, quote and backslash */ - pcb_printf_slot[4] = "%{\\()\t\r\n \"}mq"; + rnd_printf_slot[4] = "%{\\()\t\r\n \"}mq"; fprintf(FP, "(kicad_pcb (version 3) (host pcb-rnd \"(%s %s)\")", PCB_VERSION, PCB_REVISION); Index: trunk/src_plugins/io_kicad_legacy/write.c =================================================================== --- trunk/src_plugins/io_kicad_legacy/write.c (revision 31006) +++ trunk/src_plugins/io_kicad_legacy/write.c (revision 31007) @@ -93,11 +93,11 @@ continue; } - pcb_fprintf(FP, "Po 3 %.0mk %.0mk %.0mk %.0mk %.0mk\n", /* testing kicad printf */ + rnd_fprintf(FP, "Po 3 %.0mk %.0mk %.0mk %.0mk %.0mk\n", /* testing kicad printf */ x + xOffset, y + yOffset, x + xOffset, y + yOffset, pad_dia); TODO(": check if drill_dia can be applied") TODO(": bbvia") - pcb_fprintf(FP, "De 15 1 0 0 0\n"); /* this is equivalent to 0F, via from 15 -> 0 */ + rnd_fprintf(FP, "De 15 1 0 0 0\n"); /* this is equivalent to 0F, via from 15 -> 0 */ } } return 0; @@ -107,7 +107,7 @@ static int write_kicad_legacy_layout_via_drill_size(FILE *FP) { TODO(": do not hardwire this") - pcb_fprintf(FP, "ViaDrill 250\n"); /* decimil format, default for now, ~= 0.635mm */ + rnd_fprintf(FP, "ViaDrill 250\n"); /* decimil format, default for now, ~= 0.635mm */ return 0; } @@ -122,13 +122,13 @@ int localFlag = 0; linelist_foreach(&layer->Line, &it, line) { if (currentLayer < 16) { /* a copper line i.e. track */ - pcb_fprintf(FP, "Po 0 %.0mk %.0mk %.0mk %.0mk %.0mk\n", line->Point1.X + xOffset, line->Point1.Y + yOffset, line->Point2.X + xOffset, line->Point2.Y + yOffset, line->Thickness); - pcb_fprintf(FP, "De %d 0 0 0 0\n", currentLayer); /* omitting net info */ + rnd_fprintf(FP, "Po 0 %.0mk %.0mk %.0mk %.0mk %.0mk\n", line->Point1.X + xOffset, line->Point1.Y + yOffset, line->Point2.X + xOffset, line->Point2.Y + yOffset, line->Thickness); + rnd_fprintf(FP, "De %d 0 0 0 0\n", currentLayer); /* omitting net info */ } else if ((currentLayer == 20) || (currentLayer == 21) || (currentLayer == 28)) { /* a silk line or outline */ fputs("$DRAWSEGMENT\n", FP); - pcb_fprintf(FP, "Po 0 %.0mk %.0mk %.0mk %.0mk %.0mk\n", line->Point1.X + xOffset, line->Point1.Y + yOffset, line->Point2.X + xOffset, line->Point2.Y + yOffset, line->Thickness); - pcb_fprintf(FP, "De %d 0 0 0 0\n", currentLayer); /* omitting net info */ + rnd_fprintf(FP, "Po 0 %.0mk %.0mk %.0mk %.0mk %.0mk\n", line->Point1.X + xOffset, line->Point1.Y + yOffset, line->Point2.X + xOffset, line->Point2.Y + yOffset, line->Thickness); + rnd_fprintf(FP, "De %d 0 0 0 0\n", currentLayer); /* omitting net info */ fputs("$EndDRAWSEGMENT\n", FP); } localFlag |= 1; @@ -182,13 +182,13 @@ if (currentLayer < 16) { /* a copper arc, i.e. track, is unsupported by kicad, and will be exported as a line */ kicadArcShape = 0; /* make it a line for copper layers - kicad doesn't do arcs on copper */ - pcb_fprintf(FP, "Po %d %.0mk %.0mk %.0mk %.0mk %.0mk\n", kicadArcShape, copperStartX, copperStartY, xEnd, yEnd, arc->Thickness); - pcb_fprintf(FP, "De %d 0 0 0 0\n", currentLayer); /* in theory, copper arcs unsupported by kicad, make angle = 0 */ + rnd_fprintf(FP, "Po %d %.0mk %.0mk %.0mk %.0mk %.0mk\n", kicadArcShape, copperStartX, copperStartY, xEnd, yEnd, arc->Thickness); + rnd_fprintf(FP, "De %d 0 0 0 0\n", currentLayer); /* in theory, copper arcs unsupported by kicad, make angle = 0 */ } else if ((currentLayer == 20) || (currentLayer == 21) || (currentLayer == 28)) { /* a silk arc or outline */ fputs("$DRAWSEGMENT\n", FP); - pcb_fprintf(FP, "Po %d %.0mk %.0mk %.0mk %.0mk %.0mk\n", kicadArcShape, xStart, yStart, xEnd, yEnd, arc->Thickness); - pcb_fprintf(FP, "De %d 0 %mA 0 0\n", currentLayer, arc->Delta); /* in theory, decidegrees != 900 unsupported by older kicad */ + rnd_fprintf(FP, "Po %d %.0mk %.0mk %.0mk %.0mk %.0mk\n", kicadArcShape, xStart, yStart, xEnd, yEnd, arc->Thickness); + rnd_fprintf(FP, "De %d 0 %mA 0 0\n", currentLayer, arc->Delta); /* in theory, decidegrees != 900 unsupported by older kicad */ fputs("$EndDRAWSEGMENT\n", FP); } localFlag |= 1; @@ -302,8 +302,8 @@ } textOffsetX = halfStringWidth; } - pcb_fprintf(FP, "Po %.0mk %.0mk %.0mk %.0mk %.0mk %d\n", text->X + xOffset + textOffsetX, text->Y + yOffset + textOffsetY, defaultXSize, defaultYSize, strokeThickness, rotation); - pcb_fprintf(FP, "De %d %d B98C Normal\n", currentLayer, kicadMirrored); /* timestamp made up B98C */ + rnd_fprintf(FP, "Po %.0mk %.0mk %.0mk %.0mk %.0mk %d\n", text->X + xOffset + textOffsetX, text->Y + yOffset + textOffsetY, defaultXSize, defaultYSize, strokeThickness, rotation); + rnd_fprintf(FP, "De %d %d B98C Normal\n", currentLayer, kicadMirrored); /* timestamp made up B98C */ fputs("$EndTEXTPCB\n", FP); } localFlag |= 1; @@ -392,7 +392,7 @@ fprintf(FP, "$MODULE %s\n", uname); TODO(": do not hardwire time stamps") - pcb_fprintf(FP, "Po %.0mk %.0mk 0 %d 51534DFF 00000000 ~~\n", ox, oy, copperLayer); + rnd_fprintf(FP, "Po %.0mk %.0mk 0 %d 51534DFF 00000000 ~~\n", ox, oy, copperLayer); fprintf(FP, "Li %s\n", uname); /* This needs to be unique */ fprintf(FP, "Cd %s\n", uname); fputs("Sc 0\n", FP); @@ -424,7 +424,7 @@ if (pcb_pstk_export_compat_via(ps, &x, &y, &drill_dia, &pad_dia, &clearance, &mask, &cshape, &plated)) { fputs("$PAD\n", FP); - pcb_fprintf(FP, "Po %.0mk %.0mk\n", x - sox, y - soy); /* positions of pad */ + rnd_fprintf(FP, "Po %.0mk %.0mk\n", x - sox, y - soy); /* positions of pad */ fputs("Sh ", FP); /* pin shape descriptor */ pcb_print_quoted_string(FP, (char *)RND_EMPTY(ps->term)); @@ -434,11 +434,11 @@ pcb_io_incompat_save(subc->data, (pcb_any_obj_t *)ps, "padstack-shape", "can't export shaped pin; needs to be square or circular - using circular instead", NULL); fputs(" C ", FP); } - pcb_fprintf(FP, "%.0mk %.0mk ", pad_dia, pad_dia); /* height = width */ + rnd_fprintf(FP, "%.0mk %.0mk ", pad_dia, pad_dia); /* height = width */ fprintf(FP, "0 0 %d\n", (int)(psrot * 10)); /* deltaX deltaY Orientation as float in decidegrees */ /* drill details; size and x,y pos relative to pad location */ - pcb_fprintf(FP, "Dr %.0mk 0 0\n", drill_dia); + rnd_fprintf(FP, "Dr %.0mk 0 0\n", drill_dia); fputs("At STD N 00E0FFFF\n", FP); /* through hole STD pin, all copper layers */ @@ -515,13 +515,13 @@ if (tshp->shape[n].layer_mask & PCB_LYT_MASK) has_mask = 1; } - pcb_fprintf(FP, "Po %.0mk %.0mk\n", ps->x + cx - sox, ps->y + cy - soy); /* positions of pad */ + rnd_fprintf(FP, "Po %.0mk %.0mk\n", ps->x + cx - sox, ps->y + cy - soy); /* positions of pad */ fputs("Sh ", FP); /* pin shape descriptor */ pcb_print_quoted_string(FP, (char *)RND_EMPTY(ps->term)); - pcb_fprintf(FP, " %c %.0mk %.0mk ", shape_chr, w, h); + rnd_fprintf(FP, " %c %.0mk %.0mk ", shape_chr, w, h); - pcb_fprintf(FP, "0 0 %d\n", (int)(psrot*10.0)); /* deltaX deltaY Orientation as float in decidegrees */ + rnd_fprintf(FP, "0 0 %d\n", (int)(psrot*10.0)); /* deltaX deltaY Orientation as float in decidegrees */ fputs("Dr 0 0 0\n", FP); /* drill details; zero size; x,y pos vs pad location */ @@ -567,7 +567,7 @@ silkLayer = (lyt & PCB_LYT_BOTTOM) ? 20 : 21; linelist_foreach(&ly->Line, &it, line) { - pcb_fprintf(FP, "DS %.0mk %.0mk %.0mk %.0mk %.0mk ", + rnd_fprintf(FP, "DS %.0mk %.0mk %.0mk %.0mk %.0mk ", line->Point1.X - sox, line->Point1.Y - soy, line->Point2.X - sox, line->Point2.Y - soy, line->Thickness); @@ -579,13 +579,13 @@ pcb_arc_get_end(arc, 1, &arcEndX, &arcEndY); if ((arc->Delta == 360.0) || (arc->Delta == -360.0)) { /* it's a circle */ - pcb_fprintf(FP, "DC %.0mk %.0mk %.0mk %.0mk %.0mk ", + rnd_fprintf(FP, "DC %.0mk %.0mk %.0mk %.0mk %.0mk ", arc->X - sox, arc->Y - soy, /* centre */ arcStartX - sox, arcStartY - soy, /* on circle */ arc->Thickness); } else { - pcb_fprintf(FP, "DA %.0mk %.0mk %.0mk %.0mk %mA %.0mk ", + rnd_fprintf(FP, "DA %.0mk %.0mk %.0mk %.0mk %mA %.0mk ", arc->X - sox, arc->Y - soy, /* centre */ arcEndX - sox, arcEndY - soy, arc->Delta, /* CW delta angle in decidegrees */ @@ -647,7 +647,7 @@ if (i == (polygon->PointN - 1)) { j = 1; /* flags that this is the last vertex of the outline */ } - pcb_fprintf(FP, "ZCorner %.0mk %.0mk %d\n", polygon->Points[i].X + xOffset, polygon->Points[i].Y + yOffset, j); + rnd_fprintf(FP, "ZCorner %.0mk %.0mk %d\n", polygon->Points[i].X + xOffset, polygon->Points[i].Y + yOffset, j); } /* in here could go additional plolygon descriptors for holes removed from the previously defined outer polygon */ @@ -775,7 +775,7 @@ LayoutXOffset = PCB_MIL_TO_COORD(sheetWidth) / 2 - PCB->hidlib.size_x / 2; } else { /* the layout is bigger than A0; most unlikely, but... */ - pcb_fprintf(FP, "%.0ml ", PCB->hidlib.size_x); + rnd_fprintf(FP, "%.0ml ", PCB->hidlib.size_x); LayoutXOffset = 0; } if (sheetHeight > PCB_COORD_TO_MIL(PCB->hidlib.size_y)) { @@ -783,7 +783,7 @@ LayoutYOffset = PCB_MIL_TO_COORD(sheetHeight) / 2 - PCB->hidlib.size_y / 2; } else { /* the layout is bigger than A0; most unlikely, but... */ - pcb_fprintf(FP, "%.0ml", PCB->hidlib.size_y); + rnd_fprintf(FP, "%.0ml", PCB->hidlib.size_y); LayoutYOffset = 0; } fputs("\n", FP); @@ -894,20 +894,20 @@ } else { /* no outline layer per se, export the board margins instead - obviously some scope to reduce redundant code... */ fputs("$DRAWSEGMENT\n", FP); - pcb_fprintf(FP, "Po 0 %.0mk %.0mk %.0mk %.0mk %.0mk\n", PCB->hidlib.size_x / 2 - LayoutXOffset, PCB->hidlib.size_y / 2 - LayoutYOffset, PCB->hidlib.size_x / 2 + LayoutXOffset, PCB->hidlib.size_y / 2 - LayoutYOffset, outlineThickness); - pcb_fprintf(FP, "De %d 0 0 0 0\n", currentKicadLayer); + rnd_fprintf(FP, "Po 0 %.0mk %.0mk %.0mk %.0mk %.0mk\n", PCB->hidlib.size_x / 2 - LayoutXOffset, PCB->hidlib.size_y / 2 - LayoutYOffset, PCB->hidlib.size_x / 2 + LayoutXOffset, PCB->hidlib.size_y / 2 - LayoutYOffset, outlineThickness); + rnd_fprintf(FP, "De %d 0 0 0 0\n", currentKicadLayer); fputs("$EndDRAWSEGMENT\n", FP); fputs("$DRAWSEGMENT\n", FP); - pcb_fprintf(FP, "Po 0 %.0mk %.0mk %.0mk %.0mk %.0mk\n", PCB->hidlib.size_x / 2 + LayoutXOffset, PCB->hidlib.size_y / 2 - LayoutYOffset, PCB->hidlib.size_x / 2 + LayoutXOffset, PCB->hidlib.size_y / 2 + LayoutYOffset, outlineThickness); - pcb_fprintf(FP, "De %d 0 0 0 0\n", currentKicadLayer); + rnd_fprintf(FP, "Po 0 %.0mk %.0mk %.0mk %.0mk %.0mk\n", PCB->hidlib.size_x / 2 + LayoutXOffset, PCB->hidlib.size_y / 2 - LayoutYOffset, PCB->hidlib.size_x / 2 + LayoutXOffset, PCB->hidlib.size_y / 2 + LayoutYOffset, outlineThickness); + rnd_fprintf(FP, "De %d 0 0 0 0\n", currentKicadLayer); fputs("$EndDRAWSEGMENT\n", FP); fputs("$DRAWSEGMENT\n", FP); - pcb_fprintf(FP, "Po 0 %.0mk %.0mk %.0mk %.0mk %.0mk\n", PCB->hidlib.size_x / 2 + LayoutXOffset, PCB->hidlib.size_y / 2 + LayoutYOffset, PCB->hidlib.size_x / 2 - LayoutXOffset, PCB->hidlib.size_y / 2 + LayoutYOffset, outlineThickness); - pcb_fprintf(FP, "De %d 0 0 0 0\n", currentKicadLayer); + rnd_fprintf(FP, "Po 0 %.0mk %.0mk %.0mk %.0mk %.0mk\n", PCB->hidlib.size_x / 2 + LayoutXOffset, PCB->hidlib.size_y / 2 + LayoutYOffset, PCB->hidlib.size_x / 2 - LayoutXOffset, PCB->hidlib.size_y / 2 + LayoutYOffset, outlineThickness); + rnd_fprintf(FP, "De %d 0 0 0 0\n", currentKicadLayer); fputs("$EndDRAWSEGMENT\n", FP); fputs("$DRAWSEGMENT\n", FP); - pcb_fprintf(FP, "Po 0 %.0mk %.0mk %.0mk %.0mk %.0mk\n", PCB->hidlib.size_x / 2 - LayoutXOffset, PCB->hidlib.size_y / 2 + LayoutYOffset, PCB->hidlib.size_x / 2 - LayoutXOffset, PCB->hidlib.size_y / 2 - LayoutYOffset, outlineThickness); - pcb_fprintf(FP, "De %d 0 0 0 0\n", currentKicadLayer); + rnd_fprintf(FP, "Po 0 %.0mk %.0mk %.0mk %.0mk %.0mk\n", PCB->hidlib.size_x / 2 - LayoutXOffset, PCB->hidlib.size_y / 2 + LayoutYOffset, PCB->hidlib.size_x / 2 - LayoutXOffset, PCB->hidlib.size_y / 2 - LayoutYOffset, outlineThickness); + rnd_fprintf(FP, "De %d 0 0 0 0\n", currentKicadLayer); fputs("$EndDRAWSEGMENT\n", FP); } Index: trunk/src_plugins/io_lihata/read.c =================================================================== --- trunk/src_plugins/io_lihata/read.c (revision 31006) +++ trunk/src_plugins/io_lihata/read.c (revision 31007) @@ -85,12 +85,12 @@ gds_init(&str); gds_append_str(&str, "io_lihata parse error"); if (nd != NULL) - pcb_append_printf(&str, " at %s:%d.%d: ", nd->file_name, nd->line, nd->col); + rnd_append_printf(&str, " at %s:%d.%d: ", nd->file_name, nd->line, nd->col); else gds_append_str(&str, ": "); va_start(ap, fmt); - pcb_safe_append_vprintf(&str, 0, fmt, ap); + rnd_safe_append_vprintf(&str, 0, fmt, ap); va_end(ap); rnd_message(RND_MSG_ERROR, "%s", str.array); @@ -114,12 +114,12 @@ gds_init(&str); gds_append_str(&str, "io_lihata parse warning"); if (nd != NULL) - pcb_append_printf(&str, "at %s:%d.%d: ", nd->file_name, nd->line, nd->col); + rnd_append_printf(&str, "at %s:%d.%d: ", nd->file_name, nd->line, nd->col); else gds_append_str(&str, ": "); va_start(ap, fmt); - pcb_safe_append_vprintf(&str, 0, fmt, ap); + rnd_safe_append_vprintf(&str, 0, fmt, ap); va_end(ap); rnd_message(RND_MSG_WARNING, "%s", str.array); Index: trunk/src_plugins/io_lihata/write.c =================================================================== --- trunk/src_plugins/io_lihata/write.c (revision 31006) +++ trunk/src_plugins/io_lihata/write.c (revision 31007) @@ -118,7 +118,7 @@ field = lht_dom_node_alloc(LHT_TEXT, key); va_start(ap, fmt); - field->data.text.value = pcb_strdup_vprintf(fmt, ap); + field->data.text.value = rnd_strdup_vprintf(fmt, ap); va_end(ap); return field; } @@ -226,7 +226,7 @@ if (name != NULL) txt->data.text.value = rnd_strdup(name); else - txt->data.text.value = pcb_strdup_printf("%d", t); + txt->data.text.value = rnd_strdup_printf("%d", t); lht_dom_hash_put(lst, txt); added++; thrm++; @@ -641,12 +641,12 @@ } } if (polylist_length(&ly->Polygon) > 0) { - char *desc = pcb_strdup_printf("Polygons on layer %s can not be exported in an element", ly->name); + char *desc = rnd_strdup_printf("Polygons on layer %s can not be exported in an element", ly->name); pcb_io_incompat_save(subc->data, NULL, desc, "subc-objs", "only lines and arcs are exported"); free(desc); } if (textlist_length(&ly->Text) > 1) { - char *desc = pcb_strdup_printf("Text on layer %s can not be exported in an element", ly->name); + char *desc = rnd_strdup_printf("Text on layer %s can not be exported in an element", ly->name); pcb_io_incompat_save(subc->data, NULL, desc, "subc-objs", "only lines and arcs are exported"); free(desc); } @@ -654,7 +654,7 @@ } if (!(ly->meta.bound.type & PCB_LYT_VIRTUAL) && (!pcb_layer_is_pure_empty(ly))) { - char *desc = pcb_strdup_printf("Objects on layer %s can not be exported in an element", ly->name); + char *desc = rnd_strdup_printf("Objects on layer %s can not be exported in an element", ly->name); pcb_io_incompat_save(subc->data, NULL, desc, "subc-layer", "only top silk lines and arcs are exported; heavy terminals are not supported, use padstacks only"); free(desc); } @@ -1294,7 +1294,7 @@ /* grow the connection list */ for(t = pcb_termlist_first(&net->conns); t != NULL; t = pcb_termlist_next(t)) { pn = lht_dom_node_alloc(LHT_TEXT, ""); - pn->data.text.value = pcb_strdup_printf("%s-%s", t->refdes, t->term); + pn->data.text.value = rnd_strdup_printf("%s-%s", t->refdes, t->term); lht_dom_list_append(pl, pn); } lht_dom_list_append(nl, nnet); @@ -1464,7 +1464,7 @@ v1 = rnd_get_value_ex(ondisk_value, NULL, NULL, NULL, NULL, &success1); v2 = rnd_get_value_ex(inmem_node->data.text.value, NULL, NULL, NULL, NULL, &success2); -/* pcb_fprintf(stderr, " %d %d | %mm %mm\n", success1, success2, v1, v2);*/ +/* rnd_fprintf(stderr, " %d %d | %mm %mm\n", success1, success2, v1, v2);*/ if (success1 && success2) { /* smart: if values are the same, keep the on-disk version */ if (v1 == v2) @@ -1520,7 +1520,7 @@ Thus this feature should be disabled */ if ((fnpat != NULL) && (*fnpat != '\0')) { char *orig_fn, *end; - char *pcb_fn = pcb_strdup_subst(fnpat, rnd_build_fn_cb, &PCB->hidlib, PCB_SUBST_ALL); + char *pcb_fn = rnd_strdup_subst(fnpat, rnd_build_fn_cb, &PCB->hidlib, RND_SUBST_ALL); orig_fn = PCB->hidlib.filename; PCB->hidlib.filename = NULL; Index: trunk/src_plugins/io_mentor_cell/read.c =================================================================== --- trunk/src_plugins/io_mentor_cell/read.c (revision 31006) +++ trunk/src_plugins/io_mentor_cell/read.c (revision 31007) @@ -145,12 +145,12 @@ gds_init(&str); gds_append_str(&str, "io_mentor_cell ERROR"); if (nd != NULL) - pcb_append_printf(&str, " at %s:%d: ", nd->tree->filename, nd->lineno); + rnd_append_printf(&str, " at %s:%d: ", nd->tree->filename, nd->lineno); else gds_append_str(&str, ": "); va_start(ap, fmt); - pcb_safe_append_vprintf(&str, 0, fmt, ap); + rnd_safe_append_vprintf(&str, 0, fmt, ap); va_end(ap); rnd_message(RND_MSG_ERROR, "%s", str.array); Index: trunk/src_plugins/io_pcb/file.c =================================================================== --- trunk/src_plugins/io_pcb/file.c (revision 31006) +++ trunk/src_plugins/io_pcb/file.c (revision 31007) @@ -291,13 +291,13 @@ fputs("\nPCB[", FP); pcb_print_quoted_string(FP, (char *) RND_EMPTY(PCB->hidlib.name)); - pcb_fprintf(FP, " %[0] %[0]]\n\n", PCB->hidlib.size_x, PCB->hidlib.size_y); - pcb_fprintf(FP, "Grid[%[0] %[0] %[0] %d]\n", PCB->hidlib.grid, PCB->hidlib.grid_ox, PCB->hidlib.grid_oy, rnd_conf.editor.draw_grid); - pcb_fprintf(FP, "Cursor[%[0] %[0] 1000]\n", pcb_crosshair.X, pcb_crosshair.Y); + rnd_fprintf(FP, " %[0] %[0]]\n\n", PCB->hidlib.size_x, PCB->hidlib.size_y); + rnd_fprintf(FP, "Grid[%[0] %[0] %[0] %d]\n", PCB->hidlib.grid, PCB->hidlib.grid_ox, PCB->hidlib.grid_oy, rnd_conf.editor.draw_grid); + rnd_fprintf(FP, "Cursor[%[0] %[0] 1000]\n", pcb_crosshair.X, pcb_crosshair.Y); /* PolyArea should be output in square cmils, no suffix */ fprintf(FP, "PolyArea[%s]\n", c_dtostr(PCB_COORD_TO_MIL(PCB_COORD_TO_MIL(conf_core.design.poly_isle_area) * 100) * 100)); - pcb_fprintf(FP, "Thermal[%s]\n", c_dtostr(PCB->ThermScale)); - pcb_fprintf(FP, "DRC[%[0] %[0] %[0] %[0] %[0] %[0]]\n", conf_core.design.bloat, conf_core.design.shrink, + rnd_fprintf(FP, "Thermal[%s]\n", c_dtostr(PCB->ThermScale)); + rnd_fprintf(FP, "DRC[%[0] %[0] %[0] %[0] %[0] %[0]]\n", conf_core.design.bloat, conf_core.design.shrink, conf_core.design.min_wid, conf_core.design.min_slk, conf_core.design.min_drill, conf_core.design.min_ring); fprintf(FP, "Flags(%s)\n", pcb_strflg_board_f2s(pcb_flags)); fprintf(FP, "Groups(\"%s\")\n", LayerGroupsToString(&PCB->LayerGroups)); @@ -305,10 +305,10 @@ if (vtroutestyle_len(&PCB->RouteStyle) > 0) { for (group = 0; group < vtroutestyle_len(&PCB->RouteStyle) - 1; group++) - pcb_fprintf(FP, "%s,%[0],%[0],%[0],%[0]:", PCB->RouteStyle.array[group].name, + rnd_fprintf(FP, "%s,%[0],%[0],%[0],%[0]:", PCB->RouteStyle.array[group].name, PCB->RouteStyle.array[group].Thick, PCB->RouteStyle.array[group].Diameter, PCB->RouteStyle.array[group].Hole, PCB->RouteStyle.array[group].Clearance); - pcb_fprintf(FP, "%s,%[0],%[0],%[0],%[0]\"]\n\n", PCB->RouteStyle.array[group].name, + rnd_fprintf(FP, "%s,%[0],%[0],%[0],%[0]\"]\n\n", PCB->RouteStyle.array[group].name, PCB->RouteStyle.array[group].Thick, PCB->RouteStyle.array[group].Diameter, PCB->RouteStyle.array[group].Hole, PCB->RouteStyle.array[group].Clearance); } @@ -330,13 +330,13 @@ continue; if (isprint(i)) - pcb_fprintf(FP, "Symbol['%c' %[0]]\n(\n", i, font->Symbol[i].Delta); + rnd_fprintf(FP, "Symbol['%c' %[0]]\n(\n", i, font->Symbol[i].Delta); else - pcb_fprintf(FP, "Symbol[%i %[0]]\n(\n", i, font->Symbol[i].Delta); + rnd_fprintf(FP, "Symbol[%i %[0]]\n(\n", i, font->Symbol[i].Delta); line = font->Symbol[i].Line; for (j = font->Symbol[i].LineN; j; j--, line++) - pcb_fprintf(FP, "\tSymbolLine[%[0] %[0] %[0] %[0] %[0]]\n", + rnd_fprintf(FP, "\tSymbolLine[%[0] %[0] %[0] %[0] %[0]]\n", line->Point1.X, line->Point1.Y, line->Point2.X, line->Point2.Y, line->Thickness); fputs(")\n", FP); } @@ -359,7 +359,7 @@ continue; } - pcb_fprintf(FP, "Via[%[0] %[0] %[0] %[0] %[0] %[0] ", x, y, + rnd_fprintf(FP, "Via[%[0] %[0] %[0] %[0] %[0] %[0] ", x, y, pad_dia, clearance*2, mask, drill_dia); pcb_print_quoted_string(FP, (char *) RND_EMPTY(name)); fprintf(FP, " %s]\n", pcb_strflg_f2s(pcb_pstk_compat_pinvia_flag(ps, cshape, PCB_PSTKCOMP_OLD_OCTAGON), PCB_OBJ_VIA, NULL, 1)); @@ -373,7 +373,7 @@ /* write information about rats */ ratlist_foreach(&PCB->Data->Rat, &it, line) { - pcb_fprintf(FP, "Rat[%[0] %[0] %d %[0] %[0] %d ", + rnd_fprintf(FP, "Rat[%[0] %[0] %d %[0] %[0] %d ", line->Point1.X, line->Point1.Y, line->group1, line->Point2.X, line->Point2.Y, line->group2); fprintf(FP, " %s]\n", F2S(line, PCB_OBJ_RAT)); } @@ -473,7 +473,7 @@ pcb_print_quoted_string(FP, (char *) RND_EMPTY(rnd_attribute_get(&sc->Attributes, "refdes"))); fputc(' ', FP); pcb_print_quoted_string(FP, (char *) RND_EMPTY(rnd_attribute_get(&sc->Attributes, "value"))); - pcb_fprintf(FP, " %[0] %[0] %[0] %[0] %d %d %s]\n(\n", ox, oy, rx, ry, rdir, rscale, trefdes != NULL ? F2S(trefdes, PCB_OBJ_ELEMENT_NAME) : "\"\""); + rnd_fprintf(FP, " %[0] %[0] %[0] %[0] %d %d %s]\n(\n", ox, oy, rx, ry, rdir, rscale, trefdes != NULL ? F2S(trefdes, PCB_OBJ_ELEMENT_NAME) : "\"\""); WriteAttributeList(FP, &sc->Attributes, "\t", attr_inhibit); padstacklist_foreach(&sc->data->padstack, &it, ps) { @@ -482,7 +482,7 @@ rnd_bool plated, square, nopaste; unsigned char ic = ps->intconn; if (pcb_pstk_export_compat_via(ps, &x, &y, &drill_dia, &pad_dia, &clearance, &mask, &cshape, &plated)) { - pcb_fprintf(FP, "\tPin[%[0] %[0] %[0] %[0] %[0] %[0] ", x - ox, y - oy, pad_dia, clearance*2, mask, drill_dia); + rnd_fprintf(FP, "\tPin[%[0] %[0] %[0] %[0] %[0] %[0] ", x - ox, y - oy, pad_dia, clearance*2, mask, drill_dia); pcb_print_quoted_string(FP, (char *)RND_EMPTY(rnd_attribute_get(&ps->Attributes, "name"))); fprintf(FP, " "); pcb_print_quoted_string(FP, (char *) RND_EMPTY(rnd_attribute_get(&ps->Attributes, "term"))); @@ -490,7 +490,7 @@ } else if (pcb_pstk_export_compat_pad(ps, &x1, &y1, &x2, &y2, &thickness, &clearance, &mask, &square, &nopaste)) { unsigned long fl = (square ? PCB_FLAG_SQUARE : 0) | (nopaste ? PCB_FLAG_NOPASTE : 0) | (on_bot ? PCB_FLAG_ONSOLDER : 0); - pcb_fprintf(FP, "\tPad[%[0] %[0] %[0] %[0] %[0] %[0] %[0] ", + rnd_fprintf(FP, "\tPad[%[0] %[0] %[0] %[0] %[0] %[0] %[0] ", x1 - ox, y1 - oy, x2 - ox, y2 - oy, thickness, clearance, mask); pcb_print_quoted_string(FP, (char *)RND_EMPTY(rnd_attribute_get(&ps->Attributes, "name"))); fprintf(FP, " "); @@ -511,23 +511,23 @@ if ((ly->meta.bound.type & PCB_LYT_SILK) && (ly->meta.bound.type & my_side)) { linelist_foreach(&ly->Line, &it, line) { - pcb_fprintf(FP, "\tElementLine [%[0] %[0] %[0] %[0] %[0]]\n", + rnd_fprintf(FP, "\tElementLine [%[0] %[0] %[0] %[0] %[0]]\n", line->Point1.X - ox, line->Point1.Y - oy, line->Point2.X - ox, line->Point2.Y - oy, line->Thickness); } arclist_foreach(&ly->Arc, &it, arc) { - pcb_fprintf(FP, "\tElementArc [%[0] %[0] %[0] %[0] %ma %ma %[0]]\n", + rnd_fprintf(FP, "\tElementArc [%[0] %[0] %[0] %[0] %ma %ma %[0]]\n", arc->X - ox, arc->Y - oy, arc->Width, arc->Height, arc->StartAngle, arc->Delta, arc->Thickness); } if (polylist_length(&ly->Polygon) > 0) { - char *desc = pcb_strdup_printf("Polygons on layer %s can not be exported in an element", ly->name); + char *desc = rnd_strdup_printf("Polygons on layer %s can not be exported in an element", ly->name); pcb_io_incompat_save(sc->data, NULL, "element-obj", desc, "only lines and arcs are exported"); free(desc); } if (textlist_length(&ly->Text) > 1) { - char *desc = pcb_strdup_printf("Text on layer %s can not be exported in an element", ly->name); + char *desc = rnd_strdup_printf("Text on layer %s can not be exported in an element", ly->name); pcb_io_incompat_save(sc->data, NULL, "element-obj", desc, "only lines and arcs are exported"); free(desc); } @@ -535,7 +535,7 @@ } if (!(ly->meta.bound.type & PCB_LYT_VIRTUAL) && (!pcb_layer_is_pure_empty(ly))) { - char *desc = pcb_strdup_printf("Objects on layer %s can not be exported in an element", ly->name); + char *desc = rnd_strdup_printf("Objects on layer %s can not be exported in an element", ly->name); pcb_io_incompat_save(sc->data, NULL, "element-layer", desc, "only top silk lines and arcs are exported; heavy terminals are not supported, use padstacks only"); free(desc); } @@ -548,7 +548,7 @@ gdl_iterator_t sit; pcb_subc_t *sc; - pcb_printf_slot[0] = ((io_pcb_ctx_t *)(ctx->plugin_data))->write_coord_fmt; + rnd_printf_slot[0] = ((io_pcb_ctx_t *)(ctx->plugin_data))->write_coord_fmt; subclist_foreach(&Data->subc, &sit, sc) { if ((subc_idx != -1) && (subc_idx != sit.count)) @@ -566,7 +566,7 @@ int io_pcb_write_subcs_subc(pcb_plug_io_t *ctx, void **udata, FILE *f, pcb_subc_t *subc) { - pcb_printf_slot[0] = ((io_pcb_ctx_t *)(ctx->plugin_data))->write_coord_fmt; + rnd_printf_slot[0] = ((io_pcb_ctx_t *)(ctx->plugin_data))->write_coord_fmt; io_pcb_print_subc(ctx, f, subc); return 0; } @@ -613,12 +613,12 @@ WriteAttributeList(FP, &layer->Attributes, "\t", NULL); linelist_foreach(&layer->Line, &it, line) { - pcb_fprintf(FP, "\tLine[%[0] %[0] %[0] %[0] %[0] %[0] %s]\n", + rnd_fprintf(FP, "\tLine[%[0] %[0] %[0] %[0] %[0] %[0] %s]\n", line->Point1.X, line->Point1.Y, line->Point2.X, line->Point2.Y, line->Thickness, line->Clearance, F2S(line, PCB_OBJ_LINE)); } arclist_foreach(&layer->Arc, &it, arc) { - pcb_fprintf(FP, "\tArc[%[0] %[0] %[0] %[0] %[0] %[0] %ma %ma %s]\n", + rnd_fprintf(FP, "\tArc[%[0] %[0] %[0] %[0] %[0] %[0] %ma %ma %s]\n", arc->X, arc->Y, arc->Width, arc->Height, arc->Thickness, arc->Clearance, arc->StartAngle, arc->Delta, F2S(arc, PCB_OBJ_ARC)); } @@ -627,7 +627,7 @@ if (!pcb_text_old_direction(&dir, text->rot)) { TODO("textrot: incompatibility warning") } - pcb_fprintf(FP, "\tText[%[0] %[0] %d %d ", text->X, text->Y, dir, text->Scale); + rnd_fprintf(FP, "\tText[%[0] %[0] %d %d ", text->X, text->Y, dir, text->Scale); pcb_print_quoted_string(FP, (char *) RND_EMPTY(text->TextString)); fprintf(FP, " %s]\n", F2S(text, PCB_OBJ_TEXT)); } @@ -651,7 +651,7 @@ if (hole) fputs("\t", FP); } - pcb_fprintf(FP, "[%[0] %[0]] ", point->X, point->Y); + rnd_fprintf(FP, "[%[0] %[0]] ", point->X, point->Y); } if (hole > 0) fputs("\n\t\t)", FP); @@ -721,7 +721,7 @@ int purpi = pcb_layer_purpose_(ly, NULL); if ((!(lyt & (PCB_LYT_COPPER | PCB_LYT_SILK))) && (!PCB_LAYER_IS_ROUTE(lyt, purpi))) { if (!pcb_layer_is_pure_empty(ly)) { - char *desc = pcb_strdup_printf("Layer %s can be exported only as a copper layer", ly->name); + char *desc = rnd_strdup_printf("Layer %s can be exported only as a copper layer", ly->name); pcb_io_incompat_save(data, NULL, "layer", desc, NULL); free(desc); } @@ -736,7 +736,7 @@ LayersFixup(); - pcb_printf_slot[0] = ((io_pcb_ctx_t *)(ctx->plugin_data))->write_coord_fmt; + rnd_printf_slot[0] = ((io_pcb_ctx_t *)(ctx->plugin_data))->write_coord_fmt; WritePCBInfoHeader(FP); WritePCBDataHeader(FP); WritePCBFontData(FP); @@ -915,7 +915,7 @@ /* make sure every layer has a name */ for(lid = 0; lid < pcb->Data->LayerN; lid++) if (pcb->Data->Layer[lid].name == NULL) - pcb->Data->Layer[lid].name = pcb_strdup_printf("anon_%d", lid); + pcb->Data->Layer[lid].name = rnd_strdup_printf("anon_%d", lid); for(lid = 0; lid < pcb->Data->LayerN; lid++) { if (strcmp(pcb->Data->Layer[lid].name, "silk") == 0) { @@ -1051,9 +1051,9 @@ if (Flags.f & PCB_FLAG_HIDENAME) { char tmp[128]; - pcb_sprintf(tmp, "%$mm", TextX); + rnd_sprintf(tmp, "%$mm", TextX); rnd_attribute_put(&sc->Attributes, "io_pcb::hidename_x", tmp); - pcb_sprintf(tmp, "%$mm", TextY); + rnd_sprintf(tmp, "%$mm", TextY); rnd_attribute_put(&sc->Attributes, "io_pcb::hidename_y", tmp); sprintf(tmp, "%d", Direction); rnd_attribute_put(&sc->Attributes, "io_pcb::hidename_direction", tmp); Index: trunk/src_plugins/io_pcb/io_pcb.c =================================================================== --- trunk/src_plugins/io_pcb/io_pcb.c (revision 31006) +++ trunk/src_plugins/io_pcb/io_pcb.c (revision 31007) @@ -67,7 +67,7 @@ memset(&io_pcb, 0, sizeof(io_pcb)); /* register the IO hook */ - ctx[0].write_coord_fmt = pcb_printf_slot[8]; + ctx[0].write_coord_fmt = rnd_printf_slot[8]; io_pcb[0].plugin_data = &ctx[0]; io_pcb[0].fmt_support_prio = io_pcb_fmt; io_pcb[0].test_parse = io_pcb_test_parse; @@ -89,7 +89,7 @@ PCB_HOOK_REGISTER(pcb_plug_io_t, pcb_plug_io_chain, &(io_pcb[0])); pcb_centimil_io_pcb = &io_pcb[0]; - ctx[1].write_coord_fmt = pcb_printf_slot[9]; + ctx[1].write_coord_fmt = rnd_printf_slot[9]; io_pcb[1].plugin_data = &ctx[1]; io_pcb[1].fmt_support_prio = io_pcb_fmt; io_pcb[1].write_buffer = NULL; Index: trunk/src_plugins/io_pcb/parse_y.c =================================================================== --- trunk/src_plugins/io_pcb/parse_y.c (revision 31006) +++ trunk/src_plugins/io_pcb/parse_y.c (revision 31007) @@ -3353,7 +3353,7 @@ static void load_meta_coord(const char *path, rnd_coord_t crd) { char tmp[128]; - pcb_sprintf(tmp, "%$mm", crd); + rnd_sprintf(tmp, "%$mm", crd); rnd_conf_set(RND_CFR_DESIGN, path, -1, tmp, RND_POL_OVERWRITE); } @@ -3360,6 +3360,6 @@ static void load_meta_float(const char *path, double val) { char tmp[128]; - pcb_sprintf(tmp, "%f", val); + rnd_sprintf(tmp, "%f", val); rnd_conf_set(RND_CFR_DESIGN, path, -1, tmp, RND_POL_OVERWRITE); } Index: trunk/src_plugins/io_pcb/parse_y.y =================================================================== --- trunk/src_plugins/io_pcb/parse_y.y (revision 31006) +++ trunk/src_plugins/io_pcb/parse_y.y (revision 31007) @@ -1449,7 +1449,7 @@ static void load_meta_coord(const char *path, rnd_coord_t crd) { char tmp[128]; - pcb_sprintf(tmp, "%$mm", crd); + rnd_sprintf(tmp, "%$mm", crd); rnd_conf_set(RND_CFR_DESIGN, path, -1, tmp, RND_POL_OVERWRITE); } @@ -1456,6 +1456,6 @@ static void load_meta_float(const char *path, double val) { char tmp[128]; - pcb_sprintf(tmp, "%f", val); + rnd_sprintf(tmp, "%f", val); rnd_conf_set(RND_CFR_DESIGN, path, -1, tmp, RND_POL_OVERWRITE); } Index: trunk/src_plugins/io_tedax/footprint.c =================================================================== --- trunk/src_plugins/io_tedax/footprint.c (revision 31006) +++ trunk/src_plugins/io_tedax/footprint.c (revision 31007) @@ -56,10 +56,10 @@ rnd_coord_t x[4], y[4]; pcb_sqline_to_rect((pcb_line_t *)Pad, x, y); - pcb_fprintf(f, " %.9mm %.9mm", x[0] - cx, y[0] - cy); - pcb_fprintf(f, " %.9mm %.9mm", x[1] - cx, y[1] - cy); - pcb_fprintf(f, " %.9mm %.9mm", x[2] - cx, y[2] - cy); - pcb_fprintf(f, " %.9mm %.9mm", x[3] - cx, y[3] - cy); + rnd_fprintf(f, " %.9mm %.9mm", x[0] - cx, y[0] - cy); + rnd_fprintf(f, " %.9mm %.9mm", x[1] - cx, y[1] - cy); + rnd_fprintf(f, " %.9mm %.9mm", x[2] - cx, y[2] - cy); + rnd_fprintf(f, " %.9mm %.9mm", x[3] - cx, y[3] - cy); } #define elem_layer(elem, obj) \ @@ -121,7 +121,7 @@ return 1; } if (proto->hdia > 0) - pcb_fprintf(f, " hole %s %mm %mm %mm %s\n", TERM_NAME(padstack->term), padstack->x - ox, padstack->y - oy, proto->hdia, proto->hplated ? "-" : "unplated"); + rnd_fprintf(f, " hole %s %mm %mm %mm %s\n", TERM_NAME(padstack->term), padstack->x - ox, padstack->y - oy, proto->hdia, proto->hplated ? "-" : "unplated"); tshp = pcb_pstk_get_tshape(padstack); for(n = 0, shp = tshp->shape; n < tshp->len; n++,shp++) { @@ -134,7 +134,7 @@ case PCB_PSSH_HSHADOW: break; case PCB_PSSH_CIRC: - pcb_fprintf(f, " fillcircle %s %s %s %mm %mm %mm %mm\n", lloc, ltyp, TERM_NAME(padstack->term), + rnd_fprintf(f, " fillcircle %s %s %s %mm %mm %mm %mm\n", lloc, ltyp, TERM_NAME(padstack->term), padstack->x + shp->data.circ.x - ox, padstack->y + shp->data.circ.y - oy, shp->data.circ.dia/2, clr); break; @@ -146,12 +146,12 @@ tmp.Point2.X = shp->data.line.x2 + padstack->x; tmp.Point2.Y = shp->data.line.y2 + padstack->y; tmp.Thickness = shp->data.line.thickness; - pcb_fprintf(f, " polygon %s %s %s %mm 4", lloc, ltyp, TERM_NAME(padstack->term), clr); + rnd_fprintf(f, " polygon %s %s %s %mm 4", lloc, ltyp, TERM_NAME(padstack->term), clr); print_sqpad_coords(f, &tmp, ox, oy); - pcb_fprintf(f, "\n"); + rnd_fprintf(f, "\n"); } else { - pcb_fprintf(f, " line %s %s %s %mm %mm %mm %mm %mm %mm\n", lloc, ltyp, TERM_NAME(padstack->term), + rnd_fprintf(f, " line %s %s %s %mm %mm %mm %mm %mm %mm\n", lloc, ltyp, TERM_NAME(padstack->term), shp->data.line.x1 + padstack->x - ox, shp->data.line.y1 + padstack->y - oy, shp->data.line.x2 + padstack->x - ox, shp->data.line.y2 + padstack->y - oy, shp->data.line.thickness, clr); @@ -158,13 +158,13 @@ } break; case PCB_PSSH_POLY: - pcb_fprintf(f, " polygon %s %s %s %.06mm %ld", lloc, ltyp, TERM_NAME(padstack->term), + rnd_fprintf(f, " polygon %s %s %s %.06mm %ld", lloc, ltyp, TERM_NAME(padstack->term), clr, shp->data.poly.len); for(i = 0; i < shp->data.poly.len; i++) - pcb_fprintf(f, " %.06mm %.06mm", + rnd_fprintf(f, " %.06mm %.06mm", shp->data.poly.x[i] + padstack->x - ox, shp->data.poly.y[i] + padstack->y - oy); - pcb_fprintf(f, "\n"); + rnd_fprintf(f, "\n"); break; } } @@ -200,7 +200,7 @@ PCB_LINE_LOOP(ly) { if (line->term != NULL) print_terma(&terms, line->term, line); - pcb_fprintf(f, " line %s %s %s %mm %mm %mm %mm %mm %mm\n", lloc, ltyp, TERM_NAME(line->term), + rnd_fprintf(f, " line %s %s %s %mm %mm %mm %mm %mm %mm\n", lloc, ltyp, TERM_NAME(line->term), line->Point1.X - ox, line->Point1.Y - oy, line->Point2.X - ox, line->Point2.Y - oy, line->Thickness, line->Clearance); } @@ -209,7 +209,7 @@ PCB_ARC_LOOP(ly) { if (arc->term != NULL) print_terma(&terms, arc->term, arc); - pcb_fprintf(f, " arc %s %s %s %mm %mm %mm %f %f %mm %mm\n", lloc, ltyp, TERM_NAME(arc->term), + rnd_fprintf(f, " arc %s %s %s %mm %mm %mm %f %f %mm %mm\n", lloc, ltyp, TERM_NAME(arc->term), arc->X - ox, arc->Y - oy, (arc->Width + arc->Height)/2, arc->StartAngle, arc->Delta, arc->Thickness, arc->Clearance); } @@ -242,7 +242,7 @@ } if (polygon->term != NULL) print_terma(&terms, polygon->term, polygon); - pcb_fprintf(f, " polygon %s %s %s %.06mm %ld", lloc, ltyp, TERM_NAME(polygon->term), + rnd_fprintf(f, " polygon %s %s %s %.06mm %ld", lloc, ltyp, TERM_NAME(polygon->term), (PCB_FLAG_TEST(PCB_FLAG_CLEARPOLYPOLY, polygon) ? 0 : polygon->Clearance), numpt); @@ -250,8 +250,8 @@ pcb_poly_iterate_polyarea(polygon->Clipped, &it); pcb_poly_contour(&it); for(go = pcb_poly_vect_first(&it, &x, &y); go; go = pcb_poly_vect_next(&it, &x, &y)) - pcb_fprintf(f, " %.06mm %.06mm", x - ox, y - oy); - pcb_fprintf(f, "\n"); + rnd_fprintf(f, " %.06mm %.06mm", x - ox, y - oy); + rnd_fprintf(f, "\n"); } PCB_END_LOOP; } Index: trunk/src_plugins/io_tedax/stackup.c =================================================================== --- trunk/src_plugins/io_tedax/stackup.c (revision 31006) +++ trunk/src_plugins/io_tedax/stackup.c (revision 31007) @@ -156,7 +156,7 @@ save_prop(pcb, f, name, "fab-color", fab_color); } else { - char *title = pcb_strdup_printf("Unsupported group fab-color: %s", grp->name); + char *title = rnd_strdup_printf("Unsupported group fab-color: %s", grp->name); pcb_io_incompat_save(pcb->Data, NULL, "stackup", title, "Only outer layer groups should have fab-color."); free(title); } @@ -166,7 +166,7 @@ save_prop(pcb, f, name, "dielect", dielect); } else { - char *title = pcb_strdup_printf("Unsupported group dielect: %s", grp->name); + char *title = rnd_strdup_printf("Unsupported group dielect: %s", grp->name); pcb_io_incompat_save(pcb->Data, NULL, "stackup", title, "Group type should not have dielect constant - only substrate layers should."); free(title); } @@ -176,7 +176,7 @@ save_prop(pcb, f, name, "material", mat); } else { - char *title = pcb_strdup_printf("Unsupported group material: %s", grp->name); + char *title = rnd_strdup_printf("Unsupported group material: %s", grp->name); pcb_io_incompat_save(pcb->Data, NULL, "stackup", title, "Group type should not have a material - only substrate layers should."); free(title); } @@ -188,17 +188,17 @@ double th = rnd_get_value(thick, NULL, NULL, &succ); if (succ) { char tmp[64]; - pcb_sprintf(tmp, "%mu", (rnd_coord_t)th); + rnd_sprintf(tmp, "%mu", (rnd_coord_t)th); save_prop(pcb, f, name, "thickness", tmp); } else { - char *title = pcb_strdup_printf("Invalid thickness value: %s", grp->name); + char *title = rnd_strdup_printf("Invalid thickness value: %s", grp->name); pcb_io_incompat_save(pcb->Data, NULL, "stackup", title, "Thicnkess value must be a numeric with an unit suffix, e.g. 0.7mm"); free(title); } } else { - char *title = pcb_strdup_printf("Unsupported group thickness: %s", grp->name); + char *title = rnd_strdup_printf("Unsupported group thickness: %s", grp->name); pcb_io_incompat_save(pcb->Data, NULL, "stackup", title, "Group type should not have a thickness - only substrate and copper layers should."); free(title); } @@ -233,7 +233,7 @@ else if (grp->ltype & PCB_LYT_VIRTUAL) *lloc = "virtual"; else if ((grp->ltype & PCB_LYT_ANYWHERE) == 0) *lloc = "all"; else { - char *title = pcb_strdup_printf("Unsupported group loc: %s", grp->name); + char *title = rnd_strdup_printf("Unsupported group loc: %s", grp->name); pcb_io_incompat_save(pcb->Data, NULL, "stackup", title, "The group is omitted from the output."); free(title); continue; @@ -291,7 +291,7 @@ const tedax_layer_t *lt = tedax_layer_lookup_by_type(pcb, grp, &lloc); if (lt == NULL) { - char *title = pcb_strdup_printf("Unsupported group: %s", grp->name); + char *title = rnd_strdup_printf("Unsupported group: %s", grp->name); pcb_io_incompat_save(pcb->Data, NULL, "stackup", title, "Layer type/purpose/location is not supported by tEDAx, layer will be omitted from the save."); free(title); continue; @@ -304,7 +304,7 @@ } if (grp->len > 1) { - char *title = pcb_strdup_printf("Multilayer group: %s", grp->name); + char *title = rnd_strdup_printf("Multilayer group: %s", grp->name); pcb_io_incompat_save(pcb->Data, NULL, "stackup", title, "All layers are merged into a single layer"); free(title); } Index: trunk/src_plugins/io_tedax/tboard.c =================================================================== --- trunk/src_plugins/io_tedax/tboard.c (revision 31006) +++ trunk/src_plugins/io_tedax/tboard.c (revision 31007) @@ -52,10 +52,10 @@ #include "tnetlist.h" #define ps2fpname(fpname, padstack) \ - pcb_snprintf(fpname, sizeof(fpname), "ps_glob_%ld%s", padstack->protoi, (!!padstack->smirror) != (!!padstack->xmirror) ? "m" : "") + rnd_snprintf(fpname, sizeof(fpname), "ps_glob_%ld%s", padstack->protoi, (!!padstack->smirror) != (!!padstack->xmirror) ? "m" : "") #define subc2fpname(fpname, subc) \ - pcb_snprintf(fpname, sizeof(fpname), "sc_glob_%ld", subc->ID) + rnd_snprintf(fpname, sizeof(fpname), "sc_glob_%ld", subc->ID) static int tedax_global_pstk_fwrite(pcb_board_t *pcb, FILE *f) { @@ -149,22 +149,22 @@ fprintf(f, "\nbegin board v1 "); tedax_fprint_escape(f, pcb->hidlib.name); fputc('\n', f); - pcb_fprintf(f, " drawing_area 0 0 %.06mm %.06mm\n", pcb->hidlib.size_x, pcb->hidlib.size_y); + rnd_fprintf(f, " drawing_area 0 0 %.06mm %.06mm\n", pcb->hidlib.size_x, pcb->hidlib.size_y); for(n = 0, a = pcb->Attributes.List; n < pcb->Attributes.Number; n++,a++) { - pcb_fprintf(f, " attr "); + rnd_fprintf(f, " attr "); tedax_fprint_escape(f, a->name); fputc(' ', f); tedax_fprint_escape(f, a->value); fputc('\n', f); } - pcb_fprintf(f, " stackup %s\n", stackupid); - pcb_fprintf(f, " netlist %s\n", netlistid); - pcb_fprintf(f, " drc %s\n", drcid); + rnd_fprintf(f, " stackup %s\n", stackupid); + rnd_fprintf(f, " netlist %s\n", netlistid); + rnd_fprintf(f, " drc %s\n", drcid); PCB_PADSTACK_LOOP(pcb->Data) { char fpname[256]; ps2fpname(fpname, padstack); - pcb_fprintf(f, " place %ld %s %.06mm %.06mm %f %d via\n", padstack->ID, fpname, padstack->x, padstack->y, padstack->rot, !!padstack->smirror); + rnd_fprintf(f, " place %ld %s %.06mm %.06mm %f %d via\n", padstack->ID, fpname, padstack->x, padstack->y, padstack->rot, !!padstack->smirror); } PCB_END_LOOP; @@ -193,7 +193,7 @@ subc2fpname(fpname, proto); pcb_subc_get_host_trans(subc, &tr, 0); - pcb_fprintf(f, " place %s %s %.06mm %.06mm %f %d comp\n", refdes, fpname, tr.ox, tr.oy, tr.rot, tr.on_bottom); + rnd_fprintf(f, " place %s %s %.06mm %.06mm %f %d comp\n", refdes, fpname, tr.ox, tr.oy, tr.rot, tr.on_bottom); /* placement text */ PCB_TEXT_ALL_LOOP(subc->data) { @@ -203,7 +203,7 @@ const char **lyname = (const char **)vtp0_get(&ctx.g2n, rl->meta.real.grp, 0); if (lyname != NULL) { gds_t tmp; - pcb_fprintf(f, " place_text %s %s %.06mm %.06mm %.06mm %.06mm %d %f ", + rnd_fprintf(f, " place_text %s %s %.06mm %.06mm %.06mm %.06mm %d %f ", refdes, *lyname, text->bbox_naked.X1, text->bbox_naked.Y1, text->bbox_naked.X2, text->bbox_naked.Y2, text->Scale, text->rot); gds_init(&tmp); @@ -220,12 +220,12 @@ /* placement attributes */ for(n = 0, a = subc->Attributes.List; n < subc->Attributes.Number; n++,a++) { if ((strcmp(a->name, "footprint") == 0) || (strcmp(a->name, "value") == 0)) { - pcb_fprintf(f, " place_fattr %s %s ", refdes, a->name); + rnd_fprintf(f, " place_fattr %s %s ", refdes, a->name); tedax_fprint_escape(f, a->value); fputc('\n', f); } else { - pcb_fprintf(f, " place_attr %s ", refdes); + rnd_fprintf(f, " place_attr %s ", refdes); tedax_fprint_escape(f, a->name); fputc(' ', f); tedax_fprint_escape(f, a->value); Index: trunk/src_plugins/io_tedax/tdrc.c =================================================================== --- trunk/src_plugins/io_tedax/tdrc.c (revision 31006) +++ trunk/src_plugins/io_tedax/tdrc.c (revision 31007) @@ -65,7 +65,7 @@ rnd_conf_native_t *nat = rnd_conf_get_field(r->conf); if ((nat == NULL) || (nat->prop->src == NULL)) continue; - pcb_fprintf(f, " rule all %s %s %.06mm pcb_rnd_old_drc_from_conf\n", r->ttype, r->tkind, nat->val.coord[0]); + rnd_fprintf(f, " rule all %s %s %.06mm pcb_rnd_old_drc_from_conf\n", r->ttype, r->tkind, nat->val.coord[0]); } fprintf(f, "end drc\n"); Index: trunk/src_plugins/io_tedax/tetest.c =================================================================== --- trunk/src_plugins/io_tedax/tetest.c (revision 31006) +++ trunk/src_plugins/io_tedax/tetest.c (revision 31007) @@ -113,9 +113,9 @@ fprintf(f, " "); tedax_fprint_escape(f, term == NULL ? "-" : term); - pcb_fprintf(f, " %.06mm %.06mm %s round %.06mm %.06mm 0 ", ps->x + shx, ps->y + shy, sides(copper), dia, dia); + rnd_fprintf(f, " %.06mm %.06mm %s round %.06mm %.06mm 0 ", ps->x + shx, ps->y + shy, sides(copper), dia, dia); if (proto->hdia > 0) - pcb_fprintf(f, "%s %.06mm ", proto->hplated ? "plated" : "unplated", proto->hdia); + rnd_fprintf(f, "%s %.06mm ", proto->hplated ? "plated" : "unplated", proto->hdia); else fprintf(f, "- - "); Index: trunk/src_plugins/io_tedax/tlayer.c =================================================================== --- trunk/src_plugins/io_tedax/tlayer.c (revision 31006) +++ trunk/src_plugins/io_tedax/tlayer.c (revision 31007) @@ -76,7 +76,7 @@ fprintf(f, "begin polyline v1 pllay_%ld_%ld_%ld\n", gid, polygon->ID, plid); n = pl->Count; for(v = pl->head, i = 0; i < n; v = v->next, i++) - pcb_fprintf(f, " v %.06mm %.06mm\n", v->point[0], v->point[1]); + rnd_fprintf(f, " v %.06mm %.06mm\n", v->point[0], v->point[1]); fprintf(f, "end polyline\n"); } } PCB_END_LOOP; @@ -88,7 +88,7 @@ if (ly == NULL) continue; PCB_LINE_LOOP(ly) { - pcb_fprintf(f, " line %.06mm %.06mm %.06mm %.06mm %.06mm %.06mm\n", + rnd_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) ? rnd_round(line->Clearance/2) : 0); } PCB_END_LOOP; @@ -102,12 +102,12 @@ pcb_arc_get_end(arc, 1, &ex, &ey); 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 ", + rnd_fprintf(f, " arc %.06mm %.06mm %.06mm %f %f %.06mm %.06mm ", arc->X, arc->Y, arc->Width, arc->StartAngle, arc->Delta, arc->Thickness, clr); - pcb_fprintf(f, "%.06mm %.06mm %.06mm %.06mm\n", sx, sy, ex, ey); + rnd_fprintf(f, "%.06mm %.06mm %.06mm %.06mm\n", sx, sy, ex, ey); } PCB_END_LOOP; PCB_TEXT_LOOP(ly) { - pcb_fprintf(f, " text %.06mm %.06mm %.06mm %.06mm %d %f %.06mm ", + rnd_fprintf(f, " text %.06mm %.06mm %.06mm %.06mm %d %f %.06mm ", text->bbox_naked.X1, text->bbox_naked.Y1, text->bbox_naked.X2, text->bbox_naked.Y2, text->Scale, text->rot, PCB_FLAG_TEST(PCB_FLAG_CLEARLINE, text) ? 1 : 0); tedax_fprint_escape(f, text->TextString); @@ -116,7 +116,7 @@ PCB_POLY_LOOP(ly) { for(pl = polygon->NoHoles, plid = 0; pl != NULL; pl = pl->next, plid++) - pcb_fprintf(f, " poly pllay_%ld_%ld_%ld 0 0\n", gid, polygon->ID, plid); + rnd_fprintf(f, " poly pllay_%ld_%ld_%ld 0 0\n", gid, polygon->ID, plid); } PCB_END_LOOP; } Index: trunk/src_plugins/io_tedax/tnetlist.c =================================================================== --- trunk/src_plugins/io_tedax/tnetlist.c (revision 31006) +++ trunk/src_plugins/io_tedax/tnetlist.c (revision 31007) @@ -214,7 +214,7 @@ fputc('\n', f); continue; } - pcb_fprintf(f, " comptag %s ", subc->refdes); + rnd_fprintf(f, " comptag %s ", subc->refdes); tedax_fprint_escape(f, a->name); fputc(' ', f); tedax_fprint_escape(f, a->value); Index: trunk/src_plugins/jostle/jostle.c =================================================================== --- trunk/src_plugins/jostle/jostle.c (revision 31006) +++ trunk/src_plugins/jostle/jostle.c (revision 31007) @@ -356,13 +356,13 @@ p[0] = line->Point1.X; p[1] = line->Point1.Y; if (pcb_poly_contour_inside(info->brush->contours, p)) { - pcb_fprintf(stderr, "\tinside1 %ms,%ms\n", p[0], p[1]); + rnd_fprintf(stderr, "\tinside1 %ms,%ms\n", p[0], p[1]); inside++; } p[0] = line->Point2.X; p[1] = line->Point2.Y; if (pcb_poly_contour_inside(info->brush->contours, p)) { - pcb_fprintf(stderr, "\tinside2 %ms,%ms\n", p[0], p[1]); + rnd_fprintf(stderr, "\tinside2 %ms,%ms\n", p[0], p[1]); inside++; } lp = pcb_poly_from_pcb_line(line, line->Thickness); @@ -387,7 +387,7 @@ return 0; r = pcb_polyarea_boolean_free(copy, lp, &tmp, PCB_PBO_SUB); if (r != pcb_err_ok) { - pcb_fprintf(stderr, "Error while jostling PCB_PBO_SUB: %d\n", r); + rnd_fprintf(stderr, "Error while jostling PCB_PBO_SUB: %d\n", r); return 0; } if (tmp == tmp->f) { @@ -394,7 +394,7 @@ /* it didn't slice, must have glanced. intersect instead * to get the glancing sliver?? */ - pcb_fprintf(stderr, "try isect??\n"); + rnd_fprintf(stderr, "try isect??\n"); lp = pcb_poly_from_pcb_line(line, line->Thickness); r = pcb_polyarea_boolean_free(tmp, lp, &tmp, PCB_PBO_ISECT); if (r != pcb_err_ok) { @@ -409,7 +409,7 @@ n = tmp; small = big = tmp->contours->area; do { - pcb_fprintf(stderr, "\t\tarea %g, %ms,%ms %ms,%ms\n", n->contours->area, n->contours->xmin, n->contours->ymin, + rnd_fprintf(stderr, "\t\tarea %g, %ms,%ms %ms,%ms\n", n->contours->area, n->contours->xmin, n->contours->ymin, n->contours->xmax, n->contours->ymax); if (n->contours->area <= small) { smallest = n; @@ -451,9 +451,9 @@ side = JSOUTHEAST; } } - pcb_fprintf(stderr, "\t%s\n", dirnames[side]); + rnd_fprintf(stderr, "\t%s\n", dirnames[side]); if (info->line == NULL || (!nocentroid && (big - small) < info->centroid)) { - pcb_fprintf(stderr, "\tkeep it!\n"); + rnd_fprintf(stderr, "\tkeep it!\n"); if (info->smallest) { pcb_polyarea_free(&info->smallest); } @@ -491,7 +491,7 @@ do { info.box = pcb_polyarea_t_boundingBox(info.brush); Debugpcb_polyarea_t(info.brush, NULL); - pcb_fprintf(stderr, "search (%ms,%ms)->(%ms,%ms):\n", info.box.X1, info.box.Y1, info.box.X2, info.box.Y2); + rnd_fprintf(stderr, "search (%ms,%ms)->(%ms,%ms):\n", info.box.X1, info.box.Y1, info.box.X2, info.box.Y2); info.line = NULL; info.smallest = NULL; pcb_r_search(info.layer->line_tree, &info.box, NULL, jostle_callback, &info, &found); Index: trunk/src_plugins/lib_gtk_common/dlg_topwin.c =================================================================== --- trunk/src_plugins/lib_gtk_common/dlg_topwin.c (revision 31006) +++ trunk/src_plugins/lib_gtk_common/dlg_topwin.c (revision 31007) @@ -313,7 +313,7 @@ gtk_button_set_image(GTK_BUTTON(button), image); - css_descr = pcb_strdup_printf(".%s {min-width:0; min-height:0;}\n", css_class); + css_descr = rnd_strdup_printf(".%s {min-width:0; min-height:0;}\n", css_class); gtkc_widget_add_class_style(button, css_class, css_descr); free(css_descr); Index: trunk/src_plugins/lib_gtk_common/wt_preview.c =================================================================== --- trunk/src_plugins/lib_gtk_common/wt_preview.c (revision 31006) +++ trunk/src_plugins/lib_gtk_common/wt_preview.c (revision 31007) @@ -275,7 +275,7 @@ prv->expose_data.view.X2 = prv->view.x0 + prv->view.width; prv->expose_data.view.Y2 = prv->view.y0 + prv->view.height; -/* pcb_printf("EXPOSE_DATA: %$mm %$mm - %$mm %$mm (%f %$mm)\n", +/* rnd_printf("EXPOSE_DATA: %$mm %$mm - %$mm %$mm (%f %$mm)\n", prv->expose_data.view.X1, prv->expose_data.view.Y1, prv->expose_data.view.X2, prv->expose_data.view.Y2, prv->view.coord_per_px, prv->view.x0);*/ @@ -324,7 +324,7 @@ switch (btn) { case RND_MB_LEFT: if (preview->mouse_cb != NULL) { -/* pcb_printf("bp %mm %mm\n", cx, cy); */ +/* rnd_printf("bp %mm %mm\n", cx, cy); */ if (preview->mouse_cb(w, draw_data, RND_HID_MOUSE_PRESS, cx, cy)) gtk_widget_queue_draw(w); } @@ -416,7 +416,7 @@ break; case RND_MB_LEFT: if (preview->mouse_cb != NULL) { -/* pcb_printf("br %mm %mm\n", cx, cy); */ +/* rnd_printf("br %mm %mm\n", cx, cy); */ if (preview->mouse_cb(w, draw_data, RND_HID_MOUSE_RELEASE, cx, cy)) gtk_widget_queue_draw(w); } Index: trunk/src_plugins/lib_hid_common/dlg_comm_m.c =================================================================== --- trunk/src_plugins/lib_hid_common/dlg_comm_m.c (revision 31006) +++ trunk/src_plugins/lib_hid_common/dlg_comm_m.c (revision 31007) @@ -212,7 +212,7 @@ } res->type = FGW_STR | FGW_DYN; - res->val.str = pcb_strdup_printf("#%02x%02x%02x", ctx.clr.r, ctx.clr.g, ctx.clr.b); + res->val.str = rnd_strdup_printf("#%02x%02x%02x", ctx.clr.r, ctx.clr.g, ctx.clr.b); RND_DAD_FREE(ctx.dlg); return 0; } Index: trunk/src_plugins/lib_hid_pcbui/layer_menu.c =================================================================== --- trunk/src_plugins/lib_hid_pcbui/layer_menu.c (revision 31006) +++ trunk/src_plugins/lib_hid_pcbui/layer_menu.c (revision 31007) @@ -82,12 +82,12 @@ sprintf(act, "ToggleView(ui:%d)", idx); sprintf(chk, "ChkView(ui:%d)", idx); - pcb_snprintf(end, len_avail, " %s", ly->name); + rnd_snprintf(end, len_avail, " %s", ly->name); rnd_gui->create_menu(rnd_gui, path, &props); } props.checked = NULL; - pcb_snprintf(end, len_avail, "[UI]"); + rnd_snprintf(end, len_avail, "[UI]"); rnd_gui->create_menu(rnd_gui, path, &props); } @@ -106,12 +106,12 @@ sprintf(act, "SelectLayer(%s)", ml->abbrev); sprintf(chk, "ChkLayer(%s)", ml->abbrev); } - pcb_snprintf(end, len_avail, " %s", ml->name); + rnd_snprintf(end, len_avail, " %s", ml->name); rnd_gui->create_menu(rnd_gui, path, &props); } props.checked = NULL; - pcb_snprintf(end, len_avail, "[virtual]"); + rnd_snprintf(end, len_avail, "[virtual]"); rnd_gui->create_menu(rnd_gui, path, &props); @@ -118,7 +118,7 @@ /* have to go reverse to keep order because this will insert items */ for(sect = 0; sect < 2; sect++) { - pcb_snprintf(end, len_avail, "-"); + rnd_snprintf(end, len_avail, "-"); props.foreground = NULL; props.background = NULL; props.checked = NULL; @@ -152,7 +152,7 @@ sprintf(act, "SelectLayer(%ld)", lid+1); sprintf(chk, "ChkLayer(%ld)", lid+1); } - pcb_snprintf(end, len_avail, " %s", l->name); + rnd_snprintf(end, len_avail, " %s", l->name); rnd_gui->create_menu(rnd_gui, path, &props); } @@ -159,7 +159,7 @@ props.foreground = NULL; props.background = NULL; props.checked = NULL; - pcb_snprintf(end, len_avail, "[%s]", g->name); + rnd_snprintf(end, len_avail, "[%s]", g->name); rnd_gui->create_menu(rnd_gui, path, &props); } } @@ -174,7 +174,7 @@ char *key = rnd_attribute_get(&l->Attributes, attrname); if (key != NULL) { keyprops->accel = key; - pcb_snprintf(end, len_avail, "%s %ld:%s", menu_prefix, lid+1, l->name); + rnd_snprintf(end, len_avail, "%s %ld:%s", menu_prefix, lid+1, l->name); sprintf((char *)keyprops->action, "%s(%ld)", action_prefix, lid+1); rnd_gui->create_menu(rnd_gui, path, keyprops); } Index: trunk/src_plugins/lib_hid_pcbui/layersel.c =================================================================== --- trunk/src_plugins/lib_hid_pcbui/layersel.c (revision 31006) +++ trunk/src_plugins/lib_hid_pcbui/layersel.c (revision 31007) @@ -459,11 +459,11 @@ char *p; unsigned int w, line = 0, n; - pcb_snprintf(dst->buf[line++], 20, "%d %d 4 1", width, height); + rnd_snprintf(dst->buf[line++], 20, "%d %d 4 1", width, height); strcpy(dst->buf[line++], ". c None"); strcpy(dst->buf[line++], "u c None"); strcpy(dst->buf[line++], "b c #000000"); - pcb_snprintf(dst->buf[line++], 20, "c c #%02X%02X%02X", color->r, color->g, color->b); + rnd_snprintf(dst->buf[line++], 20, "c c #%02X%02X%02X", color->r, color->g, color->b); while (height--) { w = width; Index: trunk/src_plugins/lib_hid_pcbui/status.c =================================================================== --- trunk/src_plugins/lib_hid_pcbui/status.c (revision 31006) +++ trunk/src_plugins/lib_hid_pcbui/status.c (revision 31007) @@ -77,7 +77,7 @@ *kbd = '\0'; - pcb_append_printf(&status.buf, + rnd_append_printf(&status.buf, "%m+view=%s " "grid=%$mS " "line=%mS (%s%s) " @@ -90,7 +90,7 @@ static void build_st_line2(void) { - pcb_append_printf(&status.buf, + rnd_append_printf(&status.buf, "via=%mS (%mS) " "clr=%mS " "text=%d%% %$mS " @@ -116,7 +116,7 @@ else unit_inv = unit_mm; - pcb_append_printf(&status.buf, + rnd_append_printf(&status.buf, "%m+" "grid=%$mS " "line=%mS " @@ -173,12 +173,12 @@ /* coordinate readout (right side box) */ if (conf_core.appearance.compact) { status.buf.used = 0; - pcb_append_printf(&status.buf, "%m+%-mS", rnd_conf.editor.grid_unit->allow, pcb_crosshair.X); + rnd_append_printf(&status.buf, "%m+%-mS", rnd_conf.editor.grid_unit->allow, pcb_crosshair.X); hv.str = status.buf.array; rnd_gui->attr_dlg_set_value(status.rdsub.dlg_hid_ctx, status.wrd2[0], &hv); status.buf.used = 0; - pcb_append_printf(&status.buf, "%m+%-mS", rnd_conf.editor.grid_unit->allow, pcb_crosshair.Y); + rnd_append_printf(&status.buf, "%m+%-mS", rnd_conf.editor.grid_unit->allow, pcb_crosshair.Y); hv.str = status.buf.array; rnd_gui->attr_dlg_set_value(status.rdsub.dlg_hid_ctx, status.wrd2[1], &hv); rnd_gui->attr_dlg_widget_hide(status.rdsub.dlg_hid_ctx, status.wrd2[1], 0); @@ -185,7 +185,7 @@ } else { status.buf.used = 0; - pcb_append_printf(&status.buf, "%m+%-mS %-mS", rnd_conf.editor.grid_unit->allow, pcb_crosshair.X, pcb_crosshair.Y); + rnd_append_printf(&status.buf, "%m+%-mS %-mS", rnd_conf.editor.grid_unit->allow, pcb_crosshair.X, pcb_crosshair.Y); hv.str = status.buf.array; rnd_gui->attr_dlg_set_value(status.rdsub.dlg_hid_ctx, status.wrd2[0], &hv); rnd_gui->attr_dlg_widget_hide(status.rdsub.dlg_hid_ctx, status.wrd2[1], 1); @@ -202,14 +202,14 @@ double a = atan2(dy, dx) * RND_RAD_TO_DEG; s1 = status.buf.array; - pcb_append_printf(&status.buf, "%m+r %-mS%c", rnd_conf.editor.grid_unit->allow, r, sep); + rnd_append_printf(&status.buf, "%m+r %-mS%c", rnd_conf.editor.grid_unit->allow, r, sep); s2 = status.buf.array + status.buf.used; - pcb_append_printf(&status.buf, "phi %-.1f%c", a, sep); + rnd_append_printf(&status.buf, "phi %-.1f%c", a, sep); s3 = status.buf.array + status.buf.used; - pcb_append_printf(&status.buf, "%m+ %-mS %-mS", rnd_conf.editor.grid_unit->allow, dx, dy); + rnd_append_printf(&status.buf, "%m+ %-mS %-mS", rnd_conf.editor.grid_unit->allow, dx, dy); } else { - pcb_append_printf(&status.buf, "r __.__%cphi __._%c__.__ __.__", sep, sep, sep); + rnd_append_printf(&status.buf, "r __.__%cphi __._%c__.__ __.__", sep, sep, sep); s1 = status.buf.array; s2 = status.buf.array + 8; s3 = status.buf.array + 17; Index: trunk/src_plugins/lib_hid_pcbui/title.c =================================================================== --- trunk/src_plugins/lib_hid_pcbui/title.c (revision 31006) +++ trunk/src_plugins/lib_hid_pcbui/title.c (revision 31007) @@ -52,7 +52,7 @@ filename = PCB->hidlib.filename; title_buf.used = 0; - pcb_append_printf(&title_buf, "%s%s (%s) - %s - pcb-rnd", PCB->Changed ? "*" : "", name, filename, PCB->is_footprint ? "footprint" : "board"); + rnd_append_printf(&title_buf, "%s%s (%s) - %s - pcb-rnd", PCB->Changed ? "*" : "", name, filename, PCB->is_footprint ? "footprint" : "board"); rnd_gui->set_top_title(rnd_gui, title_buf.array); } Index: trunk/src_plugins/lib_netmap/netmap.c =================================================================== --- trunk/src_plugins/lib_netmap/netmap.c (revision 31006) +++ trunk/src_plugins/lib_netmap/netmap.c (revision 31007) @@ -41,7 +41,7 @@ dyn_net_t *dn = calloc(sizeof(dyn_net_t), 1); dn->next = map->dyn_nets; map->dyn_nets = dn; - dn->net.name = pcb_strdup_printf("netmap_anon_%d", map->anon_cnt++); + dn->net.name = rnd_strdup_printf("netmap_anon_%d", map->anon_cnt++); return &dn->net; } Index: trunk/src_plugins/lib_polyhelp/polyhelp.c =================================================================== --- trunk/src_plugins/lib_polyhelp/polyhelp.c (revision 31006) +++ trunk/src_plugins/lib_polyhelp/polyhelp.c (revision 31007) @@ -57,7 +57,7 @@ v = pl->head; do { n = v->next; - pcb_fprintf(f, "line %#mm %#mm %#mm %#mm\n", v->point[0], v->point[1], n->point[0], n->point[1]); + rnd_fprintf(f, "line %#mm %#mm %#mm %#mm\n", v->point[0], v->point[1], n->point[0], n->point[1]); } while((v = v->next) != pl->head); fprintf(f, "!pline end\n"); @@ -68,8 +68,8 @@ static void cross(FILE *f, rnd_coord_t x, rnd_coord_t y) { static rnd_coord_t cs = PCB_MM_TO_COORD(0.2); - pcb_fprintf(f, "line %#mm %#mm %#mm %#mm\n", x - cs, y, x + cs, y); - pcb_fprintf(f, "line %#mm %#mm %#mm %#mm\n", x, y - cs, x, y + cs); + rnd_fprintf(f, "line %#mm %#mm %#mm %#mm\n", x - cs, y, x + cs, y); + rnd_fprintf(f, "line %#mm %#mm %#mm %#mm\n", x, y - cs, x, y + cs); } #endif Index: trunk/src_plugins/lib_vfs/lib_vfs.c =================================================================== --- trunk/src_plugins/lib_vfs/lib_vfs.c (revision 31006) +++ trunk/src_plugins/lib_vfs/lib_vfs.c (revision 31007) @@ -176,7 +176,7 @@ SEE; orig_used = path->used; - pcb_append_printf(path, "/%s/%ld", pcb_obj_type_name(obj->type), obj->ID); + rnd_append_printf(path, "/%s/%ld", pcb_obj_type_name(obj->type), obj->ID); cb(ctx, path->array, 1); gds_append(path, '/'); ou = path->used; @@ -239,7 +239,7 @@ pcb_propedit_t pctx; path.used = orig_used; - pcb_append_printf(&path, "%ld", lid); + rnd_append_printf(&path, "%ld", lid); cb(ctx, path.array, 1); cb_mkdir(cb, ctx, &path, "/line"); @@ -295,7 +295,7 @@ path.used = orig_used; - pcb_append_printf(&path, "%ld/data", subc->ID); + rnd_append_printf(&path, "%ld/data", subc->ID); cb(ctx, path.array, 1); vfs_list_layers(pcb, cb, ctx, path.array, subc->data); } @@ -438,7 +438,7 @@ pcb_propedit_t pctx; path.used = orig_used; - pcb_append_printf(&path, "%ld", gid); + rnd_append_printf(&path, "%ld", gid); cb(ctx, path.array, 1); pcb_props_init(&pctx, pcb); @@ -501,7 +501,7 @@ int res; va_start(ap, fmt); - res = pcb_safe_append_vprintf(buff, 0, fmt, ap); + res = rnd_safe_append_vprintf(buff, 0, fmt, ap); va_end(ap); return res; } Index: trunk/src_plugins/lib_wget/lib_wget.c =================================================================== --- trunk/src_plugins/lib_wget/lib_wget.c (revision 31006) +++ trunk/src_plugins/lib_wget/lib_wget.c (revision 31007) @@ -40,7 +40,7 @@ gds_t tmp; gds_init(&tmp); - pcb_append_printf(&tmp, "%s -O '%s'", wget_cmd, ofn); + rnd_append_printf(&tmp, "%s -O '%s'", wget_cmd, ofn); if (update) gds_append_str(&tmp, " -c"); Index: trunk/src_plugins/loghid/hid-logger.c =================================================================== --- trunk/src_plugins/loghid/hid-logger.c (revision 31006) +++ trunk/src_plugins/loghid/hid-logger.c (revision 31007) @@ -19,69 +19,69 @@ { rnd_export_opt_t *result = delegatee_->get_export_options(hid, ret); if (ret != NULL) - pcb_fprintf(out_, "get_export_options(ret) -> ret=%d\n", *ret); + rnd_fprintf(out_, "get_export_options(ret) -> ret=%d\n", *ret); else - pcb_fprintf(out_, "get_export_options(ret) -> ret=n/a\n"); + rnd_fprintf(out_, "get_export_options(ret) -> ret=n/a\n"); return result; } static void log_do_exit(rnd_hid_t *hid) { - pcb_fprintf(out_, "do_exit()\n"); + rnd_fprintf(out_, "do_exit()\n"); delegatee_->do_exit(delegatee_); } static int log_parse_arguments(rnd_hid_t *hid, int *argc, char ***argv) { - pcb_fprintf(out_, "parse_arguments()\n"); + rnd_fprintf(out_, "parse_arguments()\n"); return delegatee_->parse_arguments(delegatee_, argc, argv); } static void log_invalidate_lr(rnd_hid_t *hid, rnd_coord_t left, rnd_coord_t right, rnd_coord_t top, rnd_coord_t bottom) { - pcb_fprintf(out_, "invalidate_lr(%mm, %mm, %mm, %mm)\n", left, right, top, bottom); + rnd_fprintf(out_, "invalidate_lr(%mm, %mm, %mm, %mm)\n", left, right, top, bottom); delegatee_->invalidate_lr(hid, left, right, top, bottom); } static void log_invalidate_all(rnd_hid_t *hid) { - pcb_fprintf(out_, "invalidate_all()\n"); + rnd_fprintf(out_, "invalidate_all()\n"); delegatee_->invalidate_all(hid); } static void log_notify_crosshair_change(rnd_hid_t *hid, rnd_bool changes_complete) { - pcb_fprintf(out_, "rnd_hid_notify_crosshair_change(%s)\n", changes_complete ? "true" : "false"); + rnd_fprintf(out_, "rnd_hid_notify_crosshair_change(%s)\n", changes_complete ? "true" : "false"); delegatee_->notify_crosshair_change(hid, changes_complete); } static void log_notify_mark_change(rnd_hid_t *hid, rnd_bool changes_complete) { - pcb_fprintf(out_, "pcb_notify_mark_change(%s)\n", changes_complete ? "true" : "false"); + rnd_fprintf(out_, "pcb_notify_mark_change(%s)\n", changes_complete ? "true" : "false"); delegatee_->notify_mark_change(hid, changes_complete); } static int log_set_layer_group(rnd_hid_t *hid, rnd_layergrp_id_t group, const char *purpose, int purpi, rnd_layer_id_t layer, unsigned int flags, int is_empty, rnd_xform_t **xform) { - pcb_fprintf(out_, "set_layer(group=%ld, layer=%ld, flags=%lx, empty=%s, xform=%p)\n", group, layer, flags, is_empty ? "true" : "false", xform); + rnd_fprintf(out_, "set_layer(group=%ld, layer=%ld, flags=%lx, empty=%s, xform=%p)\n", group, layer, flags, is_empty ? "true" : "false", xform); return delegatee_->set_layer_group(hid, group, purpose, purpi, layer, flags, is_empty, xform); } static void log_end_layer(rnd_hid_t *hid) { - pcb_fprintf(out_, "end_layer()\n"); + rnd_fprintf(out_, "end_layer()\n"); delegatee_->end_layer(hid); } static rnd_hid_gc_t log_make_gc(rnd_hid_t *hid) { - pcb_fprintf(out_, "make_gc()\n"); + rnd_fprintf(out_, "make_gc()\n"); return delegatee_->make_gc(hid); } static void log_destroy_gc(rnd_hid_gc_t gc) { - pcb_fprintf(out_, "destroy_gc()\n"); + rnd_fprintf(out_, "destroy_gc()\n"); delegatee_->destroy_gc(gc); } @@ -88,15 +88,15 @@ static void log_set_drawing_mode(rnd_hid_t *hid, rnd_composite_op_t op, rnd_bool direct, const rnd_rnd_box_t *screen) { if (screen != NULL) - pcb_fprintf(out_, "set_drawing_mode(%d,%d,[%mm;%mm,%mm;%mm])\n", op, direct, screen->X1, screen->Y1, screen->X2, screen->Y2); + rnd_fprintf(out_, "set_drawing_mode(%d,%d,[%mm;%mm,%mm;%mm])\n", op, direct, screen->X1, screen->Y1, screen->X2, screen->Y2); else - pcb_fprintf(out_, "set_drawing_mode(%d,%d,[NULL-screen])\n", op, direct); + rnd_fprintf(out_, "set_drawing_mode(%d,%d,[NULL-screen])\n", op, direct); delegatee_->set_drawing_mode(hid, op, direct, screen); } static void log_render_burst(rnd_hid_t *hid, rnd_burst_op_t op, const rnd_rnd_box_t *screen) { - pcb_fprintf(out_, "render_burst(%d,[%mm;%mm,%mm;%mm])\n", op, screen->X1, screen->Y1, screen->X2, screen->Y2); + rnd_fprintf(out_, "render_burst(%d,[%mm;%mm,%mm;%mm])\n", op, screen->X1, screen->Y1, screen->X2, screen->Y2); delegatee_->render_burst(hid, op, screen); rnd_gui->coord_per_pix = delegatee_->coord_per_pix; } @@ -104,7 +104,7 @@ static void log_set_color(rnd_hid_gc_t gc, const rnd_color_t *color) { - pcb_fprintf(out_, "set_color(gc, %s)\n", color->str); + rnd_fprintf(out_, "set_color(gc, %s)\n", color->str); delegatee_->set_color(gc, color); } @@ -116,37 +116,37 @@ ENUM_LOG_TEXT(rnd_cap_round); ENUM_LOG_TEXT(rnd_cap_invalid); } - pcb_fprintf(out_, "set_line_cap(gc, %s)\n", txt); + rnd_fprintf(out_, "set_line_cap(gc, %s)\n", txt); delegatee_->set_line_cap(gc, style); } static void log_set_line_width(rnd_hid_gc_t gc, rnd_coord_t width) { - pcb_fprintf(out_, "set_line_width(gc, %d)\n", width); + rnd_fprintf(out_, "set_line_width(gc, %d)\n", width); delegatee_->set_line_width(gc, width); } static void log_set_draw_xor(rnd_hid_gc_t gc, int xor) { - pcb_fprintf(out_, "set_draw_xor(gc, %s)\n", xor ? "true" : "false"); + rnd_fprintf(out_, "set_draw_xor(gc, %s)\n", xor ? "true" : "false"); delegatee_->set_draw_xor(gc, xor); } static void log_set_draw_faded(rnd_hid_gc_t gc, int faded) { - pcb_fprintf(out_, "set_draw_faded(gc, %s)\n", faded ? "true" : "false"); + rnd_fprintf(out_, "set_draw_faded(gc, %s)\n", faded ? "true" : "false"); delegatee_->set_draw_faded(gc, faded); } static void log_draw_line(rnd_hid_gc_t gc, rnd_coord_t x1, rnd_coord_t y1, rnd_coord_t x2, rnd_coord_t y2) { - pcb_fprintf(out_, "draw_line(gc, %mm, %mm, %mm, %mm)\n", x1, y1, x2, y2); + rnd_fprintf(out_, "draw_line(gc, %mm, %mm, %mm, %mm)\n", x1, y1, x2, y2); delegatee_->draw_line(gc, x1, y1, x2, y2); } static void log_draw_arc(rnd_hid_gc_t gc, rnd_coord_t cx, rnd_coord_t cy, rnd_coord_t xradius, rnd_coord_t yradius, rnd_angle_t start_angle, rnd_angle_t delta_angle) { - pcb_fprintf(out_, "draw_arc(gc, %mm, %mm, rx=%mm, ry=%mm, start_angle=%.1f, delta_a=%.1f)\n", + rnd_fprintf(out_, "draw_arc(gc, %mm, %mm, rx=%mm, ry=%mm, start_angle=%.1f, delta_a=%.1f)\n", cx, cy, xradius, yradius, start_angle, delta_angle); delegatee_->draw_arc(gc, cx, cy, xradius, yradius, start_angle, delta_angle); } @@ -153,13 +153,13 @@ static void log_draw_rect(rnd_hid_gc_t gc, rnd_coord_t x1, rnd_coord_t y1, rnd_coord_t x2, rnd_coord_t y2) { - pcb_fprintf(out_, "draw_rect(gc, %mm, %mm, %mm, %mm)\n", x1, y1, x2, y2); + rnd_fprintf(out_, "draw_rect(gc, %mm, %mm, %mm, %mm)\n", x1, y1, x2, y2); delegatee_->draw_rect(gc, x1, y1, x2, y2); } static void log_fill_circle(rnd_hid_gc_t gc, rnd_coord_t x, rnd_coord_t y, rnd_coord_t r) { - pcb_fprintf(out_, "fill_circle(gc, %mm, %mm, %mm)\n", x, y, r); + rnd_fprintf(out_, "fill_circle(gc, %mm, %mm, %mm)\n", x, y, r); delegatee_->fill_circle(gc, x, y, r); } @@ -166,11 +166,11 @@ static void log_fill_polygon(rnd_hid_gc_t gc, int n_coords, rnd_coord_t *x, rnd_coord_t *y) { int i; - pcb_fprintf(out_, "fill_polygon(gc, %d", n_coords); + rnd_fprintf(out_, "fill_polygon(gc, %d", n_coords); for (i = 0; i < n_coords; ++i) { - pcb_fprintf(out_, ", (%mm, %mm)", x[i], y[i]); + rnd_fprintf(out_, ", (%mm, %mm)", x[i], y[i]); } - pcb_fprintf(out_, ")\n"); + rnd_fprintf(out_, ")\n"); delegatee_->fill_polygon(gc, n_coords, x, y); } @@ -177,23 +177,23 @@ static void log_fill_polygon_offs(rnd_hid_gc_t gc, int n_coords, rnd_coord_t *x, rnd_coord_t *y, rnd_coord_t dx, rnd_coord_t dy) { int i; - pcb_fprintf(out_, "fill_polygon_offs(gc, %d", n_coords); + rnd_fprintf(out_, "fill_polygon_offs(gc, %d", n_coords); for (i = 0; i < n_coords; ++i) { - pcb_fprintf(out_, ", (%mm, %mm)", x[i], y[i]); + rnd_fprintf(out_, ", (%mm, %mm)", x[i], y[i]); } - pcb_fprintf(out_, ", {%mm,%mm})\n", dx, dy); + rnd_fprintf(out_, ", {%mm,%mm})\n", dx, dy); delegatee_->fill_polygon_offs(gc, n_coords, x, y, dx, dy); } static void log_fill_rect(rnd_hid_gc_t gc, rnd_coord_t x1, rnd_coord_t y1, rnd_coord_t x2, rnd_coord_t y2) { - pcb_fprintf(out_, "fill_rect(gc, %mm, %mm, %mm, %mm)\n", x1, y1, x2, y2); + rnd_fprintf(out_, "fill_rect(gc, %mm, %mm, %mm, %mm)\n", x1, y1, x2, y2); delegatee_->fill_rect(gc, x1, y1, x2, y2); } static void log_beep(rnd_hid_t *hid) { - pcb_fprintf(out_, "beep(); BEEEP .... BEEEEEEEP\n"); + rnd_fprintf(out_, "beep(); BEEEP .... BEEEEEEEP\n"); delegatee_->beep(hid); } Index: trunk/src_plugins/mincut/rats_mincut.c =================================================================== --- trunk/src_plugins/mincut/rats_mincut.c (revision 31006) +++ trunk/src_plugins/mincut/rats_mincut.c (revision 31007) @@ -166,12 +166,12 @@ } if (parent != NULL) { if (parent->refdes == NULL) - s = pcb_strdup_printf("%s #%ld \\nof #%ld", typ, n->to->ID, parent->ID); + s = rnd_strdup_printf("%s #%ld \\nof #%ld", typ, n->to->ID, parent->ID); else - s = pcb_strdup_printf("%s #%ld \\nof %s", typ, n->to->ID, parent->refdes); + s = rnd_strdup_printf("%s #%ld \\nof %s", typ, n->to->ID, parent->refdes); } else - s = pcb_strdup_printf("%s #%ld", typ, n->to->ID); + s = rnd_strdup_printf("%s #%ld", typ, n->to->ID); g->node2name[n->gid] = s; if ((o->term == NULL) && (o->type != PCB_OBJ_RAT)) Index: trunk/src_plugins/oldactions/oldactions.c =================================================================== --- trunk/src_plugins/oldactions/oldactions.c (revision 31006) +++ trunk/src_plugins/oldactions/oldactions.c (revision 31007) @@ -151,7 +151,7 @@ printf(" [%d] `%s'", i, s); } rnd_hid_get_coords("Click X,Y for Debug", &x, &y, 0); - pcb_printf(" x,y %$mD\n", x, y); + rnd_printf(" x,y %$mD\n", x, y); RND_ACT_IRES(0); return 0; } Index: trunk/src_plugins/order/order.c =================================================================== --- trunk/src_plugins/order/order.c (revision 31006) +++ trunk/src_plugins/order/order.c (revision 31007) @@ -123,7 +123,7 @@ case RND_HATT_COORD: f->val.crd = c; break; case RND_HATT_STRING: free((char *)f->val.str); - f->val.str = pcb_strdup_printf("%$mm", c); + f->val.str = rnd_strdup_printf("%$mm", c); break; default: break; } @@ -140,7 +140,7 @@ case RND_HATT_COORD: f->val.crd = PCB_MM_TO_COORD(l); break; case RND_HATT_STRING: free((char *)f->val.str); - f->val.str = pcb_strdup_printf("%ld", l); + f->val.str = rnd_strdup_printf("%ld", l); break; case RND_HATT_ENUM: bestn = -1; Index: trunk/src_plugins/order_pcbway/pcbway.c =================================================================== --- trunk/src_plugins/order_pcbway/pcbway.c (revision 31006) +++ trunk/src_plugins/order_pcbway/pcbway.c (revision 31007) @@ -105,7 +105,7 @@ pcb_mkdir(hidlib, cachedir, 0755); wopts.post_file = "/dev/null"; - path = pcb_strdup_printf("%s%cGetCountry", cachedir, RND_DIR_SEPARATOR_C); + path = rnd_strdup_printf("%s%cGetCountry", cachedir, RND_DIR_SEPARATOR_C); if (pcbway_cahce_update_(hidlib, SERVER "/api/Address/GetCountry", path, 0, &wopts) != 0) { res = -1; goto quit; @@ -112,7 +112,7 @@ } free(path); - path = pcb_strdup_printf("%s%cPCBWay_Api.xml", cachedir, RND_DIR_SEPARATOR_C); + path = rnd_strdup_printf("%s%cPCBWay_Api.xml", cachedir, RND_DIR_SEPARATOR_C); if (pcbway_cahce_update_(hidlib, SERVER "/xml/PCBWay_Api.xml", path, 1, NULL) != 0) { res = -1; goto quit; @@ -293,13 +293,13 @@ } cachedir = rnd_build_fn(&PCB->hidlib, conf_order.plugins.order.cache); - path = pcb_strdup_printf("%s%cPCBWay_Api.xml", cachedir, RND_DIR_SEPARATOR_C); + path = rnd_strdup_printf("%s%cPCBWay_Api.xml", cachedir, RND_DIR_SEPARATOR_C); doc = pcbway_xml_load(path); if (doc != NULL) { root = xmlDocGetRootElement(doc); if ((root != NULL) && (xmlStrcmp(root->name, (xmlChar *)"PCBWayAPI") == 0)) { octx->odata = calloc(sizeof(pcbway_form_t), 1); - country_fn = pcb_strdup_printf("%s%cGetCountry", cachedir, RND_DIR_SEPARATOR_C); + country_fn = rnd_strdup_printf("%s%cGetCountry", cachedir, RND_DIR_SEPARATOR_C); if (pcbway_load_countries(octx->odata, country_fn) != 0) res = -1; else if (pcbway_load_fields_(&PCB->hidlib, imp, octx, root) != 0) { @@ -485,7 +485,7 @@ fprintf(fx, "%d", f->val.lng); break; case RND_HATT_COORD: - pcb_fprintf(fx, "%mm", f->val.crd); + rnd_fprintf(fx, "%mm", f->val.crd); break; case RND_HATT_STRING: Index: trunk/src_plugins/propedit/propdlg.c =================================================================== --- trunk/src_plugins/propedit/propdlg.c (revision 31006) +++ trunk/src_plugins/propedit/propdlg.c (revision 31007) @@ -161,7 +161,7 @@ inv++; } if (inv > 0) - pcb_append_printf(&scope, "%d invalid layers, ", inv); + rnd_append_printf(&scope, "%d invalid layers, ", inv); inv = 0; for(n = 0, l = ctx->pe.layergrps.array; n < vtl0_len(&ctx->pe.layergrps); n++, l++) { const char *name = pcb_layergrp_name(ctx->pe.pcb, *l); @@ -174,7 +174,7 @@ inv++; } if (inv > 0) - pcb_append_printf(&scope, "%d invalid layer groups, ", inv); + rnd_append_printf(&scope, "%d invalid layer groups, ", inv); if (ctx->pe.nets_inited) { htsp_entry_t *e; @@ -189,7 +189,7 @@ inv++; } if (inv > 0) - pcb_append_printf(&scope, "%d invalid nets, ", inv); + rnd_append_printf(&scope, "%d invalid nets, ", inv); } inv = 0; @@ -196,12 +196,12 @@ for(idp = pcb_idpath_list_first(&ctx->pe.objs); idp != NULL; idp = pcb_idpath_list_next(idp)) { pcb_any_obj_t *o = pcb_idpath2obj_in(ctx->pe.data, idp); if (o != NULL) - pcb_append_printf(&scope, "%s #%ld, ", pcb_obj_type_name(o->type), o->ID); + rnd_append_printf(&scope, "%s #%ld, ", pcb_obj_type_name(o->type), o->ID); else inv++; } if (inv > 0) - pcb_append_printf(&scope, "%d invalid objects, ", inv); + rnd_append_printf(&scope, "%d invalid objects, ", inv); gds_truncate(&scope, gds_len(&scope)-2); @@ -289,7 +289,7 @@ for(n = 0; n < p->values.used; n++) { rnd_hid_row_t *r; - cell[0] = pcb_strdup_printf("%ld", pvs[n].cnt); + cell[0] = rnd_strdup_printf("%ld", pvs[n].cnt); cell[1] = pcb_propsel_printval(p->type, pvs[n].val); r = rnd_dad_tree_append(attr, NULL, cell); r->user_data = pvs[n].val; @@ -408,7 +408,7 @@ while(isspace(*key)) key++; if ((failed == 0) && (*key != '\0')) { - char *path = pcb_strdup_printf("a/%s", key); + char *path = rnd_strdup_printf("a/%s", key); pcb_propsel_set_str(&ctx->pe, path, dlg[wval].val.str); free(path); prop_refresh(ctx); Index: trunk/src_plugins/propedit/propedit.c =================================================================== --- trunk/src_plugins/propedit/propedit.c (revision 31006) +++ trunk/src_plugins/propedit/propedit.c (revision 31007) @@ -307,17 +307,17 @@ switch(p->type) { case PCB_PROPT_STRING: printf(" common='%s'\n", com.string); break; case PCB_PROPT_COORD: - pcb_printf(" common='%$$mm'\n", com.coord); - pcb_printf(" min/avg/max=%$$mm/%$$mm/%$$mm\n", min.coord, avg.coord, max.coord); + rnd_printf(" common='%$$mm'\n", com.coord); + rnd_printf(" min/avg/max=%$$mm/%$$mm/%$$mm\n", min.coord, avg.coord, max.coord); break; case PCB_PROPT_ANGLE: - pcb_printf(" common='%f'\n", com.angle); - pcb_printf(" min/avg/max=%f/%f/%f\n", min.angle, avg.angle, max.angle); + rnd_printf(" common='%f'\n", com.angle); + rnd_printf(" min/avg/max=%f/%f/%f\n", min.angle, avg.angle, max.angle); break; case PCB_PROPT_INT: case PCB_PROPT_BOOL: - pcb_printf(" common='%d'\n", com.i); - pcb_printf(" min/avg/max=%d/%d/%d\n", min.i, avg.i, max.i); + rnd_printf(" common='%d'\n", com.i); + rnd_printf(" min/avg/max=%d/%d/%d\n", min.i, avg.i, max.i); break; case PCB_PROPT_COLOR: printf(" common=#%02d%02d%02d\n", com.clr.r, com.clr.g, com.clr.b); break; case PCB_PROPT_invalid: Index: trunk/src_plugins/propedit/propsel.c =================================================================== --- trunk/src_plugins/propedit/propsel.c (revision 31006) +++ trunk/src_plugins/propedit/propsel.c (revision 31007) @@ -1003,11 +1003,11 @@ { switch(type) { case PCB_PROPT_STRING: return val->string == NULL ? rnd_strdup("") : rnd_strdup(val->string); - case PCB_PROPT_COORD: return pcb_strdup_printf("%m+%.02mS", rnd_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_COORD: return rnd_strdup_printf("%m+%.02mS", rnd_conf.editor.grid_unit->allow, val->coord); + case PCB_PROPT_ANGLE: return rnd_strdup_printf("%f", val->angle); + case PCB_PROPT_INT: return rnd_strdup_printf("%d", val->i); 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); + case PCB_PROPT_COLOR: return rnd_strdup_printf("#%02x%02x%02x", val->clr.r, val->clr.g, val->clr.b); default: return rnd_strdup(""); } Index: trunk/src_plugins/puller/puller.c =================================================================== --- trunk/src_plugins/puller/puller.c (revision 31006) +++ trunk/src_plugins/puller/puller.c (revision 31007) @@ -137,7 +137,7 @@ ay += a->Width * sin(rad); } #if TRACE1 - pcb_printf(" - arc endpoint %#mD\n", ax, ay); + rnd_printf(" - arc endpoint %#mD\n", ax, ay); #endif arc_dist = rnd_distance(ax, ay, x, y); if (arc_exact) @@ -237,7 +237,7 @@ - ((double) x1 - px) * ((double) y2 - y1)) / den); #if TRACE1 - pcb_printf("dist %#mD-%#mD to %#mD is %f\n", x1, y1, x2, y2, px, py, rv); + rnd_printf("dist %#mD-%#mD to %#mD is %f\n", x1, y1, x2, y2, px, py, rv); #endif return rv; } @@ -254,7 +254,7 @@ pcb_line_t *l = (pcb_line_t *) b; double d1, d2, t; #if TRACE1 - pcb_printf("line %#mD .. %#mD\n", l->Point1.X, l->Point1.Y, l->Point2.X, l->Point2.Y); + rnd_printf("line %#mD .. %#mD\n", l->Point1.X, l->Point1.Y, l->Point2.X, l->Point2.Y); #endif d1 = rnd_distance(l->Point1.X, l->Point1.Y, x, y); d2 = rnd_distance(l->Point2.X, l->Point2.Y, x, y); @@ -280,7 +280,7 @@ pcb_arc_t *a = (pcb_arc_t *) b; #if TRACE1 - pcb_printf("arc a %#mD r %#mS sa %ld d %ld\n", a->X, a->Y, a->Width, a->StartAngle, a->Delta); + rnd_printf("arc a %#mD r %#mS sa %ld d %ld\n", a->X, a->Y, a->Width, a->StartAngle, a->Delta); #endif if (!arc_endpoint_is(a, a->StartAngle, x, y) && !arc_endpoint_is(a, a->StartAngle + a->Delta, x, y)) @@ -313,7 +313,7 @@ rnd_rnd_box_t spot; #if TRACE1 - pcb_printf("\nPuller find_pair at %#mD\n", pcb_crosshair.X, pcb_crosshair.Y); + rnd_printf("\nPuller find_pair at %#mD\n", pcb_crosshair.X, pcb_crosshair.Y); #endif x = Px; @@ -596,7 +596,7 @@ e->end.x = a->X - (a->Width * cos(d2r(a->StartAngle + a->Delta)) + 0.5); e->end.y = a->Y + (a->Height * sin(d2r(a->StartAngle + a->Delta)) + 0.5); #if TRACE1 - pcb_printf("new X,Y is %#mD to %#mD\n", e->start.x, e->start.y, e->end.x, e->end.y); + rnd_printf("new X,Y is %#mD to %#mD\n", e->start.x, e->start.y, e->end.x, e->end.y); #endif } @@ -624,7 +624,7 @@ abort1(); #endif #if TRACE1 - pcb_printf(" - %p line %#mD or %#mD\n", (void *)e, line->Point1.X, line->Point1.Y, line->Point2.X, line->Point2.Y); + rnd_printf(" - %p line %#mD or %#mD\n", (void *)e, line->Point1.X, line->Point1.Y, line->Point2.X, line->Point2.Y); #endif if ((NEAR(line->Point1.X, fpcs->x) && NEAR(line->Point1.Y, fpcs->y)) || (NEAR(line->Point2.X, fpcs->x) && NEAR(line->Point2.Y, fpcs->y))) { @@ -653,7 +653,7 @@ if (arc == fpcs->me) return PCB_R_DIR_NOT_FOUND; #if TRACE1 - pcb_printf(" - %p arc %#mD or %#mD\n", (void *)e, e->start.x, e->start.y, e->end.x, e->end.y); + rnd_printf(" - %p arc %#mD or %#mD\n", (void *)e, e->start.x, e->start.y, e->end.x, e->end.y); #endif if ((NEAR(e->start.x, fpcs->x) && NEAR(e->start.y, fpcs->y)) || (NEAR(e->end.x, fpcs->x) && NEAR(e->end.y, fpcs->y))) { @@ -682,7 +682,7 @@ fpcs.x = x; fpcs.y = y; #if TRACE1 - pcb_printf("looking for %#mD\n", x, y); + rnd_printf("looking for %#mD\n", x, y); #endif b.X1 = x - 10; b.X2 = x + 10; @@ -749,7 +749,7 @@ lines so they can be pulled independently. */ if (pcb_isc_pstk_line(pcb_find0, pin, line)) { #if TRACE1 - pcb_printf("splitting line %#mD-%#mD because it passes through pin %#mD r%d\n", + rnd_printf("splitting line %#mD-%#mD because it passes through pin %#mD r%d\n", line->Point1.X, line->Point1.Y, line->Point2.X, line->Point2.Y, pin->x, pin->y, pin->Thickness / 2); #endif unlink_end(e, &e->start.next); @@ -968,13 +968,13 @@ if (EXTRA_IS_LINE(e)) { pcb_line_t *line = EXTRA2LINE(e); - pcb_printf(" %p L %#mD-%#mD", (void *)line, line->Point1.X, line->Point1.Y, line->Point2.X, line->Point2.Y); + rnd_printf(" %p L %#mD-%#mD", (void *)line, line->Point1.X, line->Point1.Y, line->Point2.X, line->Point2.Y); printf(" %s %p %s %p\n", e->start.is_pad ? "pad" : "pin", (void *)e->start.pin, e->end.is_pad ? "pad" : "pin", (void *)e->end.pin); } else if (EXTRA_IS_ARC(e)) { pcb_arc_t *arc = EXTRA2ARC(e); - pcb_printf(" %p A %#mD-%#mD", (void *)arc, e->start.x, e->start.y, e->end.x, e->end.y); - pcb_printf(" at %#mD ang %ld,%ld\n", arc->X, arc->Y, arc->StartAngle, arc->Delta); + rnd_printf(" %p A %#mD-%#mD", (void *)arc, e->start.x, e->start.y, e->end.x, e->end.y); + rnd_printf(" at %#mD ang %ld,%ld\n", arc->X, arc->Y, arc->StartAngle, arc->Delta); } else if (e == &multi_next) { printf("-- Multi-next\n"); @@ -1118,7 +1118,7 @@ double base_angle, rel_angle, point_angle; #if TRACE1 - pcb_printf("\033[34mgp_point_force %#mD %#mS via %s\033[0m\n", x, y, t, name); + rnd_printf("\033[34mgp_point_force %#mD %#mS via %s\033[0m\n", x, y, t, name); #endif if (start_arc) { @@ -1137,8 +1137,8 @@ /* See if the point is inside our start arc. */ d = rnd_distance(scx, scy, x, y); #if TRACE1 - pcb_printf("%f = dist #mD to %#mD\n", d, scx, scy, x, y); - pcb_printf("sr %#mS r %f d %f\n", sr, r, d); + rnd_printf("%f = dist #mD to %#mD\n", d, scx, scy, x, y); + rnd_printf("sr %#mS r %f d %f\n", sr, r, d); #endif if (d < sr - r) { #if TRACE1 @@ -1159,7 +1159,7 @@ /* angle between points (NOT pcb arc angles) */ base_angle = atan2(y - scy, x - scx); #if TRACE1 - pcb_printf("%.1f = atan2 (%#mS-%#mS = %#mS, %#mS-%#mS = %#mS)\n", r2d(base_angle), y, scy, y - scy, x, scx, x - scx); + rnd_printf("%.1f = atan2 (%#mS-%#mS = %#mS, %#mS-%#mS = %#mS)\n", r2d(base_angle), y, scy, y - scy, x, scx, x - scx); #endif if ((sa_sign * sr - r) / d > 1 || (sa_sign * sr - r) / d < -1) @@ -1217,12 +1217,12 @@ #endif new_r = dist_lp(start_line->Point1.X, start_line->Point1.Y, start_line->Point2.X, start_line->Point2.Y, x, y); #if TRACE1 - pcb_printf("point %#mD dist %#mS vs thickness %#mS\n", x, y, new_r, thickness); + rnd_printf("point %#mD dist %#mS vs thickness %#mS\n", x, y, new_r, thickness); #endif new_r -= thickness; new_r = (int) new_r - 1; #if TRACE1 - pcb_printf(" - new thickness %f old %#mS\n", new_r, t); + rnd_printf(" - new thickness %f old %#mS\n", new_r, t); #endif if (new_r < t) gp_point_force(x, y, new_r, e, esa, eda, 1, "gp_point_force"); @@ -1269,7 +1269,7 @@ return 0; #if TRACE1 - pcb_printf("\033[34mgp_point %#mD %#mS via %s\033[0m\n", x, y, t, func); + rnd_printf("\033[34mgp_point %#mD %#mS via %s\033[0m\n", x, y, t, func); #endif /* There are two regions we care about. For points inside our @@ -1431,7 +1431,7 @@ { #if TRACE1 Extra *e; - pcb_printf("create_line from %#mD to %#mD\n", x1, y1, x2, y2); + rnd_printf("create_line from %#mD to %#mD\n", x1, y1, x2, y2); #endif pcb_line_t *line = pcb_line_new(PCB_CURRLAYER(PCB), x1, y1, x2, y2, sample->Thickness, sample->Clearance, sample->Flags); @@ -1457,7 +1457,7 @@ if (r % 100 == 99) r++; #if TRACE1 - pcb_printf("create_arc at %#mD r %#mS sa %d delta %d\n", x, y, r, sa, da); + rnd_printf("create_arc at %#mD r %#mS sa %d delta %d\n", x, y, r, sa, da); #endif arc = pcb_arc_new(PCB_CURRLAYER(PCB), x, y, r, r, sa, da, sample->Thickness, sample->Clearance, sample->Flags, pcb_true); if (arc == 0) { @@ -1537,7 +1537,7 @@ e->deleted = 1; unlink_extras(e); #if TRACE1 - pcb_printf("pcb_marked line %p for deletion %#mD to %#mD\n", (void *)e, l->Point1.X, l->Point1.Y, l->Point2.X, l->Point2.Y); + rnd_printf("pcb_marked line %p for deletion %#mD to %#mD\n", (void *)e, l->Point1.X, l->Point1.Y, l->Point2.X, l->Point2.Y); #endif #if 0 if (l->Point1.X < 0) { @@ -1722,7 +1722,7 @@ fx = ex; fy = ey; if (fx < 0) { - pcb_fprintf(stderr, "end line corrupt? f is %#mD\n", fx, fy); + rnd_fprintf(stderr, "end line corrupt? f is %#mD\n", fx, fy); print_extra(end_extra, 0); if (earc_extra) print_extra(earc_extra, 0); @@ -1745,7 +1745,7 @@ abs_angle = fa + start_angle; #if TRACE1 - pcb_printf("\033[43;30mBest: at %#mD r %#mS, angle %.1f fp %d\033[0m\n", fx, fy, fr, r2d(fa), fp); + rnd_printf("\033[43;30mBest: at %#mD r %#mS, angle %.1f fp %d\033[0m\n", fx, fy, fr, r2d(fa), fp); #endif #if 0 @@ -1781,7 +1781,7 @@ new_delta -= 360; } #if TRACE1 - pcb_printf("merging arcs at %#mS nd %d\n", start_arc->X, start_arc->Y, new_delta); + rnd_printf("merging arcs at %#mS nd %d\n", start_arc->X, start_arc->Y, new_delta); print_extra(sarc_extra, 0); print_extra(earc_extra, 0); #endif @@ -1842,7 +1842,7 @@ double ox = fx + fr * cos(oa); double oy = fy + fr * sin(oa); #if TRACE1 - pcb_printf("obstacle at %#mD angle %d = arc starts at %#mD\n", fx, fy, (int) r2d(oa), (int) ox, (int) oy); + rnd_printf("obstacle at %#mD angle %d = arc starts at %#mD\n", fx, fy, (int) r2d(oa), (int) ox, (int) oy); #endif if (rnd_distance(ox, oy, end_line->Point2.X, end_line->Point2.Y) @@ -1856,7 +1856,7 @@ /* Step 2: If we have no obstacles, connect start and end. */ #if TRACE1 - pcb_printf("fx %#mS ex %#mS fy %#mS ey %#mS\n", fx, ex, fy, ey); + rnd_printf("fx %#mS ex %#mS fy %#mS ey %#mS\n", fx, ex, fy, ey); #endif if (fx == ex && fy == ey) { /* No obstacles. */ @@ -1921,8 +1921,8 @@ ex = start_line->Point1.X + cos(start_angle + fa) * 10000.0; ey = start_line->Point1.Y + sin(start_angle + fa) * 10000.0; #if TRACE1 - pcb_printf("temp point %#mS\n", ex, ey); - pcb_printf("intersect %#mS-%#mS with %#mS-%#mS\n", + rnd_printf("temp point %#mS\n", ex, ey); + rnd_printf("intersect %#mS-%#mS with %#mS-%#mS\n", start_line->Point1.X, start_line->Point1.Y, ex, ey, end_line->Point1.X, end_line->Point1.Y, end_line->Point2.X, end_line->Point2.Y); #endif @@ -1933,7 +1933,7 @@ ey = end_line->Point2.Y; } #if TRACE1 - pcb_printf("new point %#mS\n", ex, ey); + rnd_printf("new point %#mS\n", ex, ey); #endif pcb_move_obj(PCB_OBJ_LINE_POINT, PCB_CURRLAYER(PCB), end_line, &(end_line->Point1), ex - end_line->Point1.X, ey - end_line->Point1.Y); Index: trunk/src_plugins/query/fnc_list.c =================================================================== --- trunk/src_plugins/query/fnc_list.c (revision 31006) +++ trunk/src_plugins/query/fnc_list.c (revision 31007) @@ -82,9 +82,9 @@ case PCBQ_VT_VOID: str = ""; break; case PCBQ_VT_OBJ: str = ""; break; case PCBQ_VT_LST: str = ""; break; - case PCBQ_VT_COORD: pcb_snprintf(buff, sizeof(buff), "%mH$", argv[n+1].data.crd); break; - case PCBQ_VT_LONG: pcb_snprintf(buff, sizeof(buff), "%ld", argv[n+1].data.lng); break; - case PCBQ_VT_DOUBLE: pcb_snprintf(buff, sizeof(buff), "%f", argv[n+1].data.dbl); break; + case PCBQ_VT_COORD: rnd_snprintf(buff, sizeof(buff), "%mH$", argv[n+1].data.crd); break; + case PCBQ_VT_LONG: rnd_snprintf(buff, sizeof(buff), "%ld", argv[n+1].data.lng); break; + case PCBQ_VT_DOUBLE: rnd_snprintf(buff, sizeof(buff), "%f", argv[n+1].data.dbl); break; case PCBQ_VT_STRING: str = (char *)argv[n+1].data.str; break; } str = rnd_strdup(str == NULL ? "" : str); Index: trunk/src_plugins/query/query.c =================================================================== --- trunk/src_plugins/query/query.c (revision 31006) +++ trunk/src_plugins/query/query.c (revision 31007) @@ -92,11 +92,11 @@ { switch(val->type) { 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_COORD: return rnd_strdup_printf("%mI=%$mH", val->data.crd, val->data.crd); + case PCBQ_VT_LONG: return rnd_strdup_printf("%ld", val->data.lng, val->data.lng); + case PCBQ_VT_DOUBLE: return rnd_strdup_printf("%f", val->data.dbl); + case PCBQ_VT_STRING: return rnd_strdup_printf("\"%s\"", val->data.str); + case PCBQ_VT_OBJ: return rnd_strdup_printf("", val->data.obj->ID); case PCBQ_VT_LST: return rnd_strdup(""); } return rnd_strdup(""); @@ -206,15 +206,15 @@ if (level < sizeof(ind)) ind[level] = '\0'; printf("%s%s%s ", prefix, ind, pcb_qry_nodetype_name(nd->type)); switch(nd->type) { - case PCBQ_DATA_INVALID:pcb_printf("%s%s invalid (literal)\n", prefix, ind); break; - case PCBQ_DATA_COORD: pcb_printf("%s%s %mI (%$mm)\n", prefix, ind, nd->data.crd, nd->data.crd); break; - case PCBQ_DATA_DOUBLE: pcb_printf("%s%s %f\n", prefix, ind, nd->data.dbl); break; - case PCBQ_DATA_CONST: pcb_printf("%s%s %s\n", prefix, ind, nd->data.str); break; - case PCBQ_DATA_OBJ: pcb_printf("%s%s %s\n", prefix, ind, nd->data.str); break; - case PCBQ_ITER_CTX: pcb_printf("%s%s vars=%d\n", prefix, ind, nd->data.iter_ctx->num_vars); break; - case PCBQ_FLAG: pcb_printf("%s%s %s\n", prefix, ind, nd->precomp.flg->name); break; + case PCBQ_DATA_INVALID:rnd_printf("%s%s invalid (literal)\n", prefix, ind); break; + case PCBQ_DATA_COORD: rnd_printf("%s%s %mI (%$mm)\n", prefix, ind, nd->data.crd, nd->data.crd); break; + case PCBQ_DATA_DOUBLE: rnd_printf("%s%s %f\n", prefix, ind, nd->data.dbl); break; + case PCBQ_DATA_CONST: rnd_printf("%s%s %s\n", prefix, ind, nd->data.str); break; + case PCBQ_DATA_OBJ: rnd_printf("%s%s %s\n", prefix, ind, nd->data.str); break; + case PCBQ_ITER_CTX: rnd_printf("%s%s vars=%d\n", prefix, ind, nd->data.iter_ctx->num_vars); break; + case PCBQ_FLAG: rnd_printf("%s%s %s\n", prefix, ind, nd->precomp.flg->name); break; case PCBQ_VAR: - pcb_printf("%s%s ", prefix, ind); + rnd_printf("%s%s ", prefix, ind); if ((it_ctx != NULL) && (nd->data.crd < it_ctx->num_vars)) { if (it_ctx->vects == NULL) pcb_qry_iter_init(it_ctx); @@ -227,13 +227,13 @@ { const char *name = pcb_qry_fnc_name(nd->data.fnc); if (name == NULL) - pcb_printf("%s%s \n", prefix, ind); + rnd_printf("%s%s \n", prefix, ind); else - pcb_printf("%s%s %s()\n", prefix, ind, name); + rnd_printf("%s%s %s()\n", prefix, ind, name); } break; case PCBQ_RULE: - pcb_printf("%s%s%s\n", prefix, ind, nd->data.children->next->data.str); + rnd_printf("%s%s%s\n", prefix, ind, nd->data.children->next->data.str); n = nd->data.children->next->next; if (n != NULL) { for(; n != NULL; n = n->next) @@ -240,12 +240,12 @@ pcb_qry_dump_tree_(prefix, level+1, n, it_ctx); } else - pcb_printf("%s%s\n", prefix, ind); + rnd_printf("%s%s\n", prefix, ind); break; case PCBQ_FIELD: case PCBQ_LISTVAR: case PCBQ_DATA_REGEX: - case PCBQ_DATA_STRING: pcb_printf("%s%s '%s'\n", prefix, ind, nd->data.str); break; + case PCBQ_DATA_STRING: rnd_printf("%s%s '%s'\n", prefix, ind, nd->data.str); break; default: printf("\n"); if (level < sizeof(ind)) ind[level] = ' '; Index: trunk/src_plugins/query/query_exec.c =================================================================== --- trunk/src_plugins/query/query_exec.c (revision 31006) +++ trunk/src_plugins/query/query_exec.c (revision 31007) @@ -296,13 +296,13 @@ { switch(val->type) { case PCBQ_VT_COORD: - pcb_snprintf(buff, buff_size, "%mI", val->data.crd); + rnd_snprintf(buff, buff_size, "%mI", val->data.crd); return buff; case PCBQ_VT_LONG: - pcb_snprintf(buff, buff_size, "%ld", val->data.lng); + rnd_snprintf(buff, buff_size, "%ld", val->data.lng); return buff; case PCBQ_VT_DOUBLE: - pcb_snprintf(buff, buff_size, "%f", val->data.crd); + rnd_snprintf(buff, buff_size, "%f", val->data.crd); return buff; case PCBQ_VT_STRING: return val->data.str; Index: trunk/src_plugins/renumber/renumber.c =================================================================== --- trunk/src_plugins/renumber/renumber.c (revision 31006) +++ trunk/src_plugins/renumber/renumber.c (revision 31007) @@ -163,7 +163,7 @@ if (PCB_FLAG_TEST(PCB_FLAG_LOCK, subc)) { /* add to the list of locked subcircuits which we won't try to renumber and whose reference designators are now reserved. */ - pcb_fprintf(out, + rnd_fprintf(out, "*WARN* subc \"%s\" at %$md is locked and will not be renumbered.\n", RND_UNKNOWN(subc->refdes), ox, oy); locked_subc_list[lock_cnt] = subc; @@ -290,7 +290,7 @@ } else { /* If there is no refdes, maybe just spit out a warning */ - pcb_fprintf(out, "*WARN* Subcircuit at %$md has no name.\n", ox_list[i], oy_list[i]); + rnd_fprintf(out, "*WARN* Subcircuit at %$md has no name.\n", ox_list[i], oy_list[i]); } } Index: trunk/src_plugins/report/report.c =================================================================== --- trunk/src_plugins/report/report.c (revision 31006) +++ trunk/src_plugins/report/report.c (revision 31007) @@ -132,7 +132,7 @@ while (*thestring != '\0') thestring++; for (n = 0; n < AllDrills->DrillN; n++) { - pcb_sprintf(thestring, + rnd_sprintf(thestring, "%10m*\t\t\t%d\t\t%d\t\t%d\t\t\t\t%d\n", rnd_conf.editor.grid_unit->suffix, AllDrills->Drill[n].DrillSize, @@ -181,14 +181,14 @@ #endif proto = pcb_pstk_get_proto(ps); - pcb_append_printf(dst, "%m+PADSTACK ID# %ld; Flags:%s\n" + rnd_append_printf(dst, "%m+PADSTACK ID# %ld; Flags:%s\n" "(X,Y) = %$mD.\n", USER_UNITMASK, ps->ID, pcb_strflg_f2s(ps->Flags, PCB_OBJ_PSTK, NULL, 0), ps->x, ps->y); if ((proto != NULL) && (proto->hdia > 0)) - pcb_append_printf(dst, "%m+Hole diameter: %$mS", USER_UNITMASK, proto->hdia); + rnd_append_printf(dst, "%m+Hole diameter: %$mS", USER_UNITMASK, proto->hdia); - pcb_append_printf(dst, "\n%s%s%s", gen_locked(ps), gen_term(ps)); + rnd_append_printf(dst, "\n%s%s%s", gen_locked(ps), gen_term(ps)); } static void report_line(gds_t *dst, pcb_line_t *line) @@ -197,7 +197,7 @@ if (rnd_gui->shift_is_pressed(rnd_gui)) pcb_r_dump_tree(line->parent.layer->line_tree, 0); #endif - pcb_append_printf(dst, "%m+LINE ID# %ld; Flags:%s\n" + rnd_append_printf(dst, "%m+LINE ID# %ld; Flags:%s\n" "FirstPoint(X,Y) = %$mD, ID = %ld.\n" "SecondPoint(X,Y) = %$mD, ID = %ld.\n" "Width = %$mS.\nClearance = %$mS.\n" @@ -219,7 +219,7 @@ if (rnd_gui->shift_is_pressed(rnd_gui)) pcb_r_dump_tree(PCB->Data->rat_tree, 0); #endif - pcb_append_printf(dst, "%m+RAT-LINE ID# %ld; Flags:%s\n" + rnd_append_printf(dst, "%m+RAT-LINE ID# %ld; Flags:%s\n" "FirstPoint(X,Y) = %$mD; ID = %ld; " "connects to layer group #%d (%s).\n" "SecondPoint(X,Y) = %$mD; ID = %ld; " @@ -239,7 +239,7 @@ pcb_arc_get_end(arc, 0, &box.X1, &box.Y1); pcb_arc_get_end(arc, 1, &box.X2, &box.Y2); - pcb_append_printf(dst, "%m+ARC ID# %ld; Flags:%s\n" + rnd_append_printf(dst, "%m+ARC ID# %ld; Flags:%s\n" "CenterPoint(X,Y) = %$mD.\n" "Width = %$mS.\nClearance = %$mS.\n" "Radius = %$mS, StartAngle = %ma degrees, DeltaAngle = %ma degrees.\n" @@ -278,7 +278,7 @@ area = area / u; area = area / u; - pcb_append_printf(dst, "%m+POLYGON ID# %ld; Flags:%s\n" + rnd_append_printf(dst, "%m+POLYGON ID# %ld; Flags:%s\n" "Its bounding box is %$mD %$mD.\n" "It has %d points and could store %d more\n" " without using more memory.\n" @@ -302,7 +302,7 @@ if (rnd_gui->shift_is_pressed(rnd_gui)) pcb_r_dump_tree(PCB->Data->subc_tree, 0); #endif - pcb_append_printf(dst, "%m+SUBCIRCUIT ID# %ld; Flags:%s\n" + rnd_append_printf(dst, "%m+SUBCIRCUIT ID# %ld; Flags:%s\n" "BoundingBox %$mD %$mD.\n" "Refdes \"%s\".\n" "Footprint \"%s\".\n" @@ -322,7 +322,7 @@ pcb_r_dump_tree(text->parent.layer->text_tree, 0); #endif - pcb_append_printf(dst, "%m+TEXT ID# %ld; Flags:%s\n" + rnd_append_printf(dst, "%m+TEXT ID# %ld; Flags:%s\n" "BoundingBox %$mD %$mD.\n" "Font id %d\nclearance %$mS\nthickness %$mS\nrotation %f\n" , USER_UNITMASK, @@ -339,7 +339,7 @@ pcb_r_dump_tree(gfx->parent.layer->gfx_tree, 0); #endif - pcb_append_printf(dst, "%m+GFX ID# %ld; Flags:%s\n" + rnd_append_printf(dst, "%m+GFX ID# %ld; Flags:%s\n" "BoundingBox %$mD %$mD.\n" "Center %$mD\nSize %$mD\nrotation %f\n" , USER_UNITMASK, @@ -351,7 +351,7 @@ static void report_point(gds_t *dst, int type, pcb_layer_t *layer, rnd_point_t *point) { - pcb_append_printf(dst, "%m+POINT ID# %ld.\n" + rnd_append_printf(dst, "%m+POINT ID# %ld.\n" "Located at (X,Y) = %$mD.\n" "It belongs to a %s on layer %d.\n", USER_UNITMASK, point->ID, point->X, point->Y, @@ -397,12 +397,12 @@ rnd_message(RND_MSG_INFO, "Nothing found to report on\n"); RND_ACT_IRES(1); return 0; - default: pcb_append_printf(&tmp, "Unknown\n"); break; + default: rnd_append_printf(&tmp, "Unknown\n"); break; } subc = pcb_obj_parent_subc((pcb_any_obj_t *)ptr2); if (subc != NULL) - pcb_append_printf(&tmp, "\nPart of subcircuit #%ld\n", subc->ID); + rnd_append_printf(&tmp, "\nPart of subcircuit #%ld\n", subc->ID); { pcb_idpath_t *idp = pcb_obj2idpath((pcb_any_obj_t *)ptr2); @@ -437,7 +437,7 @@ pcb_data_it_t it; for(o = pcb_data_first(&it, subc->data, PCB_OBJ_CLASS_REAL); o != NULL; o = pcb_data_next(&it)) if ((o->term != NULL) && (PCB_FLAG_TEST(PCB_FLAG_FOUND, o))) - pcb_append_printf(&list, "%s-%s,%c", subc->refdes, o->term, ((col++ % (conf_report.plugins.report.columns + 1)) == conf_report.plugins.report.columns) ? '\n' : ' '); + rnd_append_printf(&list, "%s-%s,%c", subc->refdes, o->term, ((col++ % (conf_report.plugins.report.columns + 1)) == conf_report.plugins.report.columns) ? '\n' : ' '); } rdialog("Report", list.array); @@ -516,11 +516,11 @@ if (nt.net != NULL) { rnd_cardinal_t explen = pcb_termlist_length(&nt.net->conns); if (explen != nt.terms) - pcb_append_printf(err, "\nonly %ld terminals of the %ld on the network are connected!", (long)nt.terms, (long)explen); + rnd_append_printf(err, "\nonly %ld terminals of the %ld on the network are connected!", (long)nt.terms, (long)explen); if (nt.badterms != 0) - pcb_append_printf(err, "\n%ld terminals or other networks are connected (shorted)", (long)nt.badterms); + rnd_append_printf(err, "\n%ld terminals or other networks are connected (shorted)", (long)nt.badterms); if (nt.badobjs != 0) - pcb_append_printf(err, "\n%ld polygons/texts are ignored while they may affect the signal path", (long)nt.badobjs); + rnd_append_printf(err, "\n%ld polygons/texts are ignored while they may affect the signal path", (long)nt.badobjs); } return nt.length; @@ -557,7 +557,7 @@ gds_init(&err); length = xy_to_net_length(x, y, &found, &err); - pcb_snprintf(buf, sizeof(buf), "%$m*", units_name, length); + rnd_snprintf(buf, sizeof(buf), "%$m*", units_name, length); if (err.used != 0) rnd_message(RND_MSG_INFO, "Net %s length %s, BUT BEWARE:%s\n", net->name, buf, err.array); else @@ -610,7 +610,7 @@ char buf[50]; const char *netname = net_name_found(PCB); - pcb_snprintf(buf, sizeof(buf), "%$m*", rnd_conf.editor.grid_unit->suffix, length); + rnd_snprintf(buf, sizeof(buf), "%$m*", rnd_conf.editor.grid_unit->suffix, length); if (netname) rnd_message(RND_MSG_INFO, "Net \"%s\" length: %s\n", netname, buf); else @@ -748,7 +748,7 @@ { char buf[50]; - pcb_snprintf(buf, sizeof(buf), "%$m*", rnd_conf.editor.grid_unit->suffix, length); + rnd_snprintf(buf, sizeof(buf), "%$m*", rnd_conf.editor.grid_unit->suffix, length); if (netname) rnd_message(RND_MSG_INFO, "Net \"%s\" length: %s\n", netname, buf); else @@ -806,7 +806,7 @@ return 0; } printf("Filename: %s\n", PCB->hidlib.filename); - pcb_printf("Size: %ml x %ml mils, %mm x %mm mm\n", PCB->hidlib.size_x, PCB->hidlib.size_y, PCB->hidlib.size_x, PCB->hidlib.size_y); + rnd_printf("Size: %ml x %ml mils, %mm x %mm mm\n", PCB->hidlib.size_x, PCB->hidlib.size_y, PCB->hidlib.size_x, PCB->hidlib.size_y); for (i = 0; i < PCB_MAX_LAYER; i++) { rnd_layergrp_id_t lg = pcb_layer_get_group(PCB, i); unsigned int gflg = pcb_layergrp_flags(PCB, lg); Index: trunk/src_plugins/script/perma.c =================================================================== --- trunk/src_plugins/script/perma.c (revision 31006) +++ trunk/src_plugins/script/perma.c (revision 31007) @@ -42,7 +42,7 @@ if (!rnd_is_path_abs(path_in)) { path = spath; - pcb_snprintf(spath, sizeof(spath), "%s%c%s", dir, RND_DIR_SEPARATOR_C, path_in); + rnd_snprintf(spath, sizeof(spath), "%s%c%s", dir, RND_DIR_SEPARATOR_C, path_in); } else path = path_in; @@ -58,7 +58,7 @@ FILE *f; long succ = 0; - pcb_snprintf(path, sizeof(path), "%s%c%s", dir, RND_DIR_SEPARATOR_C, "scripts.lht"); + rnd_snprintf(path, sizeof(path), "%s%c%s", dir, RND_DIR_SEPARATOR_C, "scripts.lht"); f = pcb_fopen(NULL, path, "r"); if (f == NULL) return; /* non-existing or unreadable file is no error */ Index: trunk/src_plugins/script/script.c =================================================================== --- trunk/src_plugins/script/script.c (revision 31006) +++ trunk/src_plugins/script/script.c (revision 31007) @@ -250,7 +250,7 @@ { if (*fn != '~') return rnd_strdup(fn); - return pcb_strdup_printf("%s%c%s", rnd_conf.rc.path.home, RND_DIR_SEPARATOR_C, fn+1); + return rnd_strdup_printf("%s%c%s", rnd_conf.rc.path.home, RND_DIR_SEPARATOR_C, fn+1); } int pcb_script_load(const char *id, const char *fn, const char *lang) @@ -280,7 +280,7 @@ if (strcmp(engname, "fbas") == 0) engname = "fawk"; else if (strcmp(engname, "fpas") == 0) engname = "fawk"; - pcb_snprintf(name, sizeof(name), "fungw_%s", engname); + rnd_snprintf(name, sizeof(name), "fungw_%s", engname); old_id = script_persistency_id; script_persistency_id = id; Index: trunk/src_plugins/sketch_route/sketch_route.c =================================================================== --- trunk/src_plugins/sketch_route/sketch_route.c (revision 31006) +++ trunk/src_plugins/sketch_route/sketch_route.c (revision 31007) @@ -177,7 +177,7 @@ int repeat_cnt; #ifdef SK_DEBUG - pcb_printf(" wire point %d at (%mm, %mm); ", i, curr_wp->p->pos.x, -curr_wp->p->pos.y); + rnd_printf(" wire point %d at (%mm, %mm); ", i, curr_wp->p->pos.x, -curr_wp->p->pos.y); #endif for (j = 0; j < 4; j++) { @@ -219,7 +219,7 @@ } #ifdef SK_DEBUG - pcb_printf("dest spoke (dir %d) at (%mm, %mm); ", next_sp->dir, next_p.pos.x, -next_p.pos.y); + rnd_printf("dest spoke (dir %d) at (%mm, %mm); ", next_sp->dir, next_p.pos.x, -next_p.pos.y); #endif /* 2. check if the ewire should be attached to any of the remaining spokes at the current point */ @@ -257,7 +257,7 @@ prev_p = curr_p; curr_p = *p; #ifdef SK_DEBUG - pcb_printf("found obstructing spoke (dir %d) at (%mm, %mm); ", curr_sp->dir, curr_p.pos.x, -curr_p.pos.y); + rnd_printf("found obstructing spoke (dir %d) at (%mm, %mm); ", curr_sp->dir, curr_p.pos.x, -curr_p.pos.y); #endif if (++repeat_cnt == 4) break; @@ -277,7 +277,7 @@ } else { #ifdef SK_DEBUG - pcb_printf("found concavity, skip; "); + rnd_printf("found concavity, skip; "); #endif } } @@ -286,7 +286,7 @@ prev_p = curr_p; curr_p = next_p; #ifdef SK_DEBUG - pcb_printf("\n"); + rnd_printf("\n"); #endif } @@ -306,7 +306,7 @@ { int i; for (i = 0; i < w->point_num; i++) - pcb_printf("%sP%i: (%mm,%mm) %s\n", tab, i, w->points[i].p->pos.x, -w->points[i].p->pos.y, + rnd_printf("%sP%i: (%mm,%mm) %s\n", tab, i, w->points[i].p->pos.x, -w->points[i].p->pos.y, w->points[i].side == SIDE_LEFT ? "LEFT" : w->points[i].side == SIDE_RIGHT ? "RIGHT" : "TERM"); } #endif @@ -538,7 +538,7 @@ next_wp = &new_w->points[i+1]; #ifdef SK_DEBUG - pcb_printf(" add point at (%mm, %mm); ", wp->p->pos.x, -wp->p->pos.y, + rnd_printf(" add point at (%mm, %mm); ", wp->p->pos.x, -wp->p->pos.y, wirelist_length(pd->terminal_wires) - 1); #endif @@ -547,7 +547,7 @@ cdt_insert_constrained_edge(sk->cdt, wp->p, next_wp->p); insert_wire_at_point(wp, new_w, &pd->terminal_wires, -1); #ifdef SK_DEBUG - pcb_printf("start terminal; %d other wires connected\n", wirelist_length(pd->terminal_wires) - 1); + rnd_printf("start terminal; %d other wires connected\n", wirelist_length(pd->terminal_wires) - 1); #endif } else if (i == new_w->point_num - 1) { /* last point */ @@ -554,7 +554,7 @@ assert(wp->side == SIDE_TERM); insert_wire_at_point(wp, new_w, &pd->terminal_wires, -1); #ifdef SK_DEBUG - pcb_printf("end terminal; %d other wires connected\n", wirelist_length(pd->terminal_wires) - 1); + rnd_printf("end terminal; %d other wires connected\n", wirelist_length(pd->terminal_wires) - 1); #endif } else { /* middle point */ @@ -588,7 +588,7 @@ n += count_wires_coming_from_previous_point(prev_wp, wp, list_num); insert_wire_at_point(wp, new_w, &pd->attached_wires[list_num], n); #ifdef SK_DEBUG - pcb_printf("collinear; list_num=%d; n=%d; attached pos=%d; attached len=%d\n", list_num, n, + rnd_printf("collinear; list_num=%d; n=%d; attached pos=%d; attached len=%d\n", list_num, n, wirelist_length(wp->wire_node)-1, wirelist_length(pd->attached_wires[list_num])); #endif } @@ -610,7 +610,7 @@ n += count_uturn_wires_coming_from_previous_point(prev_wp, wp, list_num); insert_wire_at_point(wp, new_w, &pd->uturn_wires, n); #ifdef SK_DEBUG - pcb_printf("uturn; list_num=%d; n=%d; uturn pos=%d; uturn len=%d\n", list_num, n, + rnd_printf("uturn; list_num=%d; n=%d; uturn pos=%d; uturn len=%d\n", list_num, n, wirelist_length(wp->wire_node)-1, wirelist_length(pd->uturn_wires)); #endif } @@ -639,7 +639,7 @@ n += count_wires_coming_from_previous_point(prev_wp, wp, list_num); insert_wire_at_point(wp, new_w, &pd->attached_wires[list_num], n); #ifdef SK_DEBUG - pcb_printf("list_num=%d; n=%d, attached pos=%d; attached len=%d\n", list_num, n, + rnd_printf("list_num=%d; n=%d, attached pos=%d; attached len=%d\n", list_num, n, wirelist_length(wp->wire_node)-1, wirelist_length(pd->attached_wires[list_num])); #endif } @@ -717,12 +717,12 @@ pcb_r_search(layer->polygon_tree, &bbox, NULL, r_search_cb, &info, NULL); pcb_r_search(layer->arc_tree, &bbox, NULL, r_search_cb, &info, NULL); - pcb_snprintf(name, sizeof(name), "%s: CDT", layer->name); + rnd_snprintf(name, sizeof(name), "%s: CDT", layer->name); sk->ui_layer_cdt = pcb_uilayer_alloc(pcb_sketch_route_cookie, name, &layer->meta.real.color); sk->ui_layer_cdt->meta.real.vis = pcb_false; sketch_update_cdt_layer(sk); - pcb_snprintf(name, sizeof(name), "%s: ERBS", layer->name); + rnd_snprintf(name, sizeof(name), "%s: ERBS", layer->name); sk->ui_layer_erbs = pcb_uilayer_alloc(pcb_sketch_route_cookie, name, &layer->meta.real.color); sketch_update_erbs_layer(sk); rnd_event(&PCB->hidlib, PCB_EVENT_LAYERS_CHANGED, NULL); Index: trunk/src_plugins/vendordrill/vendor.c =================================================================== --- trunk/src_plugins/vendordrill/vendor.c (revision 31006) +++ trunk/src_plugins/vendordrill/vendor.c (revision 31007) @@ -96,7 +96,7 @@ static void load_meta_coord(const char *path, rnd_coord_t crd) { char tmp[128]; - pcb_sprintf(tmp, "%$mm", crd); + rnd_sprintf(tmp, "%$mm", crd); rnd_conf_set(RND_CFR_DESIGN, path, -1, tmp, RND_POL_OVERWRITE); } Index: trunk/tests/conf/conftest.c =================================================================== --- trunk/tests/conf/conftest.c (revision 31006) +++ trunk/tests/conf/conftest.c (revision 31007) @@ -121,7 +121,7 @@ return; } gds_init(&s); - rnd_conf_print_native((rnd_conf_pfn)pcb_append_printf, &s, NULL, 0, node); + rnd_conf_print_native((rnd_conf_pfn)rnd_append_printf, &s, NULL, 0, node); printf("%s='%s'\n", node->hash_path, s.array); gds_uninit(&s); } Index: trunk/tests/pcb-printf/prcli.c =================================================================== --- trunk/tests/pcb-printf/prcli.c (revision 31006) +++ trunk/tests/pcb-printf/prcli.c (revision 31007) @@ -12,7 +12,7 @@ setlocale(LC_ALL, "C"); - pcb_printf_slot[0] = "%mr"; + rnd_printf_slot[0] = "%mr"; for(n = 2; n < argc; n++) { rnd_bool success; @@ -24,7 +24,7 @@ crd = val; } - pcb_fprintf(stdout, fmt, crd, 70000, 70000, 70000, 70000); + rnd_fprintf(stdout, fmt, crd, 70000, 70000, 70000, 70000); printf("\n"); Index: trunk/tests/pcb-printf/prclimq.c =================================================================== --- trunk/tests/pcb-printf/prclimq.c (revision 31006) +++ trunk/tests/pcb-printf/prclimq.c (revision 31007) @@ -6,9 +6,9 @@ int main(int argc, char *argv[]) { - pcb_printf_slot[0] = "%{ ()}mq"; + rnd_printf_slot[0] = "%{ ()}mq"; setlocale(LC_ALL, "C"); - pcb_fprintf(stdout, argv[1], argv[2]); + rnd_fprintf(stdout, argv[1], argv[2]); printf("\n"); return 0; } Index: trunk/tests/pcb-printf/tester.c =================================================================== --- trunk/tests/pcb-printf/tester.c (revision 31006) +++ trunk/tests/pcb-printf/tester.c (revision 31007) @@ -10,7 +10,7 @@ # define PCB_PRINTF(fmt, ...) \ do { \ pc++; \ - pcb_snprintf(buff, sizeof(buff), fmt, __VA_ARGS__); \ + rnd_snprintf(buff, sizeof(buff), fmt, __VA_ARGS__); \ } while(0) #else # define NUMREP 1 Index: trunk/util/gsch2pcb-rnd/gsch2pcb.c =================================================================== --- trunk/util/gsch2pcb-rnd/gsch2pcb.c (revision 31006) +++ trunk/util/gsch2pcb-rnd/gsch2pcb.c (revision 31007) @@ -373,7 +373,7 @@ void require_gnetlist_backend(const char *dir, const char *backend) { - char *path = pcb_strdup_printf("%s/gnet-%s.scm", dir, backend); + char *path = rnd_strdup_printf("%s/gnet-%s.scm", dir, backend); if (!rnd_file_readable(path)) rnd_message(RND_MSG_WARNING, "WARNING: %s is not found, gnetlist will probably fail; please check your pcb-rnd installation!\n", path); free(path);