Index: attribs.c =================================================================== --- attribs.c (revision 30948) +++ attribs.c (revision 30949) @@ -74,13 +74,13 @@ continue; } if (n->type == LHT_TEXT) { - rnd_conf_native_t *nv = pcb_conf_get_field(path); + rnd_conf_native_t *nv = rnd_conf_get_field(path); if ((nv != NULL) && (!nv->random_flags.io_pcb_no_attrib)) rnd_attribute_put(&pcb->Attributes, apath, n->data.text.value); } else if (n->type == LHT_LIST) { lht_node_t *i; - rnd_conf_native_t *nv = pcb_conf_get_field(path); + rnd_conf_native_t *nv = rnd_conf_get_field(path); if ((nv != NULL) && (!nv->random_flags.io_pcb_no_attrib)) { gds_t conc; gds_init(&conc); @@ -111,7 +111,7 @@ for (n = 0; n < pcb->Attributes.Number; n++) { if (path_ok(pcb->Attributes.List[n].name)) { - rnd_conf_native_t *nv = pcb_conf_get_field(pcb->Attributes.List[n].name + conf_attr_prefix_len); + rnd_conf_native_t *nv = rnd_conf_get_field(pcb->Attributes.List[n].name + conf_attr_prefix_len); if (nv == NULL) continue; if (nv->type == RND_CFN_LIST) { @@ -123,12 +123,12 @@ *next = '\0'; next += strlen(LISTSEP); } - pcb_conf_set(RND_CFR_DESIGN, pcb->Attributes.List[n].name + conf_attr_prefix_len, -1, curr, RND_POL_APPEND); + rnd_conf_set(RND_CFR_DESIGN, pcb->Attributes.List[n].name + conf_attr_prefix_len, -1, curr, RND_POL_APPEND); } free(tmp); } else /* assume plain string */ - pcb_conf_set(RND_CFR_DESIGN, pcb->Attributes.List[n].name + conf_attr_prefix_len, -1, pcb->Attributes.List[n].value, RND_POL_OVERWRITE); + rnd_conf_set(RND_CFR_DESIGN, pcb->Attributes.List[n].name + conf_attr_prefix_len, -1, pcb->Attributes.List[n].value, RND_POL_OVERWRITE); } } } Index: file.c =================================================================== --- file.c (revision 30948) +++ file.c (revision 30949) @@ -239,7 +239,7 @@ static void conf_update_pcb_flag(pcb_flag_t *dest, const char *hash_path, int binflag) { - rnd_conf_native_t *n = pcb_conf_get_field(hash_path); + rnd_conf_native_t *n = rnd_conf_get_field(hash_path); struct { pcb_flag_t Flags; } *tmp = (void *)dest; Index: parse_l.c =================================================================== --- parse_l.c (revision 30948) +++ parse_l.c (revision 30949) @@ -2739,7 +2739,7 @@ have hardwired flags again in a "don't save these in attributes" list. */ #define CONF_NO_ATTRIB(path) \ do { \ - rnd_conf_native_t *n = pcb_conf_get_field(path); \ + rnd_conf_native_t *n = rnd_conf_get_field(path); \ if (n != NULL) \ n->random_flags.io_pcb_no_attrib = 1; \ } while(0) \ @@ -2747,7 +2747,7 @@ #define CONF_SET(target, path, arr_idx, new_val, pol) \ do { \ CONF_NO_ATTRIB(path); \ - pcb_conf_set(target, path, arr_idx, new_val, pol); \ + rnd_conf_set(target, path, arr_idx, new_val, pol); \ } while(0) \ int io_pcb_ParsePCB(pcb_plug_io_t *ctx, pcb_board_t *Ptr, const char *Filename, rnd_conf_role_t settings_dest) @@ -2764,7 +2764,7 @@ yy_settings_dest = settings_dest; if (settings_dest != RND_CFR_invalid) - pcb_conf_reset(settings_dest, Filename); + rnd_conf_reset(settings_dest, Filename); io_pcb_preproc_board(PCB); @@ -2774,7 +2774,7 @@ if ((settings_dest != RND_CFR_invalid) && (retval == 0)) { /* overwrite settings from the flags, mark them not-to-save */ - pcb_conf_reset(settings_dest, ""); + rnd_conf_reset(settings_dest, ""); rnd_conf_main_root_replace_cnt[settings_dest]++; CONF_SET(settings_dest, "plugins/mincut/enable", -1, CONF_BOOL_FLAG(PCB_ENABLEPCB_FLAG_MINCUT, yy_pcb_flags), RND_POL_OVERWRITE); CONF_SET(settings_dest, "editor/show_number", -1, CONF_BOOL_FLAG(PCB_SHOWNUMBERFLAG, yy_pcb_flags), RND_POL_OVERWRITE); Index: parse_l.l =================================================================== --- parse_l.l (revision 30948) +++ parse_l.l (revision 30949) @@ -356,7 +356,7 @@ have hardwired flags again in a "don't save these in attributes" list. */ #define CONF_NO_ATTRIB(path) \ do { \ - rnd_conf_native_t *n = pcb_conf_get_field(path); \ + rnd_conf_native_t *n = rnd_conf_get_field(path); \ if (n != NULL) \ n->random_flags.io_pcb_no_attrib = 1; \ } while(0) \ @@ -364,7 +364,7 @@ #define CONF_SET(target, path, arr_idx, new_val, pol) \ do { \ CONF_NO_ATTRIB(path); \ - pcb_conf_set(target, path, arr_idx, new_val, pol); \ + rnd_conf_set(target, path, arr_idx, new_val, pol); \ } while(0) \ int io_pcb_ParsePCB(pcb_plug_io_t *ctx, pcb_board_t *Ptr, const char *Filename, rnd_conf_role_t settings_dest) @@ -381,7 +381,7 @@ yy_settings_dest = settings_dest; if (settings_dest != RND_CFR_invalid) - pcb_conf_reset(settings_dest, Filename); + rnd_conf_reset(settings_dest, Filename); io_pcb_preproc_board(PCB); @@ -391,7 +391,7 @@ if ((settings_dest != RND_CFR_invalid) && (retval == 0)) { /* overwrite settings from the flags, mark them not-to-save */ - pcb_conf_reset(settings_dest, ""); + rnd_conf_reset(settings_dest, ""); rnd_conf_main_root_replace_cnt[settings_dest]++; CONF_SET(settings_dest, "plugins/mincut/enable", -1, CONF_BOOL_FLAG(PCB_ENABLEPCB_FLAG_MINCUT, yy_pcb_flags), RND_POL_OVERWRITE); CONF_SET(settings_dest, "editor/show_number", -1, CONF_BOOL_FLAG(PCB_SHOWNUMBERFLAG, yy_pcb_flags), RND_POL_OVERWRITE); Index: parse_y.c =================================================================== --- parse_y.c (revision 30948) +++ parse_y.c (revision 30949) @@ -1843,7 +1843,7 @@ { pcb_board_t *pcb_save = PCB; if ((yy_settings_dest != RND_CFR_invalid) && (layer_group_string != NULL)) - pcb_conf_set(yy_settings_dest, "design/groups", -1, layer_group_string, RND_POL_OVERWRITE); + rnd_conf_set(yy_settings_dest, "design/groups", -1, layer_group_string, RND_POL_OVERWRITE); pcb_board_new_postproc(yyPCB, 0); if (layer_group_string == NULL) { if (pcb_layer_improvise(yyPCB, pcb_true) != 0) { @@ -2020,9 +2020,9 @@ yyPCB->hidlib.grid_oy = OU ((yyvsp[-2].measure)); if (yy_settings_dest != RND_CFR_invalid) { if ((yyvsp[-1].integer)) - pcb_conf_set(yy_settings_dest, "editor/draw_grid", -1, "true", RND_POL_OVERWRITE); + rnd_conf_set(yy_settings_dest, "editor/draw_grid", -1, "true", RND_POL_OVERWRITE); else - pcb_conf_set(yy_settings_dest, "editor/draw_grid", -1, "false", RND_POL_OVERWRITE); + rnd_conf_set(yy_settings_dest, "editor/draw_grid", -1, "false", RND_POL_OVERWRITE); } } #line 2029 "parse_y.c" /* yacc.c:1652 */ @@ -2036,9 +2036,9 @@ yyPCB->hidlib.grid_oy = NU ((yyvsp[-2].measure)); if (yy_settings_dest != RND_CFR_invalid) { if ((yyvsp[-1].integer)) - pcb_conf_set(yy_settings_dest, "editor/draw_grid", -1, "true", RND_POL_OVERWRITE); + rnd_conf_set(yy_settings_dest, "editor/draw_grid", -1, "true", RND_POL_OVERWRITE); else - pcb_conf_set(yy_settings_dest, "editor/draw_grid", -1, "false", RND_POL_OVERWRITE); + rnd_conf_set(yy_settings_dest, "editor/draw_grid", -1, "false", RND_POL_OVERWRITE); } } #line 2045 "parse_y.c" /* yacc.c:1652 */ @@ -3354,7 +3354,7 @@ { char tmp[128]; pcb_sprintf(tmp, "%$mm", crd); - pcb_conf_set(RND_CFR_DESIGN, path, -1, tmp, RND_POL_OVERWRITE); + rnd_conf_set(RND_CFR_DESIGN, path, -1, tmp, RND_POL_OVERWRITE); } static void load_meta_float(const char *path, double val) @@ -3361,5 +3361,5 @@ { char tmp[128]; pcb_sprintf(tmp, "%f", val); - pcb_conf_set(RND_CFR_DESIGN, path, -1, tmp, RND_POL_OVERWRITE); + rnd_conf_set(RND_CFR_DESIGN, path, -1, tmp, RND_POL_OVERWRITE); } Index: parse_y.y =================================================================== --- parse_y.y (revision 30948) +++ parse_y.y (revision 30949) @@ -191,7 +191,7 @@ { pcb_board_t *pcb_save = PCB; if ((yy_settings_dest != RND_CFR_invalid) && (layer_group_string != NULL)) - pcb_conf_set(yy_settings_dest, "design/groups", -1, layer_group_string, RND_POL_OVERWRITE); + rnd_conf_set(yy_settings_dest, "design/groups", -1, layer_group_string, RND_POL_OVERWRITE); pcb_board_new_postproc(yyPCB, 0); if (layer_group_string == NULL) { if (pcb_layer_improvise(yyPCB, pcb_true) != 0) { @@ -352,9 +352,9 @@ yyPCB->hidlib.grid_oy = OU ($5); if (yy_settings_dest != RND_CFR_invalid) { if ($6) - pcb_conf_set(yy_settings_dest, "editor/draw_grid", -1, "true", RND_POL_OVERWRITE); + rnd_conf_set(yy_settings_dest, "editor/draw_grid", -1, "true", RND_POL_OVERWRITE); else - pcb_conf_set(yy_settings_dest, "editor/draw_grid", -1, "false", RND_POL_OVERWRITE); + rnd_conf_set(yy_settings_dest, "editor/draw_grid", -1, "false", RND_POL_OVERWRITE); } } ; @@ -367,9 +367,9 @@ yyPCB->hidlib.grid_oy = NU ($5); if (yy_settings_dest != RND_CFR_invalid) { if ($6) - pcb_conf_set(yy_settings_dest, "editor/draw_grid", -1, "true", RND_POL_OVERWRITE); + rnd_conf_set(yy_settings_dest, "editor/draw_grid", -1, "true", RND_POL_OVERWRITE); else - pcb_conf_set(yy_settings_dest, "editor/draw_grid", -1, "false", RND_POL_OVERWRITE); + rnd_conf_set(yy_settings_dest, "editor/draw_grid", -1, "false", RND_POL_OVERWRITE); } } ; @@ -1450,7 +1450,7 @@ { char tmp[128]; pcb_sprintf(tmp, "%$mm", crd); - pcb_conf_set(RND_CFR_DESIGN, path, -1, tmp, RND_POL_OVERWRITE); + rnd_conf_set(RND_CFR_DESIGN, path, -1, tmp, RND_POL_OVERWRITE); } static void load_meta_float(const char *path, double val) @@ -1457,5 +1457,5 @@ { char tmp[128]; pcb_sprintf(tmp, "%f", val); - pcb_conf_set(RND_CFR_DESIGN, path, -1, tmp, RND_POL_OVERWRITE); + rnd_conf_set(RND_CFR_DESIGN, path, -1, tmp, RND_POL_OVERWRITE); }