Index: trunk/src/board.c =================================================================== --- trunk/src/board.c (revision 30948) +++ trunk/src/board.c (revision 30949) @@ -86,7 +86,7 @@ for(i = 0; i < PCB_NUM_NETLISTS; i++) pcb_netlist_init(&(ptr->netlist[i])); - pcb_conf_set(RND_CFR_INTERNAL, "design/poly_isle_area", -1, "200000000", RND_POL_OVERWRITE); + rnd_conf_set(RND_CFR_INTERNAL, "design/poly_isle_area", -1, "200000000", RND_POL_OVERWRITE); ptr->RatDraw = pcb_false; Index: trunk/src/brave.c =================================================================== --- trunk/src/brave.c (revision 30948) +++ trunk/src/brave.c (revision 30949) @@ -85,7 +85,7 @@ /* truncate last comma */ gds_truncate(&tmp, gds_len(&tmp)-1); - pcb_conf_set(RND_CFR_CLI, "rc/brave", 0, tmp.array, RND_POL_OVERWRITE); + rnd_conf_set(RND_CFR_CLI, "rc/brave", 0, tmp.array, RND_POL_OVERWRITE); gds_uninit(&tmp); } @@ -185,9 +185,9 @@ /* Copy the config from CLI to USER and flush the file */ static void brave_dialog_save(void *hid_ctx, void *caller_data, pcb_hid_attribute_t *attr) { - pcb_conf_set(RND_CFR_USER, "rc/brave", 0, conf_core.rc.brave, RND_POL_OVERWRITE); - if (pcb_conf_isdirty(RND_CFR_USER)) - pcb_conf_save_file(&PCB->hidlib, NULL, NULL, RND_CFR_USER, NULL); + rnd_conf_set(RND_CFR_USER, "rc/brave", 0, conf_core.rc.brave, RND_POL_OVERWRITE); + if (rnd_conf_isdirty(RND_CFR_USER)) + rnd_conf_save_file(&PCB->hidlib, NULL, NULL, RND_CFR_USER, NULL); } static int brave_interact(void) @@ -287,7 +287,7 @@ void pcb_brave_init(void) { - rnd_conf_native_t *n = pcb_conf_get_field("rc/brave"); + rnd_conf_native_t *n = rnd_conf_get_field("rc/brave"); brave_conf_id = pcb_conf_hid_reg(brave_cookie, NULL); if (n != NULL) { Index: trunk/src/conf_core.c =================================================================== --- trunk/src/conf_core.c (revision 30948) +++ trunk/src/conf_core.c (revision 30949) @@ -35,16 +35,16 @@ const char *dst_path = ndst->hash_path; gds_init(&tmp); - pcb_conf_print_native_field((conf_pfn)pcb_append_printf, &tmp, 0, &nlegacy->val, nlegacy->type, nlegacy->prop, 0); + rnd_conf_print_native_field((conf_pfn)pcb_append_printf, &tmp, 0, &nlegacy->val, nlegacy->type, nlegacy->prop, 0); if (tmp.used > 0) - pcb_conf_set(RND_CFR_INTERNAL, dst_path, -1, tmp.array, RND_POL_OVERWRITE); + rnd_conf_set(RND_CFR_INTERNAL, dst_path, -1, tmp.array, RND_POL_OVERWRITE); gds_uninit(&tmp); } void pcb_conf_legacy(const char *dst_path, const char *legacy_path) { - rnd_conf_native_t *nlegacy = pcb_conf_get_field(legacy_path); - rnd_conf_native_t *ndst = pcb_conf_get_field(dst_path); + rnd_conf_native_t *nlegacy = rnd_conf_get_field(legacy_path); + rnd_conf_native_t *ndst = rnd_conf_get_field(dst_path); if (nlegacy == NULL) { rnd_message(PCB_MSG_ERROR, "pcb_conf_legacy: invalid legacy path '%s' for %s\n", legacy_path, dst_path); return; @@ -65,12 +65,12 @@ conf_clamp_to(RND_CFT_COORD, conf_core.design.line_thickness, PCB_MIN_THICKNESS, PCB_MAX_THICKNESS, PCB_MIL_TO_COORD(10)); conf_force_set_bool(conf_core.rc.have_regex, 1); - pcb_conf_ro("rc/have_regex"); + rnd_conf_ro("rc/have_regex"); - conf_force_set_str(conf_core.rc.path.prefix, PCB_PREFIX); pcb_conf_ro("rc/path/prefix"); - conf_force_set_str(conf_core.rc.path.lib, PCBLIBDIR); pcb_conf_ro("rc/path/lib"); - conf_force_set_str(conf_core.rc.path.bin, BINDIR); pcb_conf_ro("rc/path/bin"); - conf_force_set_str(conf_core.rc.path.share, PCBSHAREDIR); pcb_conf_ro("rc/path/share"); + conf_force_set_str(conf_core.rc.path.prefix, PCB_PREFIX); rnd_conf_ro("rc/path/prefix"); + conf_force_set_str(conf_core.rc.path.lib, PCBLIBDIR); rnd_conf_ro("rc/path/lib"); + conf_force_set_str(conf_core.rc.path.bin, BINDIR); rnd_conf_ro("rc/path/bin"); + conf_force_set_str(conf_core.rc.path.share, PCBSHAREDIR); rnd_conf_ro("rc/path/share"); for(e = htpp_first(&legacy_new2old); e != NULL; e = htpp_next(&legacy_new2old, e)) { rnd_conf_native_t *nlegacy = e->value, *ndst = e->key; @@ -117,7 +117,7 @@ htpp_init(&legacy_old2new, ptrhash, ptrkeyeq); #define conf_reg(field,isarray,type_name,cpath,cname,desc,flags) \ - pcb_conf_reg_field(conf_core, field,isarray,type_name,cpath,cname,desc,flags); + rnd_conf_reg_field(conf_core, field,isarray,type_name,cpath,cname,desc,flags); #include "conf_core_fields.h" pcb_conf_core_postproc = conf_core_postproc; conf_core_postproc(); Index: trunk/src/file_act.c =================================================================== --- trunk/src/file_act.c (revision 30948) +++ trunk/src/file_act.c (revision 30949) @@ -166,7 +166,7 @@ pcb_draw_inhibit_dec(); pcb_set_design_dir(NULL); - pcb_conf_set(RND_CFR_DESIGN, "design/text_font_id", 0, "0", RND_POL_OVERWRITE); /* we have only one font now, make sure it is selected */ + rnd_conf_set(RND_CFR_DESIGN, "design/text_font_id", 0, "0", RND_POL_OVERWRITE); /* we have only one font now, make sure it is selected */ /* setup the new name and reset some values to default */ free(PCB->hidlib.name); Index: trunk/src/gui_act.c =================================================================== --- trunk/src/gui_act.c (revision 30948) +++ trunk/src/gui_act.c (revision 30949) @@ -112,9 +112,9 @@ if (id == F_SubcID) { /* change the displayed name of subcircuits */ if (argc > 1) - pcb_conf_set(RND_CFR_DESIGN, "editor/subc_id", -1, str_dir, RND_POL_OVERWRITE); + rnd_conf_set(RND_CFR_DESIGN, "editor/subc_id", -1, str_dir, RND_POL_OVERWRITE); else - pcb_conf_set(RND_CFR_DESIGN, "editor/subc_id", -1, "", RND_POL_OVERWRITE); + rnd_conf_set(RND_CFR_DESIGN, "editor/subc_id", -1, "", RND_POL_OVERWRITE); pcb_gui->invalidate_all(pcb_gui); /* doesn't change too often, isn't worth anything more complicated */ pcb_draw(); @@ -123,9 +123,9 @@ if (id == F_TermID) { /* change the displayed name of terminals */ if (argc > 1) - pcb_conf_set(RND_CFR_DESIGN, "editor/term_id", -1, str_dir, RND_POL_OVERWRITE); + rnd_conf_set(RND_CFR_DESIGN, "editor/term_id", -1, str_dir, RND_POL_OVERWRITE); else - pcb_conf_set(RND_CFR_DESIGN, "editor/term_id", -1, "", RND_POL_OVERWRITE); + rnd_conf_set(RND_CFR_DESIGN, "editor/term_id", -1, "", RND_POL_OVERWRITE); pcb_gui->invalidate_all(pcb_gui); /* doesn't change too often, isn't worth anything more complicated */ pcb_draw(); @@ -164,7 +164,7 @@ pcb_hid_notify_crosshair_change(RND_ACT_HIDLIB, pcb_false); pcb_conf_setf(RND_CFR_CLI, "editor/crosshair_shape_idx", 0, "%d", CrosshairShapeIncrement(pcbhl_conf.editor.crosshair_shape_idx)); if (pcb_ch_shape_NUM == pcbhl_conf.editor.crosshair_shape_idx) - pcb_conf_set(RND_CFR_CLI, "editor/crosshair_shape_idx", 0, "0", RND_POL_OVERWRITE); + rnd_conf_set(RND_CFR_CLI, "editor/crosshair_shape_idx", 0, "0", RND_POL_OVERWRITE); pcb_hid_notify_crosshair_change(RND_ACT_HIDLIB, pcb_true); break; @@ -1436,7 +1436,7 @@ tmp[0] = '0' + !conf_core.temp.clip_inhibit_chg; tmp[1] = '\0'; - pcb_conf_set(RND_CFR_CLI, "temp/clip_inhibit_chg", 0, tmp, RND_POL_OVERWRITE); + rnd_conf_set(RND_CFR_CLI, "temp/clip_inhibit_chg", 0, tmp, RND_POL_OVERWRITE); RND_ACT_IRES(0); Index: trunk/src/layer_vis.c =================================================================== --- trunk/src/layer_vis.c (revision 30948) +++ trunk/src/layer_vis.c (revision 30949) @@ -350,7 +350,7 @@ void pcb_layer_vis_init(void) { - rnd_conf_native_t *n_mask = pcb_conf_get_field("editor/show_mask"); + rnd_conf_native_t *n_mask = rnd_conf_get_field("editor/show_mask"); static conf_hid_callbacks_t cbs_mask; layer_vis_conf_id = pcb_conf_hid_reg(layer_vis_cookie, NULL); Index: trunk/src/librnd/core/actions.c =================================================================== --- trunk/src/librnd/core/actions.c (revision 30948) +++ trunk/src/librnd/core/actions.c (revision 30949) @@ -573,9 +573,9 @@ cli_push(pcbhl_conf.rc.cli_backend); cli_push(pcbhl_conf.rc.cli_prompt); - if (pcb_conf_set(RND_CFR_CLI, "rc/cli_backend", 0, backend, RND_POL_OVERWRITE) != 0) + if (rnd_conf_set(RND_CFR_CLI, "rc/cli_backend", 0, backend, RND_POL_OVERWRITE) != 0) return -1; - return pcb_conf_set(RND_CFR_CLI, "rc/cli_prompt", 0, prompt, RND_POL_OVERWRITE); + return rnd_conf_set(RND_CFR_CLI, "rc/cli_prompt", 0, prompt, RND_POL_OVERWRITE); } int rnd_cli_leave(void) @@ -584,15 +584,15 @@ char *prompt = NULL, *backend = NULL; prompt = cli_pop(); backend = cli_pop(); - pcb_conf_set(RND_CFR_CLI, "rc/cli_backend", 0, backend, RND_POL_OVERWRITE); - pcb_conf_set(RND_CFR_CLI, "rc/cli_prompt", 0, prompt, RND_POL_OVERWRITE); + rnd_conf_set(RND_CFR_CLI, "rc/cli_backend", 0, backend, RND_POL_OVERWRITE); + rnd_conf_set(RND_CFR_CLI, "rc/cli_prompt", 0, prompt, RND_POL_OVERWRITE); free(prompt); free(backend); return 0; } - pcb_conf_set(RND_CFR_CLI, "rc/cli_backend", 0, "", RND_POL_OVERWRITE); - pcb_conf_set(RND_CFR_CLI, "rc/cli_prompt", 0, "", RND_POL_OVERWRITE); + rnd_conf_set(RND_CFR_CLI, "rc/cli_backend", 0, "", RND_POL_OVERWRITE); + rnd_conf_set(RND_CFR_CLI, "rc/cli_prompt", 0, "", RND_POL_OVERWRITE); return -1; } Index: trunk/src/librnd/core/conf.c =================================================================== --- trunk/src/librnd/core/conf.c (revision 30948) +++ trunk/src/librnd/core/conf.c (revision 30949) @@ -108,7 +108,7 @@ return lht_dom_hash_get(cwd, pcb_conf_list_name); } -int pcb_conf_insert_tree_as(rnd_conf_role_t role, lht_node_t *root) +int rnd_conf_insert_tree_as(rnd_conf_role_t role, lht_node_t *root) { lht_doc_t *d; @@ -163,10 +163,10 @@ return d; } -int pcb_conf_load_as(rnd_conf_role_t role, const char *fn, int fn_is_text) +int rnd_conf_load_as(rnd_conf_role_t role, const char *fn, int fn_is_text) { lht_doc_t *d; - const char *ifn, *role_name = pcb_conf_role_name(role); + const char *ifn, *role_name = rnd_conf_role_name(role); if (pcb_conf_main_root_lock[role]) return -1; @@ -291,7 +291,7 @@ int res = conf_merge_plug(d, role, path); if (res) { char id[256]; - pcb_snprintf(id, sizeof(id), "%s:%s", pcb_conf_role_name(role), fn); + pcb_snprintf(id, sizeof(id), "%s:%s", rnd_conf_role_name(role), fn); pcb_file_loaded_set_at("conf/plugin", id, path, NULL); } cnt += res; @@ -324,7 +324,7 @@ return cnt; } -rnd_conf_native_type_t pcb_conf_native_type_parse(const char *s) +rnd_conf_native_type_t rnd_conf_native_type_parse(const char *s) { if (rnd_strcasecmp(s, "string") == 0) return RND_CFN_STRING; if (rnd_strcasecmp(s, "str") == 0) return RND_CFN_STRING; @@ -342,7 +342,7 @@ } -rnd_conf_policy_t pcb_conf_policy_parse(const char *s) +rnd_conf_policy_t rnd_conf_policy_parse(const char *s) { if (rnd_strcasecmp(s, "overwrite") == 0) return RND_POL_OVERWRITE; if (rnd_strcasecmp(s, "prepend") == 0) return RND_POL_PREPEND; @@ -351,7 +351,7 @@ return RND_POL_invalid; } -const char *pcb_conf_policy_name(rnd_conf_policy_t p) +const char *rnd_conf_policy_name(rnd_conf_policy_t p) { switch(p) { case RND_POL_OVERWRITE: return "overwrite"; @@ -363,7 +363,7 @@ return "(unknown)"; } -rnd_conf_role_t pcb_conf_role_parse(const char *s) +rnd_conf_role_t rnd_conf_role_parse(const char *s) { if (rnd_strcasecmp(s, "internal") == 0) return RND_CFR_INTERNAL; if (rnd_strcasecmp(s, "system") == 0) return RND_CFR_SYSTEM; @@ -376,7 +376,7 @@ return RND_CFR_invalid; } -const char *pcb_conf_role_name(rnd_conf_role_t r) +const char *rnd_conf_role_name(rnd_conf_role_t r) { switch(r) { case RND_CFR_INTERNAL: return "internal"; @@ -425,7 +425,7 @@ } /* convert policy */ - pol = pcb_conf_policy_parse(tmp); + pol = rnd_conf_policy_parse(tmp); if (pol == RND_POL_invalid) { pcb_hid_cfg_error(root, "Invalid policy in '%s', subtree is ignored\n", root->name); return; @@ -847,7 +847,7 @@ int pcb_conf_merge_patch_item(const char *path, lht_node_t *n, rnd_conf_role_t role, int default_prio, rnd_conf_policy_t default_policy) { - rnd_conf_native_t *target = pcb_conf_get_field(path); + rnd_conf_native_t *target = rnd_conf_get_field(path); int res = 0; if ((role == RND_CFR_DESIGN) || (role == RND_CFR_PROJECT)) { @@ -1076,7 +1076,7 @@ } } else { - n = pcb_conf_get_field(path); + n = rnd_conf_get_field(path); if (n == NULL) { char *path_, *field; path_ = rnd_strdup(path); @@ -1086,7 +1086,7 @@ if (field != NULL) { arr_idx = atoi(field+1); *field = '\0'; - n = pcb_conf_get_field(path_); + n = rnd_conf_get_field(path_); } /* if a valid node is found, update it */ @@ -1136,7 +1136,7 @@ ov = cwd->data.list.first; if (pol != POL_ANY) { for(; ov != NULL; ov = ov->next) - if (pcb_conf_policy_parse(ov->name) == pol) + if (rnd_conf_policy_parse(ov->name) == pol) break; } else @@ -1146,7 +1146,7 @@ lht_node_t *new_ov; if (!create) return NULL; - new_ov = lht_dom_node_alloc(LHT_HASH, pcb_conf_policy_name(pol)); + new_ov = lht_dom_node_alloc(LHT_HASH, rnd_conf_policy_name(pol)); lht_dom_list_append(cwd, new_ov); ov = new_ov; } @@ -1196,7 +1196,7 @@ r = lht_tree_path_(n->doc, n, lht_path, 1, 0, NULL); if ((r == NULL) && (create)) { - pcb_conf_set_dry(target, conf_path, -1, "", RND_POL_OVERWRITE, 0); + rnd_conf_set_dry(target, conf_path, -1, "", RND_POL_OVERWRITE, 0); r = lht_tree_path_(n->doc, n, lht_path, 1, 0, NULL); } @@ -1218,7 +1218,7 @@ if (pcb_conf_main_root[target] == NULL) { if (!create) return NULL; - pcb_conf_reset(target, ""); + rnd_conf_reset(target, ""); } end = strchr(path, '['); if (end == NULL) { @@ -1243,20 +1243,20 @@ } -void pcb_conf_load_all(const char *project_fn, const char *pcb_fn) +void rnd_conf_load_all(const char *project_fn, const char *pcb_fn) { const char *pc, *try; /* the ultimate fallback: all essential values are built in the executable on a low priority */ - pcb_conf_load_as(RND_CFR_INTERNAL, pcb_conf_internal, 1); + rnd_conf_load_as(RND_CFR_INTERNAL, pcb_conf_internal, 1); /* load config files */ - pcb_conf_load_as(RND_CFR_SYSTEM, pcbhl_conf_sys_path, 0); - pcb_conf_load_as(RND_CFR_USER, pcphl_conf_user_path, 0); + rnd_conf_load_as(RND_CFR_SYSTEM, pcbhl_conf_sys_path, 0); + rnd_conf_load_as(RND_CFR_USER, pcphl_conf_user_path, 0); pc = pcb_conf_get_project_conf_name(project_fn, pcb_fn, &try); if (pc != NULL) - pcb_conf_load_as(RND_CFR_PROJECT, pc, 0); + rnd_conf_load_as(RND_CFR_PROJECT, pc, 0); pcb_conf_merge_all(NULL); /* create the user config (in-memory-lht) if it does not exist on disk; @@ -1263,12 +1263,12 @@ this is needed so if the user makes config changes from the GUI things get saved. */ if (pcb_conf_main_root[RND_CFR_USER] == NULL) - pcb_conf_reset(RND_CFR_USER, pcphl_conf_user_path); + rnd_conf_reset(RND_CFR_USER, pcphl_conf_user_path); pcb_conf_in_production = 1; } -void pcb_conf_load_extra(const char *project_fn, const char *pcb_fn) +void rnd_conf_load_extra(const char *project_fn, const char *pcb_fn) { int cnt; cnt = conf_load_plug_files(RND_CFR_SYSTEM, pcbhl_conf_sysdir_path); @@ -1279,7 +1279,7 @@ } -void pcb_conf_load_project(const char *project_fn, const char *pcb_fn) +void rnd_conf_load_project(const char *project_fn, const char *pcb_fn) { const char *pc, *try; @@ -1287,14 +1287,14 @@ pc = pcb_conf_get_project_conf_name(project_fn, pcb_fn, &try); if (pc != NULL) - if (pcb_conf_load_as(RND_CFR_PROJECT, pc, 0) != 0) + if (rnd_conf_load_as(RND_CFR_PROJECT, pc, 0) != 0) pc = NULL; if (pc == NULL) - pcb_conf_reset(RND_CFR_PROJECT, ""); + rnd_conf_reset(RND_CFR_PROJECT, ""); pcb_conf_update(NULL, -1); } -rnd_conf_native_t *pcb_conf_reg_field_(void *value, int array_size, rnd_conf_native_type_t type, const char *path, const char *desc, rnd_conf_flag_t flags) +rnd_conf_native_t *rnd_conf_reg_field_(void *value, int array_size, rnd_conf_native_type_t type, const char *path, const char *desc, rnd_conf_flag_t flags) { rnd_conf_native_t *node; @@ -1368,7 +1368,7 @@ free(node); } -void pcb_conf_unreg_fields(const char *prefix) +void rnd_conf_unreg_fields(const char *prefix) { int len = strlen(prefix); htsp_entry_t *e; @@ -1383,7 +1383,7 @@ } } -void pcb_conf_unreg_field(rnd_conf_native_t *field) +void rnd_conf_unreg_field(rnd_conf_native_t *field) { htsp_pop(pcb_conf_fields, field->hash_path); pcb_conf_free_native(field); @@ -1390,12 +1390,12 @@ } -rnd_conf_native_t *pcb_conf_get_field(const char *path) +rnd_conf_native_t *rnd_conf_get_field(const char *path) { return htsp_get(pcb_conf_fields, path); } -int pcb_conf_set_dry(rnd_conf_role_t target, const char *path_, int arr_idx, const char *new_val, rnd_conf_policy_t pol, int mkdirp) +int rnd_conf_set_dry(rnd_conf_role_t target, const char *path_, int arr_idx, const char *new_val, rnd_conf_policy_t pol, int mkdirp) { char *path, *basename, *next, *last, *sidx; rnd_conf_native_t *nat; @@ -1429,7 +1429,7 @@ else if (arr_idx >= 0) idx = arr_idx; - nat = pcb_conf_get_field(path); + nat = rnd_conf_get_field(path); if (nat == NULL) { free(path); return -1; @@ -1456,7 +1456,7 @@ } if (idx >= nat->array_size) { - rnd_message(PCB_MSG_ERROR, "Error: can't pcb_conf_set() %s[%d]: %d is beyond the end of the array (%d)\n", path, idx, idx, nat->array_size); + rnd_message(PCB_MSG_ERROR, "Error: can't rnd_conf_set() %s[%d]: %d is beyond the end of the array (%d)\n", path, idx, idx, nat->array_size); free(path); return -1; } @@ -1616,10 +1616,10 @@ return 0; } -int pcb_conf_set(rnd_conf_role_t target, const char *path, int arr_idx, const char *new_val, rnd_conf_policy_t pol) +int rnd_conf_set(rnd_conf_role_t target, const char *path, int arr_idx, const char *new_val, rnd_conf_policy_t pol) { int res; - res = pcb_conf_set_dry(target, path, arr_idx, new_val, pol, 1); + res = rnd_conf_set_dry(target, path, arr_idx, new_val, pol, 1); if (res < 0) return res; pcb_conf_update(path, arr_idx); @@ -1626,10 +1626,10 @@ return 0; } -int pcb_conf_del(rnd_conf_role_t target, const char *path, int arr_idx) +int rnd_conf_del(rnd_conf_role_t target, const char *path, int arr_idx) { int res; - res = pcb_conf_set_dry(target, path, arr_idx, NULL, RND_POL_OVERWRITE, 0); + res = rnd_conf_set_dry(target, path, arr_idx, NULL, RND_POL_OVERWRITE, 0); if (res < 0) return res; pcb_conf_update(path, arr_idx); @@ -1636,15 +1636,15 @@ return 0; } -int pcb_conf_grow(const char *path, int new_size) +int rnd_conf_grow(const char *path, int new_size) { - rnd_conf_native_t *nat = pcb_conf_get_field(path); + rnd_conf_native_t *nat = rnd_conf_get_field(path); if (nat == NULL) return -1; return pcb_conf_grow_list_(nat, new_size); } -int pcb_conf_set_native(rnd_conf_native_t *field, int arr_idx, const char *new_val) +int rnd_conf_set_native(rnd_conf_native_t *field, int arr_idx, const char *new_val) { lht_node_t *node; @@ -1661,7 +1661,7 @@ } -int pcb_conf_set_from_cli(const char *prefix, const char *arg_, const char *val, const char **why) +int rnd_conf_set_from_cli(const char *prefix, const char *arg_, const char *val, const char **why) { char *arg = NULL, *op, *s; const char *sc; @@ -1703,7 +1703,7 @@ return -1; } if (op == NULL) { - rnd_conf_native_t *n = pcb_conf_get_field(arg); + rnd_conf_native_t *n = rnd_conf_get_field(arg); if ((n == NULL) || (n->type != RND_CFN_BOOLEAN)) { free(arg); *why = "value not specified for non-boolean variable; syntax is path=val"; @@ -1724,7 +1724,7 @@ /* now that we have a clean path (arg) and a value, try to set the config */ pcb_conf_lht_get_first_pol(RND_CFR_CLI, pol, 1); /* make sure the root for the given policy is created */ - ret = pcb_conf_set(RND_CFR_CLI, arg, -1, val, pol); + ret = rnd_conf_set(RND_CFR_CLI, arg, -1, val, pol); if (ret != 0) *why = "invalid config path"; @@ -1732,7 +1732,7 @@ return ret; } -int pcb_conf_parse_arguments(const char *prefix, int *argc, char ***argv) +int rnd_conf_parse_arguments(const char *prefix, int *argc, char ***argv) { int n, dst; @@ -1744,9 +1744,9 @@ if (a[0] == '-') a++; if (a[0] == '-') a++; - try_again = pcb_conf_set_from_cli(prefix, a, NULL, &why); + try_again = rnd_conf_set_from_cli(prefix, a, NULL, &why); if (try_again && (n < (*argc) - 1)) { - try_again = pcb_conf_set_from_cli(prefix, a, (*argv)[n+1], &why); + try_again = rnd_conf_set_from_cli(prefix, a, (*argv)[n+1], &why); if (!try_again) n++; } @@ -1795,7 +1795,7 @@ } } -int pcb_conf_replace_subtree(rnd_conf_role_t dst_role, const char *dst_path, rnd_conf_role_t src_role, const char *src_path) +int rnd_conf_replace_subtree(rnd_conf_role_t dst_role, const char *dst_path, rnd_conf_role_t src_role, const char *src_path) { lht_node_t *dst = pcb_conf_lht_get_at(dst_role, dst_path, 1); lht_node_t *src, *new_src = NULL; @@ -1804,7 +1804,7 @@ char *name; lht_node_t *ch = NULL; int isarr, i; - rnd_conf_native_t *n = pcb_conf_get_field(src_path); + rnd_conf_native_t *n = rnd_conf_get_field(src_path); if (n == NULL) return -1; @@ -1831,7 +1831,7 @@ } } else { - pcb_conf_print_native_field((conf_pfn)pcb_append_printf, &s, 0, &n->val, n->type, n->prop+i, i); + rnd_conf_print_native_field((conf_pfn)pcb_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) @@ -1878,7 +1878,7 @@ } -int pcb_conf_save_file(rnd_hidlib_t *hidlib, const char *project_fn, const char *pcb_fn, rnd_conf_role_t role, const char *fn) +int rnd_conf_save_file(rnd_hidlib_t *hidlib, const char *project_fn, const char *pcb_fn, rnd_conf_role_t role, const char *fn) { int fail = 1; lht_node_t *r = pcb_conf_lht_get_first(role, 0); @@ -2025,27 +2025,27 @@ return buff->array; } -void pcb_conf_lock(rnd_conf_role_t target) +void rnd_conf_lock(rnd_conf_role_t target) { pcb_conf_main_root_lock[target] = 1; } -void pcb_conf_unlock(rnd_conf_role_t target) +void rnd_conf_unlock(rnd_conf_role_t target) { pcb_conf_main_root_lock[target] = 0; } -int pcb_conf_islocked(rnd_conf_role_t target) +int rnd_conf_islocked(rnd_conf_role_t target) { return pcb_conf_main_root_lock[target]; } -int pcb_conf_isdirty(rnd_conf_role_t target) +int rnd_conf_isdirty(rnd_conf_role_t target) { return pcb_conf_lht_dirty[target]; } -void pcb_conf_makedirty(rnd_conf_role_t target) +void rnd_conf_makedirty(rnd_conf_role_t target) { pcb_conf_lht_dirty[target]++; } @@ -2063,7 +2063,7 @@ return RND_CFR_invalid; } -void pcb_conf_reset(rnd_conf_role_t target, const char *source_fn) +void rnd_conf_reset(rnd_conf_role_t target, const char *source_fn) { lht_node_t *n; @@ -2103,7 +2103,7 @@ } \ } while(0) -int pcb_conf_print_native_field(conf_pfn pfn, void *ctx, int verbose, rnd_confitem_t *val, rnd_conf_native_type_t type, rnd_confprop_t *prop, int idx) +int rnd_conf_print_native_field(conf_pfn pfn, void *ctx, int verbose, rnd_confitem_t *val, rnd_conf_native_type_t type, rnd_confprop_t *prop, int idx) { int ret = 0; switch(type) { @@ -2121,7 +2121,7 @@ if (pcb_conflist_length(val->list) > 0) { ret += pfn(ctx, "{"); for(n = pcb_conflist_first(val->list); n != NULL; n = pcb_conflist_next(n)) { - pcb_conf_print_native_field(pfn, ctx, verbose, &n->val, n->type, &n->prop, 0); + rnd_conf_print_native_field(pfn, ctx, verbose, &n->val, n->type, &n->prop, 0); ret += pfn(ctx, ";"); } ret += pfn(ctx, "}"); @@ -2146,7 +2146,7 @@ return ret; } -int pcb_conf_print_native(conf_pfn pfn, void *ctx, const char * prefix, int verbose, rnd_conf_native_t *node) +int rnd_conf_print_native(conf_pfn pfn, void *ctx, const char * prefix, int verbose, rnd_conf_native_t *node) { int ret = 0; if ((node->used <= 0) && (!verbose)) @@ -2158,7 +2158,7 @@ for(n = 0; n < node->used; n++) { if (verbose) ret += pfn(ctx, "%s I %s[%d] = ", prefix, node->hash_path, n); - ret += pcb_conf_print_native_field(pfn, ctx, verbose, &node->val, node->type, node->prop, n); + ret += rnd_conf_print_native_field(pfn, ctx, verbose, &node->val, node->type, node->prop, n); if (verbose) ret += pfn(ctx, " conf_rev=%d\n", node->rnd_conf_rev); else @@ -2174,7 +2174,7 @@ else { if (verbose) ret += pfn(ctx, "%s I %s = ", prefix, node->hash_path); - ret += pcb_conf_print_native_field(pfn, ctx, verbose, &node->val, node->type, node->prop, 0); + ret += rnd_conf_print_native_field(pfn, ctx, verbose, &node->val, node->type, node->prop, 0); if (verbose) ret += pfn(ctx, " conf_rev=%d\n", node->rnd_conf_rev); } @@ -2184,17 +2184,17 @@ /****************/ -void pcb_conf_init(void) +void rnd_conf_init(void) { - pcb_conf_reset(RND_CFR_ENV, ""); - pcb_conf_reset(RND_CFR_CLI, ""); - pcb_conf_reset(RND_CFR_DESIGN, ""); + rnd_conf_reset(RND_CFR_ENV, ""); + rnd_conf_reset(RND_CFR_CLI, ""); + rnd_conf_reset(RND_CFR_DESIGN, ""); - pcb_conf_reset(RND_CFR_file, ""); - pcb_conf_reset(RND_CFR_binary, ""); + rnd_conf_reset(RND_CFR_file, ""); + rnd_conf_reset(RND_CFR_binary, ""); } -void pcb_conf_uninit(void) +void rnd_conf_uninit(void) { int n; htsp_entry_t *e; @@ -2232,7 +2232,7 @@ tmp = pcb_strdup_vprintf(fmt, ap); va_end(ap); - pcb_conf_set(role, path, idx, tmp, RND_POL_OVERWRITE); + rnd_conf_set(role, path, idx, tmp, RND_POL_OVERWRITE); free(tmp); } @@ -2239,7 +2239,7 @@ int pcb_conf_resolve(pcb_conf_resolve_t *res) { - res->nat = pcb_conf_get_field(res->path); + res->nat = rnd_conf_get_field(res->path); if (res->nat == NULL) return 0; if ((res->type != res->nat->type) || (!res->allow_array && (res->nat->array_size > 1))) { @@ -2257,9 +2257,9 @@ return cnt; } -void pcb_conf_ro(const char *path) +void rnd_conf_ro(const char *path) { - rnd_conf_native_t *n = pcb_conf_get_field(path); + rnd_conf_native_t *n = rnd_conf_get_field(path); if (n != NULL) { n->used = 1; n->random_flags.read_only = 1; Index: trunk/src/librnd/core/conf.h =================================================================== --- trunk/src/librnd/core/conf.h (revision 30948) +++ trunk/src/librnd/core/conf.h (revision 30949) @@ -154,64 +154,64 @@ extern const int rnd_conf_default_prio[]; extern long rnd_conf_main_root_replace_cnt[RND_CFR_max_alloc]; /* number of times the root has been replaced */ -void pcb_conf_init(void); -void pcb_conf_uninit(void); +void rnd_conf_init(void); +void rnd_conf_uninit(void); /* Load all config files from disk into memory-lht and run pcb_conf_update to get the binary representation updated. Called only once, from main.c. Switches the conf system into production mode - new plugins registering new internal files will get special treat after this. */ -void pcb_conf_load_all(const char *project_fn, const char *pcb_fn); +void rnd_conf_load_all(const char *project_fn, const char *pcb_fn); -/* Set to 1 after pcb_conf_load_all() to indicate that the in-memory conf +/* Set to 1 after rnd_conf_load_all() to indicate that the in-memory conf system is complete; any new plugin registering new conf will need to trigger a refresh */ extern int pcb_conf_in_production; /* Load a file or a string as a role */ -int pcb_conf_load_as(rnd_conf_role_t role, const char *fn, int fn_is_text); +int rnd_conf_load_as(rnd_conf_role_t role, const char *fn, int fn_is_text); /* copy root to be the new config of role; root must be a li:pcb-rnd-conf-v1 return 0 on success and removes/invalidates root */ -int pcb_conf_insert_tree_as(rnd_conf_role_t role, lht_node_t *root); +int rnd_conf_insert_tree_as(rnd_conf_role_t role, lht_node_t *root); /* Load a project file into RND_CFR_PROJECT. Both project_fn and pcb_fn can't be NULL. Leaves an initialized but empty RND_CFR_PROJECT root if no project file was found. Runs pcb_conf_update(NULL); */ -void pcb_conf_load_project(const char *project_fn, const char *pcb_fn); +void rnd_conf_load_project(const char *project_fn, const char *pcb_fn); -void pcb_conf_load_extra(const char *project_fn, const char *pcb_fn); +void rnd_conf_load_extra(const char *project_fn, const char *pcb_fn); /* Update the binary representation from the memory-lht representation */ void pcb_conf_update(const char *path, int arr_idx); -rnd_conf_native_t *pcb_conf_get_field(const char *path); -rnd_conf_native_t *pcb_conf_reg_field_(void *value, int array_size, rnd_conf_native_type_t type, const char *path, const char *desc, rnd_conf_flag_t flags); +rnd_conf_native_t *rnd_conf_get_field(const char *path); +rnd_conf_native_t *rnd_conf_reg_field_(void *value, int array_size, rnd_conf_native_type_t type, const char *path, const char *desc, rnd_conf_flag_t flags); -void pcb_conf_unreg_field(rnd_conf_native_t *field); -void pcb_conf_unreg_fields(const char *prefix); +void rnd_conf_unreg_field(rnd_conf_native_t *field); +void rnd_conf_unreg_fields(const char *prefix); /* Set the value of path[arr_idx] in memory-lht role target to new_val using policy pol. Only lists should be indexed. Indexing can be a [n] suffix on path or a non-negative arr_idx. Updates the in-memory binary as well. If new_val is NULL, the selected subtree is removed from the lihata document. */ -int pcb_conf_set(rnd_conf_role_t target, const char *path, int arr_idx, const char *new_val, rnd_conf_policy_t pol); +int rnd_conf_set(rnd_conf_role_t target, const char *path, int arr_idx, const char *new_val, rnd_conf_policy_t pol); /* Remove the subtree of path[arr_idx] in memory-lht role target. Same considerations as in pcb_conf_set. */ -int pcb_conf_del(rnd_conf_role_t target, const char *path, int arr_idx); +int rnd_conf_del(rnd_conf_role_t target, const char *path, int arr_idx); /* Increase the size of a list (array) to new_size; returns 0 on success */ -int pcb_conf_grow(const char *path, int new_size); +int rnd_conf_grow(const char *path, int new_size); /* Same as pcb_conf_set, but without updating the binary - useful for multiple pcb_conf_set_dry calls and a single all-tree conf_udpate(NULL) for transactions. If mkdirp is non-zero, automatically create the policy subtree if it doesn't exist. */ -int pcb_conf_set_dry(rnd_conf_role_t target, const char *path_, int arr_idx, const char *new_val, rnd_conf_policy_t pol, int mkdirp); +int rnd_conf_set_dry(rnd_conf_role_t target, const char *path_, int arr_idx, const char *new_val, rnd_conf_policy_t pol, int mkdirp); /* Same as pcb_conf_set, but doesn't look up where to set things: change the value of the lihata node backing the native field */ -int pcb_conf_set_native(rnd_conf_native_t *field, int arr_idx, const char *new_val); +int rnd_conf_set_native(rnd_conf_native_t *field, int arr_idx, const char *new_val); /* Process a command line argument arg_ (if val == NULL) or a pair of command line arguments arg_ and val. In the first case assume arg_ has both a config path @@ -219,35 +219,35 @@ is always the value. If prefix is not NULL, the path is prefixed with it. On error always set *why to a const string reason. Returns 0 on success. */ -int pcb_conf_set_from_cli(const char *prefix, const char *arg_, const char *val, const char **why); +int rnd_conf_set_from_cli(const char *prefix, const char *arg_, const char *val, const char **why); /* Attempt to consume argv[] using pcb_conf_set_from_cli */ -int pcb_conf_parse_arguments(const char *prefix, int *argc, char ***argv); +int rnd_conf_parse_arguments(const char *prefix, int *argc, char ***argv); -#define pcb_conf_reg_field_array(globvar, field, type_name, path, desc, flags) \ - pcb_conf_reg_field_((void *)&globvar.field, (sizeof(globvar.field) / sizeof(globvar.field[0])), type_name, path, desc, flags) +#define rnd_conf_reg_field_array(globvar, field, type_name, path, desc, flags) \ + rnd_conf_reg_field_((void *)&globvar.field, (sizeof(globvar.field) / sizeof(globvar.field[0])), type_name, path, desc, flags) -#define pcb_conf_reg_field_scalar(globvar, field, type_name, path, desc, flags) \ - pcb_conf_reg_field_((void *)&globvar.field, 1, type_name, path, desc, flags) +#define rnd_conf_reg_field_scalar(globvar, field, type_name, path, desc, flags) \ + rnd_conf_reg_field_((void *)&globvar.field, 1, type_name, path, desc, flags) /* register a config field, array or scalar, selecting the right macro */ -#define pcb_conf_reg_field(globvar, field,isarray,type_name,cpath,cname, desc, flags) \ - pcb_conf_reg_field_ ## isarray(globvar, field,type_name,cpath "/" cname, desc, flags) +#define rnd_conf_reg_field(globvar, field,isarray,type_name,cpath,cname, desc, flags) \ + rnd_conf_reg_field_ ## isarray(globvar, field,type_name,cpath "/" cname, desc, flags) /* convert type name t type - return RND_CFN_max on error */ -rnd_conf_native_type_t pcb_conf_native_type_parse(const char *s); +rnd_conf_native_type_t rnd_conf_native_type_parse(const char *s); /* convert a policy text to policy value - return RND_POL_invalid on error */ -rnd_conf_policy_t pcb_conf_policy_parse(const char *s); +rnd_conf_policy_t rnd_conf_policy_parse(const char *s); /* Return the name of the policy - always a static string, even for invalid roles */ -const char *pcb_conf_policy_name(rnd_conf_policy_t p); +const char *rnd_conf_policy_name(rnd_conf_policy_t p); /* convert a role text to role value - return RND_CFR_invalid on error */ -rnd_conf_role_t pcb_conf_role_parse(const char *s); +rnd_conf_role_t rnd_conf_role_parse(const char *s); /* Return the name of the role - always a static string, even for invalid roles */ -const char *pcb_conf_role_name(rnd_conf_role_t r); +const char *rnd_conf_role_name(rnd_conf_role_t r); /* Lock/unlock the structure of a role. In a locked role value of existing fields may be modified but the structure of the tree is static (can't @@ -255,26 +255,26 @@ only a subset of settings: it can build the RND_CFR_DESIGN tree, lock it so settings that it wouldn't know how to save won't appear. NOTE: io_pcb supports all settings via attributes so does not lock. */ -void pcb_conf_lock(rnd_conf_role_t target); -void pcb_conf_unlock(rnd_conf_role_t target); +void rnd_conf_lock(rnd_conf_role_t target); +void rnd_conf_unlock(rnd_conf_role_t target); /* replace dst_role:dst_path with a copy of src_role:src_path */ -int pcb_conf_replace_subtree(rnd_conf_role_t dst_role, const char *dst_path, rnd_conf_role_t src_role, const char *src_path); +int rnd_conf_replace_subtree(rnd_conf_role_t dst_role, const char *dst_path, rnd_conf_role_t src_role, const char *src_path); /* Throw out a subtree (remove all nodes from the lihata representation). Useful for io_ plugins, on RND_CFR_DESIGN, before loading a new file. */ -void pcb_conf_reset(rnd_conf_role_t target, const char *source_fn); +void rnd_conf_reset(rnd_conf_role_t target, const char *source_fn); /* Save an in-memory lihata representation to the disk */ -int pcb_conf_save_file(rnd_hidlib_t *hidlib, const char *project_fn, const char *pcb_fn, rnd_conf_role_t role, const char *fn); +int rnd_conf_save_file(rnd_hidlib_t *hidlib, const char *project_fn, const char *pcb_fn, rnd_conf_role_t role, const char *fn); /* Returns whether a given lihata tree is locked */ -int pcb_conf_islocked(rnd_conf_role_t target); +int rnd_conf_islocked(rnd_conf_role_t target); /* Returns whether a given lihata tree has changed since load or last save */ -int pcb_conf_isdirty(rnd_conf_role_t target); -void pcb_conf_makedirty(rnd_conf_role_t target); +int rnd_conf_isdirty(rnd_conf_role_t target); +void rnd_conf_makedirty(rnd_conf_role_t target); /* all configuration fields ever seen */ extern htsp_t *pcb_conf_fields; @@ -287,15 +287,15 @@ a single element of an array, but prints lists as lists. Returns the sum of conf_pfn call return values - this is usually the number of bytes printed. */ -int pcb_conf_print_native_field(conf_pfn pfn, void *ctx, int verbose, rnd_confitem_t *val, rnd_conf_native_type_t type, rnd_confprop_t *prop, int idx); +int rnd_conf_print_native_field(conf_pfn pfn, void *ctx, int verbose, rnd_confitem_t *val, rnd_conf_native_type_t type, rnd_confprop_t *prop, int idx); /* Prints the value of a node in a form that is suitable for lihata. Prints full arrays. Returns the sum of conf_pfn call return values - this is usually the number of bytes printed. */ -int pcb_conf_print_native(conf_pfn pfn, void *ctx, const char * prefix, int verbose, rnd_conf_native_t *node); +int rnd_conf_print_native(conf_pfn pfn, void *ctx, const char * prefix, int verbose, rnd_conf_native_t *node); /* Mark a path read-only */ -void pcb_conf_ro(const char *path); +void rnd_conf_ro(const char *path); /****** utility ******/ @@ -336,10 +336,10 @@ pcb_conf_setf(RND_CFR_DESIGN, path, -1, fmt, new_val) #define conf_set_editor(field, val) \ - pcb_conf_set(RND_CFR_DESIGN, "editor/" #field, -1, val ? "1" : "0", RND_POL_OVERWRITE) + rnd_conf_set(RND_CFR_DESIGN, "editor/" #field, -1, val ? "1" : "0", RND_POL_OVERWRITE) #define conf_set_editor_(sfield, val) \ - pcb_conf_set(RND_CFR_DESIGN, sfield, -1, val ? "1" : "0", RND_POL_OVERWRITE) + rnd_conf_set(RND_CFR_DESIGN, sfield, -1, val ? "1" : "0", RND_POL_OVERWRITE) #define conf_toggle_editor(field) \ conf_set_editor(field, !conf_core.editor.field) Index: trunk/src/librnd/core/conf_act.c =================================================================== --- trunk/src/librnd/core/conf_act.c (revision 30948) +++ trunk/src/librnd/core/conf_act.c (revision 30949) @@ -77,7 +77,7 @@ return FGW_ERR_ARGC; } if (argc > 4) { - role = pcb_conf_role_parse(a3); + role = rnd_conf_role_parse(a3); if (role == RND_CFR_invalid) { rnd_message(PCB_MSG_ERROR, "Invalid role: '%s'", a3); return FGW_ERR_ARG_CONV; @@ -84,7 +84,7 @@ } } if (argc > 5) { - pol = pcb_conf_policy_parse(a4); + pol = rnd_conf_policy_parse(a4); if (pol == RND_POL_invalid) { rnd_message(PCB_MSG_ERROR, "Invalid policy: '%s'", a4); return FGW_ERR_ARG_CONV; @@ -96,7 +96,7 @@ if (op == F_Delta) { double d; char *end; - rnd_conf_native_t *n = pcb_conf_get_field(a1); + rnd_conf_native_t *n = rnd_conf_get_field(a1); if (n == 0) { rnd_message(PCB_MSG_ERROR, "Can't delta-set '%s': no such path\n", argv[1]); @@ -123,16 +123,16 @@ } if (role == RND_CFR_invalid) { - rnd_conf_native_t *n = pcb_conf_get_field(a1); + rnd_conf_native_t *n = rnd_conf_get_field(a1); if (n == NULL) { rnd_message(PCB_MSG_ERROR, "Invalid conf field '%s': no such path\n", a1); return FGW_ERR_ARG_CONV; } - rs = pcb_conf_set_native(n, 0, val); + rs = rnd_conf_set_native(n, 0, val); pcb_conf_update(a1, 0); } else - rs = pcb_conf_set(role, path, -1, val, pol); + rs = rnd_conf_set(role, path, -1, val, pol); if (rs != 0) { rnd_message(PCB_MSG_ERROR, "conf(set) failed.\n"); @@ -153,7 +153,7 @@ path = a1; val = a2; - n = pcb_conf_get_field(a1); + n = rnd_conf_get_field(a1); if (n == NULL) { if (pcbhl_conf.rc.verbose) rnd_message(PCB_MSG_ERROR, "Invalid conf field '%s' in iseq: no such path\n", path); @@ -161,7 +161,7 @@ } gds_init(&nval); - pcb_conf_print_native_field(conf_iseq_pf, &nval, 0, &n->val, n->type, NULL, 0); + rnd_conf_print_native_field(conf_iseq_pf, &nval, 0, &n->val, n->type, NULL, 0); rs = !strcmp(nval.array, val); /* printf("iseq: %s %s==%s %d\n", path, nval.array, val, rs);*/ gds_uninit(&nval); @@ -171,7 +171,7 @@ } else if (op == F_Toggle) { - rnd_conf_native_t *n = pcb_conf_get_field(a1); + rnd_conf_native_t *n = rnd_conf_get_field(a1); const char *new_value; rnd_conf_role_t role = RND_CFR_invalid; int res; @@ -189,7 +189,7 @@ return FGW_ERR_UNKNOWN; } if (argc > 3) { - role = pcb_conf_role_parse(a2); + role = rnd_conf_role_parse(a2); if (role == RND_CFR_invalid) { rnd_message(PCB_MSG_ERROR, "Invalid role: '%s'", a2); return FGW_ERR_ARG_CONV; @@ -200,9 +200,9 @@ else new_value = "true"; if (role == RND_CFR_invalid) - res = pcb_conf_set_native(n, 0, new_value); + res = rnd_conf_set_native(n, 0, new_value); else - res = pcb_conf_set(role, a1, -1, new_value, RND_POL_OVERWRITE); + res = rnd_conf_set(role, a1, -1, new_value, RND_POL_OVERWRITE); if (res != 0) { rnd_message(PCB_MSG_ERROR, "Can not toggle '%s': failed to set new value\n", a1); @@ -213,12 +213,12 @@ else if (op == F_Reset) { rnd_conf_role_t role; - role = pcb_conf_role_parse(a1); + role = rnd_conf_role_parse(a1); if (role == RND_CFR_invalid) { rnd_message(PCB_MSG_ERROR, "Invalid role: '%s'", a1); return FGW_ERR_ARG_CONV; } - pcb_conf_reset(role, ""); + rnd_conf_reset(role, ""); pcb_conf_update(a1, -1); } Index: trunk/src/librnd/core/gui_act.c =================================================================== --- trunk/src/librnd/core/gui_act.c (revision 30948) +++ trunk/src/librnd/core/gui_act.c (revision 30949) @@ -117,9 +117,9 @@ if ((cmd == NULL) || (rnd_strcasecmp(cmd, "Toggle") == 0)) pcb_conf_setf(RND_CFR_DESIGN, "editor/fullscreen", -1, "%d", !pcbhl_conf.editor.fullscreen, RND_POL_OVERWRITE); else if (rnd_strcasecmp(cmd, "On") == 0) - pcb_conf_set(RND_CFR_DESIGN, "editor/fullscreen", -1, "1", RND_POL_OVERWRITE); + rnd_conf_set(RND_CFR_DESIGN, "editor/fullscreen", -1, "1", RND_POL_OVERWRITE); else if (rnd_strcasecmp(cmd, "Off") == 0) - pcb_conf_set(RND_CFR_DESIGN, "editor/fullscreen", -1, "0", RND_POL_OVERWRITE); + rnd_conf_set(RND_CFR_DESIGN, "editor/fullscreen", -1, "0", RND_POL_OVERWRITE); else RND_ACT_FAIL(FullScreen); Index: trunk/src/librnd/core/hid_init.c =================================================================== --- trunk/src/librnd/core/hid_init.c (revision 30948) +++ trunk/src/librnd/core/hid_init.c (revision 30949) @@ -299,7 +299,7 @@ void pcbhl_conf_postproc(void) { - conf_force_set_str(pcbhl_conf.rc.path.home, get_homedir()); pcb_conf_ro("rc/path/home"); + conf_force_set_str(pcbhl_conf.rc.path.home, get_homedir()); rnd_conf_ro("rc/path/home"); } void pcb_hidlib_init1(void (*conf_core_init)(void)) @@ -306,7 +306,7 @@ { pcb_events_init(); pcb_file_loaded_init(); - pcb_conf_init(); + rnd_conf_init(); conf_core_init(); pcbhl_conf_postproc(); pcb_hidlib_conf_init(); @@ -341,7 +341,7 @@ srole = fn; *sep = '\0'; fn = sep+1; - role = pcb_conf_role_parse(srole); + role = rnd_conf_role_parse(srole); if (role == RND_CFR_invalid) { fprintf(stderr, "Can't load -C config file '%s': invalid role '%s'\n", fn, srole); free(hidlib_conffile.array[n]); @@ -348,13 +348,13 @@ continue; } } - pcb_conf_load_as(role, fn, 0); + rnd_conf_load_as(role, fn, 0); free(hidlib_conffile.array[n]); } vts0_uninit(&hidlib_conffile); } - pcb_conf_load_all(NULL, NULL); + rnd_conf_load_all(NULL, NULL); pup_init(&pcb_pup); pcb_pup.error_stack_enable = 1; @@ -363,7 +363,7 @@ pup_buildin_load(&pcb_pup, local_buildins); pup_autoload_dir(&pcb_pup, NULL, NULL); - pcb_conf_load_extra(NULL, NULL); + rnd_conf_load_extra(NULL, NULL); pcb_units_init(); pcb_funchash_init(); @@ -383,12 +383,12 @@ pcb_hidlib_event_uninit(); pcb_hid_dlg_uninit(); - if (pcb_conf_isdirty(RND_CFR_USER)) - pcb_conf_save_file(NULL, NULL, NULL, RND_CFR_USER, NULL); + if (rnd_conf_isdirty(RND_CFR_USER)) + rnd_conf_save_file(NULL, NULL, NULL, RND_CFR_USER, NULL); pcb_hid_uninit(); pcb_events_uninit(); - pcb_conf_uninit(); + rnd_conf_uninit(); pcb_plugin_uninit(); rnd_actions_uninit(); pcb_dad_unit_uninit(); @@ -587,7 +587,7 @@ *a = arg; } else { - if (pcb_conf_set_from_cli(NULL, arg, NULL, &why) != 0) { + if (rnd_conf_set_from_cli(NULL, arg, NULL, &why) != 0) { fprintf(stderr, "Error: failed to set config %s: %s\n", arg, why); exit(1); } @@ -610,7 +610,7 @@ /* Now that plugins are already initialized, apply plugin config items */ for(n = 0; n < vtp0_len(&ga->plugin_cli_conf); n++) { const char *why, *arg = ga->plugin_cli_conf.array[n]; - if (pcb_conf_set_from_cli(NULL, arg, NULL, &why) != 0) { + if (rnd_conf_set_from_cli(NULL, arg, NULL, &why) != 0) { fprintf(stderr, "Error: failed to set config %s: %s\n", arg, why); return 1; } Index: trunk/src/librnd/core/hidlib_conf.c =================================================================== --- trunk/src/librnd/core/hidlib_conf.c (revision 30948) +++ trunk/src/librnd/core/hidlib_conf.c (revision 30949) @@ -43,7 +43,7 @@ int cnt = 0; #define conf_reg(field,isarray,type_name,cpath,cname,desc,flags) \ - pcb_conf_reg_field(pcbhl_conf, field,isarray,type_name,cpath,cname,desc,flags); + rnd_conf_reg_field(pcbhl_conf, field,isarray,type_name,cpath,cname,desc,flags); #include return cnt; @@ -67,5 +67,5 @@ void pcb_hidlib_set_unit(rnd_hidlib_t *hidlib, const pcb_unit_t *new_unit) { if (new_unit != NULL && new_unit->allow != PCB_UNIT_NO_PRINT) - pcb_conf_set(RND_CFR_DESIGN, "editor/grid_unit", -1, new_unit->suffix, RND_POL_OVERWRITE); + rnd_conf_set(RND_CFR_DESIGN, "editor/grid_unit", -1, new_unit->suffix, RND_POL_OVERWRITE); } Index: trunk/src/librnd/core/paths.c =================================================================== --- trunk/src/librnd/core/paths.c (revision 30948) +++ trunk/src/librnd/core/paths.c (revision 30949) @@ -233,7 +233,7 @@ for(q = path; *q != '\0'; q++) if (*q == '.') *q = '/'; - cn = pcb_conf_get_field(path); + cn = rnd_conf_get_field(path); if (cn == NULL) { if (!(flags & PCB_SUBST_QUIET)) rnd_message(PCB_MSG_ERROR, "pcb_strdup_subst(): can't resolve $(%s) conf var: not found in the conf tree\n", path); Index: trunk/src/librnd/core/tool.c =================================================================== --- trunk/src/librnd/core/tool.c (revision 30948) +++ trunk/src/librnd/core/tool.c (revision 30949) @@ -146,7 +146,7 @@ uninit_current_tool(); sprintf(id_s, "%d", id); tool_select_lock = 1; - pcb_conf_set(RND_CFR_DESIGN, "editor/mode", -1, id_s, RND_POL_OVERWRITE); + rnd_conf_set(RND_CFR_DESIGN, "editor/mode", -1, id_s, RND_POL_OVERWRITE); tool_select_lock = 0; init_current_tool(); Index: trunk/src/librnd/pcb_compat.h =================================================================== --- trunk/src/librnd/pcb_compat.h (revision 30948) +++ trunk/src/librnd/pcb_compat.h (revision 30949) @@ -264,3 +264,41 @@ #define CFR_invalid RND_CFR_invalid #define pcb_conf_default_prio rnd_conf_default_prio #define pcb_conf_main_root_replace_cnt rnd_conf_main_root_replace_cnt +#define pcb_conf_init rnd_conf_init +#define pcb_conf_uninit rnd_conf_uninit +#define pcb_conf_load_all rnd_conf_load_all +#define pcb_conf_load_as rnd_conf_load_as +#define pcb_conf_insert_tree_as rnd_conf_insert_tree_as +#define pcb_conf_load_project rnd_conf_load_project +#define pcb_conf_load_extra rnd_conf_load_extra +#define pcb_conf_load_extra rnd_conf_load_extra +#define pcb_conf_get_field rnd_conf_get_field +#define pcb_conf_reg_field_ rnd_conf_reg_field_ +#define pcb_conf_unreg_field rnd_conf_unreg_field +#define pcb_conf_unreg_fields rnd_conf_unreg_fields +#define pcb_conf_set rnd_conf_set +#define pcb_conf_del rnd_conf_del +#define pcb_conf_grow rnd_conf_grow +#define pcb_conf_set_dry rnd_conf_set_dry +#define pcb_conf_set_native rnd_conf_set_native +#define pcb_conf_set_from_cli rnd_conf_set_from_cli +#define pcb_conf_parse_arguments rnd_conf_parse_arguments +#define pcb_conf_reg_field_array rnd_conf_reg_field_array +#define pcb_conf_reg_field_scalar rnd_conf_reg_field_scalar +#define pcb_conf_reg_field rnd_conf_reg_field +#define pcb_conf_native_type_parse rnd_conf_native_type_parse +#define pcb_conf_policy_parse rnd_conf_policy_parse +#define pcb_conf_policy_name rnd_conf_policy_name +#define pcb_conf_role_parse rnd_conf_role_parse +#define pcb_conf_role_name rnd_conf_role_name +#define pcb_conf_lock rnd_conf_lock +#define pcb_conf_unlock rnd_conf_unlock +#define pcb_conf_replace_subtree rnd_conf_replace_subtree +#define pcb_conf_reset rnd_conf_reset +#define pcb_conf_save_file rnd_conf_save_file +#define pcb_conf_islocked rnd_conf_islocked +#define pcb_conf_isdirty rnd_conf_isdirty +#define pcb_conf_makedirty rnd_conf_makedirty +#define pcb_conf_print_native_field rnd_conf_print_native_field +#define pcb_conf_print_native rnd_conf_print_native +#define pcb_conf_ro rnd_conf_ro Index: trunk/src/main.c =================================================================== --- trunk/src/main.c (revision 30948) +++ trunk/src/main.c (revision 30949) @@ -427,7 +427,7 @@ pcb_hidlib_init1(conf_core_init); pcb_event_init_app(); - pcb_conf_set(RND_CFR_INTERNAL, "rc/path/exec_prefix", -1, exec_prefix, RND_POL_OVERWRITE); + rnd_conf_set(RND_CFR_INTERNAL, "rc/path/exec_prefix", -1, exec_prefix, RND_POL_OVERWRITE); free(exec_prefix); pcb_layer_vis_init(); Index: trunk/src/plug_import.h =================================================================== --- trunk/src/plug_import.h (revision 30948) +++ trunk/src/plug_import.h (revision 30949) @@ -82,7 +82,7 @@ do { \ rnd_conf_native_t *vn; \ verbose = 0; \ - vn = pcb_conf_get_field("plugins/import_sch/verbose"); \ + vn = rnd_conf_get_field("plugins/import_sch/verbose"); \ if ((vn != NULL) && (vn->type == RND_CFN_BOOLEAN)) \ verbose = *(vn->val.boolean); \ } while(0) Index: trunk/src/plug_io.c =================================================================== --- trunk/src/plug_io.c (revision 30948) +++ trunk/src/plug_io.c (revision 30949) @@ -123,7 +123,7 @@ if (last_design_dir == NULL) { last_design_dir = rnd_strdup(""); conf_force_set_str(conf_core.rc.path.design, last_design_dir); - pcb_conf_ro("rc/path/design"); + rnd_conf_ro("rc/path/design"); return; } @@ -132,7 +132,7 @@ *end = '\0'; conf_force_set_str(conf_core.rc.path.design, last_design_dir); - pcb_conf_ro("rc/path/design"); + rnd_conf_ro("rc/path/design"); } static int pcb_test_parse_all(FILE *ft, const char *Filename, const char *fmt, pcb_plug_iot_t type, pcb_find_io_t *available, int *accepts, int *accept_total, int maxav, int ignore_missing, int gen_event) @@ -234,8 +234,8 @@ if ((res == 0) && (load_settings)) { if (design_root_cnt == rnd_conf_main_root_replace_cnt[RND_CFR_DESIGN]) /* the newly loaded board did not bring a design root */ - pcb_conf_reset(RND_CFR_DESIGN, ""); - pcb_conf_load_project(NULL, Filename); + rnd_conf_reset(RND_CFR_DESIGN, ""); + rnd_conf_load_project(NULL, Filename); } if (res == 0) @@ -244,7 +244,7 @@ if (load_settings) pcb_event(&PCB->hidlib, PCB_EVENT_LOAD_POST, "si", Filename, res); pcb_event(&PCB->hidlib, PCB_EVENT_ROUTE_STYLES_CHANGED, NULL); - pcb_conf_set(RND_CFR_DESIGN, "design/text_font_id", 0, "0", RND_POL_OVERWRITE); /* we have only one font now, make sure it is selected */ + rnd_conf_set(RND_CFR_DESIGN, "design/text_font_id", 0, "0", RND_POL_OVERWRITE); /* we have only one font now, make sure it is selected */ pcb_plug_io_err(&Ptr->hidlib, res, "load pcb", Filename); return res; @@ -581,7 +581,7 @@ if (nat == NULL) { const pcb_unit_t *new_unit = get_unit_struct(unit_suffix); if (new_unit) - pcb_conf_set(settings_dest, "editor/grid_unit", -1, unit_suffix, RND_POL_OVERWRITE); + rnd_conf_set(settings_dest, "editor/grid_unit", -1, unit_suffix, RND_POL_OVERWRITE); } } Index: trunk/src/tool_logic.c =================================================================== --- trunk/src/tool_logic.c (revision 30948) +++ trunk/src/tool_logic.c (revision 30949) @@ -70,7 +70,7 @@ { static conf_hid_callbacks_t cbs_mode; static conf_hid_id_t tool_conf_id; - rnd_conf_native_t *n_mode = pcb_conf_get_field("editor/mode"); + rnd_conf_native_t *n_mode = rnd_conf_get_field("editor/mode"); tool_conf_id = pcb_conf_hid_reg(tool_logic_cookie, NULL); if (n_mode != NULL) { Index: trunk/src_plugins/asm/asm.c =================================================================== --- trunk/src_plugins/asm/asm.c (revision 30948) +++ trunk/src_plugins/asm/asm.c (revision 30949) @@ -635,7 +635,7 @@ { rnd_remove_actions_by_cookie(asm_cookie); pcb_conf_unreg_file(ASM_CONF_FN, asm_conf_internal); - pcb_conf_unreg_fields("plugins/asm1/"); + rnd_conf_unreg_fields("plugins/asm1/"); } int pplg_init_asm(void) @@ -643,7 +643,7 @@ PCB_API_CHK_VER; pcb_conf_reg_file(ASM_CONF_FN, asm_conf_internal); #define conf_reg(field,isarray,type_name,cpath,cname,desc,flags) \ - pcb_conf_reg_field(conf_asm, field,isarray,type_name,cpath,cname,desc,flags); + rnd_conf_reg_field(conf_asm, field,isarray,type_name,cpath,cname,desc,flags); #include "asm_conf_fields.h" RND_REGISTER_ACTIONS(asm_action_list, asm_cookie) Index: trunk/src_plugins/cam/cam.c =================================================================== --- trunk/src_plugins/cam/cam.c (revision 30948) +++ trunk/src_plugins/cam/cam.c (revision 30949) @@ -283,7 +283,7 @@ void pplg_uninit_cam(void) { pcb_conf_unreg_file(CAM_CONF_FN, cam_conf_internal); - pcb_conf_unreg_fields("plugins/cam/"); + rnd_conf_unreg_fields("plugins/cam/"); rnd_remove_actions_by_cookie(cam_cookie); pcb_export_remove_opts_by_cookie(cam_cookie); } @@ -295,7 +295,7 @@ PCB_API_CHK_VER; pcb_conf_reg_file(CAM_CONF_FN, cam_conf_internal); #define conf_reg(field,isarray,type_name,cpath,cname,desc,flags) \ - pcb_conf_reg_field(conf_cam, field,isarray,type_name,cpath,cname,desc,flags); + rnd_conf_reg_field(conf_cam, field,isarray,type_name,cpath,cname,desc,flags); #include "cam_conf_fields.h" RND_REGISTER_ACTIONS(cam_action_list, cam_cookie) Index: trunk/src_plugins/cam/cam_gui.c =================================================================== --- trunk/src_plugins/cam/cam_gui.c (revision 30948) +++ trunk/src_plugins/cam/cam_gui.c (revision 30949) @@ -59,7 +59,7 @@ pcb_dad_tree_clear(tree); /* add all new items */ - cn = pcb_conf_get_field("plugins/cam/jobs"); + cn = rnd_conf_get_field("plugins/cam/jobs"); if (cn != NULL) { pcb_conf_listitem_t *item; int idx; Index: trunk/src_plugins/ddraft/constraint_gui.c =================================================================== --- trunk/src_plugins/ddraft/constraint_gui.c (revision 30948) +++ trunk/src_plugins/ddraft/constraint_gui.c (revision 30949) @@ -190,7 +190,7 @@ cnstgui_ctx.inhibit_confchg++; nv = (cnstgui_ctx.dlg[cnstgui_ctx.alldir].val.lng) ? "1" : "0"; - pcb_conf_set(RND_CFR_DESIGN, "editor/all_direction_lines", -1, nv, RND_POL_OVERWRITE); + rnd_conf_set(RND_CFR_DESIGN, "editor/all_direction_lines", -1, nv, RND_POL_OVERWRITE); cnstgui_ctx.inhibit_confchg--; } Index: trunk/src_plugins/ddraft/ddraft.c =================================================================== --- trunk/src_plugins/ddraft/ddraft.c (revision 30948) +++ trunk/src_plugins/ddraft/ddraft.c (revision 30949) @@ -560,9 +560,9 @@ pcb_ddraft_tool = pcb_tool_reg(&tool_ddraft, ddraft_cookie); confid = pcb_conf_hid_reg(ddraft_cookie, NULL); - cn = pcb_conf_get_field("editor/all_direction_lines"); + cn = rnd_conf_get_field("editor/all_direction_lines"); pcb_conf_hid_set_cb(cn, confid, &conf_cbs_adl); - cn = pcb_conf_get_field("editor/mode"); + cn = rnd_conf_get_field("editor/mode"); pcb_conf_hid_set_cb(cn, confid, &conf_cbs_mode); return 0; } Index: trunk/src_plugins/diag/diag.c =================================================================== --- trunk/src_plugins/diag/diag.c (revision 30948) +++ trunk/src_plugins/diag/diag.c (revision 30949) @@ -81,7 +81,7 @@ const char *srole, *prefix = ""; RND_PCB_ACT_CONVARG(2, FGW_STR, DumpConf, srole = argv[2].val.str); rnd_PCB_ACT_MAY_CONVARG(3, FGW_STR, DumpConf, prefix = argv[3].val.str); - role = pcb_conf_role_parse(srole); + role = rnd_conf_role_parse(srole); if (role == RND_CFR_invalid) { rnd_message(PCB_MSG_ERROR, "Invalid role: '%s'\n", argv[1]); RND_ACT_IRES(1); @@ -121,7 +121,7 @@ RND_PCB_ACT_CONVARG(1, FGW_STR, EvalConf, path = argv[1].val.str); - nat = pcb_conf_get_field(path); + nat = rnd_conf_get_field(path); if (nat == NULL) { rnd_message(PCB_MSG_ERROR, "EvalConf: invalid path %s - no such config setting\n", path); RND_ACT_IRES(-1); @@ -131,7 +131,7 @@ printf("Conf node %s\n", path); for(role = 0; role < RND_CFR_max_real; role++) { lht_node_t *n; - printf(" Role: %s\n", pcb_conf_role_name(role)); + printf(" Role: %s\n", rnd_conf_role_name(role)); n = pcb_conf_lht_get_at(role, path, 0); if (n != NULL) { rnd_conf_policy_t pol = -1; @@ -139,7 +139,7 @@ if (pcb_conf_get_policy_prio(n, &pol, &prio) == 0) - printf(" * policy=%s\n * prio=%ld\n", pcb_conf_policy_name(pol), prio); + printf(" * policy=%s\n * prio=%ld\n", rnd_conf_policy_name(pol), prio); if (n->file_name != NULL) printf(" * from=%s:%d.%d\n", n->file_name, n->line, n->col); @@ -153,7 +153,7 @@ } printf(" Native:\n"); - pcb_conf_print_native((conf_pfn)pcb_fprintf, stdout, " ", 1, nat); + rnd_conf_print_native((conf_pfn)pcb_fprintf, stdout, " ", 1, nat); RND_ACT_IRES(0); return 0; @@ -596,7 +596,7 @@ void pplg_uninit_diag(void) { rnd_remove_actions_by_cookie(diag_cookie); - pcb_conf_unreg_fields("plugins/diag/"); + rnd_conf_unreg_fields("plugins/diag/"); pcb_event_unbind_allcookie(diag_cookie); } @@ -605,7 +605,7 @@ PCB_API_CHK_VER; #define conf_reg(field,isarray,type_name,cpath,cname,desc,flags) \ - pcb_conf_reg_field(conf_diag, field,isarray,type_name,cpath,cname,desc,flags); + rnd_conf_reg_field(conf_diag, field,isarray,type_name,cpath,cname,desc,flags); #include "diag_conf_fields.h" pcb_event_bind(PCB_EVENT_USER_INPUT_POST, ev_ui_post, NULL, diag_cookie); Index: trunk/src_plugins/diag/diag_conf.c =================================================================== --- trunk/src_plugins/diag/diag_conf.c (revision 30948) +++ trunk/src_plugins/diag/diag_conf.c (revision 30949) @@ -41,6 +41,6 @@ if (strncmp(node->hash_path, match_prefix, pl) != 0) continue; } - pcb_conf_print_native((conf_pfn)pcb_fprintf, f, prefix, verbose, node); + rnd_conf_print_native((conf_pfn)pcb_fprintf, f, prefix, verbose, node); } } Index: trunk/src_plugins/dialogs/dialogs.c =================================================================== --- trunk/src_plugins/dialogs/dialogs.c (revision 30948) +++ trunk/src_plugins/dialogs/dialogs.c (revision 30949) @@ -105,7 +105,7 @@ rnd_remove_actions_by_cookie(dialogs_cookie); pcb_view_dlg_uninit(); pcb_dlg_fontsel_uninit(); - pcb_conf_unreg_fields("plugins/dialogs/"); + rnd_conf_unreg_fields("plugins/dialogs/"); } int pplg_init_dialogs(void) Index: trunk/src_plugins/dialogs/dlg_fontsel.c =================================================================== --- trunk/src_plugins/dialogs/dlg_fontsel.c (revision 30948) +++ trunk/src_plugins/dialogs/dlg_fontsel.c (revision 30949) @@ -138,7 +138,7 @@ return; } pcb_del_font(&PCB->fontkit, conf_core.design.text_font_id); - pcb_conf_set(RND_CFR_DESIGN, "design/text_font_id", 0, "0", RND_POL_OVERWRITE); + rnd_conf_set(RND_CFR_DESIGN, "design/text_font_id", 0, "0", RND_POL_OVERWRITE); fontsel_preview_update((fontsel_ctx_t *)caller_data); } Index: trunk/src_plugins/dialogs/dlg_pref.c =================================================================== --- trunk/src_plugins/dialogs/dlg_pref.c (revision 30948) +++ trunk/src_plugins/dialogs/dlg_pref.c (revision 30949) @@ -81,7 +81,7 @@ void pcb_pref_dlg2conf_item(pref_ctx_t *ctx, pref_confitem_t *item, pcb_hid_attribute_t *attr) { pref_confitem_t *old = ctx->pcb_conf_lock; - rnd_conf_native_t *cn = pcb_conf_get_field(item->confpath); + rnd_conf_native_t *cn = rnd_conf_get_field(item->confpath); if (cn == NULL) return; @@ -103,7 +103,7 @@ break; case RND_CFN_STRING: if (strcmp(cn->val.string[0], attr->val.str) != 0) - pcb_conf_set(ctx->role, item->confpath, -1, attr->val.str, RND_POL_OVERWRITE); + rnd_conf_set(ctx->role, item->confpath, -1, attr->val.str, RND_POL_OVERWRITE); break; default: rnd_message(PCB_MSG_ERROR, "pcb_pref_dlg2conf_item(): widget type not handled\n"); } @@ -127,7 +127,7 @@ void pcb_pref_create_conf_item(pref_ctx_t *ctx, pref_confitem_t *item, void (*change_cb)(void *hid_ctx, void *caller_data, pcb_hid_attribute_t *attr)) { - rnd_conf_native_t *cn = pcb_conf_get_field(item->confpath); + rnd_conf_native_t *cn = rnd_conf_get_field(item->confpath); if (cn == NULL) { rnd_message(PCB_MSG_ERROR, "Internal error: pcb_pref_create_conf_item(): invalid conf node %s\n", item->confpath); @@ -198,7 +198,7 @@ { pref_confitem_t *c; for(c = list; c->confpath != NULL; c++) { - rnd_conf_native_t *cn = pcb_conf_get_field(c->confpath); + rnd_conf_native_t *cn = rnd_conf_get_field(c->confpath); c->cnext = NULL; if (cn != NULL) pcb_conf_hid_set_data(cn, pref_hid, NULL); Index: trunk/src_plugins/dialogs/dlg_pref_color.c =================================================================== --- trunk/src_plugins/dialogs/dlg_pref_color.c (revision 30948) +++ trunk/src_plugins/dialogs/dlg_pref_color.c (revision 30949) @@ -36,7 +36,7 @@ int n; if (ctx->color.wlayer != NULL) { - nat = pcb_conf_get_field("appearance/color/layer"); + nat = rnd_conf_get_field("appearance/color/layer"); for (n = 0; n < nat->used; n++) PCB_DAD_SET_VALUE(ctx->dlg_hid_ctx, ctx->color.wlayer[n], clr, nat->val.color[n]); } @@ -44,7 +44,7 @@ for(n = 0; n < ctx->color.ngen; n++) { int w = ctx->color.wgen[n]; const char *path = ctx->dlg[w].user_data; - nat = pcb_conf_get_field(path); + nat = rnd_conf_get_field(path); if (nat != NULL) PCB_DAD_SET_VALUE(ctx->dlg_hid_ctx, w, clr, nat->val.color[0]); } @@ -130,7 +130,7 @@ PCB_DAD_BEGIN_VBOX(ctx->dlg); /* layer */ PCB_DAD_COMPFLAG(ctx->dlg, PCB_HATF_EXPFILL | PCB_HATF_SCROLL); - nat = pcb_conf_get_field("appearance/color/layer"); + nat = rnd_conf_get_field("appearance/color/layer"); if (nat->type == RND_CFN_COLOR) { PCB_DAD_LABEL(ctx->dlg, "NOTE: these colors are used only\nwhen creating new layers."); ctx->color.wlayer = calloc(sizeof(int), nat->used); Index: trunk/src_plugins/dialogs/dlg_pref_conf.c =================================================================== --- trunk/src_plugins/dialogs/dlg_pref_conf.c (revision 30948) +++ trunk/src_plugins/dialogs/dlg_pref_conf.c (revision 30949) @@ -147,7 +147,7 @@ for(n = 0; n < RND_CFR_max_real; n++) { char *cell[5]= {NULL}; - cell[0] = rnd_strdup(pcb_conf_role_name(n)); + cell[0] = rnd_strdup(rnd_conf_role_name(n)); if (nat != NULL) { lht_node_t *nd; long prio = rnd_conf_default_prio[n]; @@ -157,7 +157,7 @@ if (nd != NULL) { /* role, prio, policy, value */ pcb_conf_get_policy_prio(nd, &pol, &prio); cell[1] = pcb_strdup_printf("%ld", prio); - cell[2] = rnd_strdup(pcb_conf_policy_name(pol)); + cell[2] = rnd_strdup(rnd_conf_policy_name(pol)); cell[3] = rnd_strdup(pref_conf_get_val(nd, nat, idx)); } } @@ -194,7 +194,7 @@ lht_node_t *src; if ((path != NULL) && (nat == NULL)) - nat = pcb_conf_get_field(path); + nat = rnd_conf_get_field(path); if ((path == NULL) && (nat != NULL)) path = nat->hash_path; @@ -240,7 +240,7 @@ pcb_dad_tree_clear(tree); for (n = pcb_conflist_first(&nat->val.list[idx]); n != NULL; n = pcb_conflist_next(n)) { const char *strval; - rolename = pcb_conf_role_name(pcb_conf_lookup_role(n->prop.src)); + rolename = rnd_conf_role_name(pcb_conf_lookup_role(n->prop.src)); if (nat->type == RND_CFN_HLIST) strval = n->name; else @@ -261,7 +261,7 @@ src = nat->prop[idx].src; if (src != NULL) { - rolename = pcb_conf_role_name(pcb_conf_lookup_role(nat->prop[idx].src)); + rolename = rnd_conf_role_name(pcb_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); } else @@ -302,7 +302,7 @@ } /* non-array selection */ - nat = pcb_conf_get_field(row->path); + nat = rnd_conf_get_field(row->path); if ((nat != NULL) && (nat->array_size > 1)) { /* array head: do not display for now */ dlg_conf_select_node((pref_ctx_t *)tree->user_ctx, NULL, NULL, 0); return; Index: trunk/src_plugins/dialogs/dlg_pref_confedit.c =================================================================== --- trunk/src_plugins/dialogs/dlg_pref_confedit.c (revision 30948) +++ trunk/src_plugins/dialogs/dlg_pref_confedit.c (revision 30949) @@ -167,7 +167,7 @@ lht_dom_list_append(nd, n); n->data.text.value = rnd_strdup(r->cell[0]); } - pcb_conf_makedirty(ctx->role); + rnd_conf_makedirty(ctx->role); pcb_conf_update(ctx->nat->hash_path, ctx->idx); } return; @@ -178,10 +178,10 @@ if (val == NULL) val = ""; - pcb_conf_set(ctx->role, ctx->nat->hash_path, ctx->idx, val, RND_POL_OVERWRITE); + rnd_conf_set(ctx->role, ctx->nat->hash_path, ctx->idx, val, RND_POL_OVERWRITE); if ((ctx->role == RND_CFR_USER) || (ctx->role == RND_CFR_PROJECT)) - pcb_conf_save_file(&PCB->hidlib, NULL, (PCB == NULL ? NULL : PCB->hidlib.filename), ctx->role, NULL); + rnd_conf_save_file(&PCB->hidlib, NULL, (PCB == NULL ? NULL : PCB->hidlib.filename), ctx->role, NULL); else if (ctx->role == RND_CFR_DESIGN) pcb_board_set_changed_flag(1); @@ -241,7 +241,7 @@ { confedit_ctx_t *ctx = caller_data; rnd_actionva(&PCB->hidlib, ctx->nat->gui_edit_act, - pcb_conf_role_name(ctx->role), ctx->nat->hash_path, trigger_attr->val.str, + rnd_conf_role_name(ctx->role), ctx->nat->hash_path, trigger_attr->val.str, NULL); } @@ -418,5 +418,5 @@ return; } - pcb_conf_del(r->user_data2.lng, pctx->conf.selected_nat->hash_path, pctx->conf.selected_idx); + rnd_conf_del(r->user_data2.lng, pctx->conf.selected_nat->hash_path, pctx->conf.selected_idx); } Index: trunk/src_plugins/dialogs/dlg_pref_lib.c =================================================================== --- trunk/src_plugins/dialogs/dlg_pref_lib.c (revision 30948) +++ trunk/src_plugins/dialogs/dlg_pref_lib.c (revision 30949) @@ -91,7 +91,7 @@ { if (nd->file_name != NULL) return nd->file_name; - return pcb_conf_role_name(pcb_conf_lookup_role(nd)); + return rnd_conf_role_name(pcb_conf_lookup_role(nd)); } /* Current libraries from config to dialog box: after the change, fill @@ -161,7 +161,7 @@ m = pcb_conf_lht_get_first(ctx->role, 0); lst = lht_tree_path_(m->doc, m, "rc/library_search_paths", 1, 0, NULL); if (lst == NULL) - pcb_conf_set(ctx->role, "rc/library_search_paths", 0, "", RND_POL_OVERWRITE); + rnd_conf_set(ctx->role, "rc/library_search_paths", 0, "", RND_POL_OVERWRITE); lst = lht_tree_path_(m->doc, m, "rc/library_search_paths", 1, 0, NULL); assert(lst != NULL); lht_clean_list(lst); @@ -176,7 +176,7 @@ } pcb_conf_update("rc/library_search_paths", -1); - pcb_conf_makedirty(ctx->role); /* low level lht_dom_node_alloc() wouldn't make user config to be saved! */ + rnd_conf_makedirty(ctx->role); /* low level lht_dom_node_alloc() wouldn't make user config to be saved! */ if (ctx->role == RND_CFR_DESIGN) pcb_board_set_changed_flag(1); @@ -477,7 +477,7 @@ void pcb_dlg_pref_lib_open(pref_ctx_t *ctx) { - rnd_conf_native_t *cn = pcb_conf_get_field("rc/library_search_paths"); + rnd_conf_native_t *cn = rnd_conf_get_field("rc/library_search_paths"); pref_lib_conf2dlg_post(cn, -1); } @@ -484,7 +484,7 @@ void pcb_dlg_pref_lib_init(pref_ctx_t *ctx) { static conf_hid_callbacks_t cbs_spth; - rnd_conf_native_t *cn = pcb_conf_get_field("rc/library_search_paths"); + rnd_conf_native_t *cn = rnd_conf_get_field("rc/library_search_paths"); if (cn != NULL) { memset(&cbs_spth, 0, sizeof(conf_hid_callbacks_t)); Index: trunk/src_plugins/dialogs/dlg_pref_sizes.c =================================================================== --- trunk/src_plugins/dialogs/dlg_pref_sizes.c (revision 30948) +++ trunk/src_plugins/dialogs/dlg_pref_sizes.c (revision 30949) @@ -159,7 +159,7 @@ void pcb_dlg_pref_sizes_init(pref_ctx_t *ctx) { static conf_hid_callbacks_t cbs_isle; - rnd_conf_native_t *cn = pcb_conf_get_field("design/poly_isle_area"); + rnd_conf_native_t *cn = rnd_conf_get_field("design/poly_isle_area"); if (cn != NULL) { memset(&cbs_isle, 0, sizeof(conf_hid_callbacks_t)); Index: trunk/src_plugins/djopt/djopt.c =================================================================== --- trunk/src_plugins/djopt/djopt.c (revision 30948) +++ trunk/src_plugins/djopt/djopt.c (revision 30949) @@ -2569,7 +2569,7 @@ void pplg_uninit_djopt(void) { rnd_remove_actions_by_cookie(djopt_cookie); - pcb_conf_unreg_fields("plugins/djopt/"); + rnd_conf_unreg_fields("plugins/djopt/"); } int pplg_init_djopt(void) @@ -2577,7 +2577,7 @@ PCB_API_CHK_VER; #define conf_reg(field,isarray,type_name,cpath,cname,desc,flags) \ - pcb_conf_reg_field(conf_djopt, field,isarray,type_name,cpath,cname,desc,flags); + rnd_conf_reg_field(conf_djopt, field,isarray,type_name,cpath,cname,desc,flags); #include "djopt_conf_fields.h" RND_REGISTER_ACTIONS(djopt_action_list, djopt_cookie) Index: trunk/src_plugins/draw_fab/draw_fab.c =================================================================== --- trunk/src_plugins/draw_fab/draw_fab.c (revision 30948) +++ trunk/src_plugins/draw_fab/draw_fab.c (revision 30949) @@ -334,7 +334,7 @@ void pplg_uninit_draw_fab(void) { - pcb_conf_unreg_fields("plugins/draw_fab/"); + rnd_conf_unreg_fields("plugins/draw_fab/"); } int pplg_init_draw_fab(void) @@ -344,7 +344,7 @@ pcb_stub_draw_fab_overhang = DrawFab_overhang; #define conf_reg(field,isarray,type_name,cpath,cname,desc,flags) \ - pcb_conf_reg_field(conf_draw_fab, field,isarray,type_name,cpath,cname,desc,flags); + rnd_conf_reg_field(conf_draw_fab, field,isarray,type_name,cpath,cname,desc,flags); #include "draw_fab_conf_fields.h" Index: trunk/src_plugins/draw_fontsel/draw_fontsel.c =================================================================== --- trunk/src_plugins/draw_fontsel/draw_fontsel.c (revision 30948) +++ trunk/src_plugins/draw_fontsel/draw_fontsel.c (revision 30949) @@ -173,7 +173,7 @@ if (txt == NULL) { char sval[128]; sprintf(sval, "%ld", fid); - pcb_conf_set(RND_CFR_DESIGN, "design/text_font_id", 0, sval, RND_POL_OVERWRITE); + rnd_conf_set(RND_CFR_DESIGN, "design/text_font_id", 0, sval, RND_POL_OVERWRITE); } else { switch(txt->type) { Index: trunk/src_plugins/drc_orig/drc_orig.c =================================================================== --- trunk/src_plugins/drc_orig/drc_orig.c (revision 30948) +++ trunk/src_plugins/drc_orig/drc_orig.c (revision 30949) @@ -391,7 +391,7 @@ { pcb_event_unbind_allcookie(drc_orig_cookie); pcb_conf_unreg_file(DRC_ORIG_CONF_FN, drc_orig_conf_internal); - pcb_conf_unreg_fields("plugins/drc_orig/"); + rnd_conf_unreg_fields("plugins/drc_orig/"); } int pplg_init_drc_orig(void) @@ -401,7 +401,7 @@ pcb_conf_reg_file(DRC_ORIG_CONF_FN, drc_orig_conf_internal); #define conf_reg(field,isarray,type_name,cpath,cname,desc,flags) \ - pcb_conf_reg_field(conf_drc_orig, field,isarray,type_name,cpath,cname,desc,flags); + rnd_conf_reg_field(conf_drc_orig, field,isarray,type_name,cpath,cname,desc,flags); #include "drc_orig_conf_fields.h" return 0; Index: trunk/src_plugins/drc_query/dlg.c =================================================================== --- trunk/src_plugins/drc_query/dlg.c (revision 30948) +++ trunk/src_plugins/drc_query/dlg.c (revision 30949) @@ -257,7 +257,7 @@ } } - info = pcb_strdup_printf("DRC rule edit: %s on role %s", rule, pcb_conf_role_name(role)); + info = pcb_strdup_printf("DRC rule edit: %s on role %s", rule, rnd_conf_role_name(role)); PCB_DAD_BEGIN_VBOX(ctx->dlg); PCB_DAD_COMPFLAG(ctx->dlg, PCB_HATF_EXPFILL); PCB_DAD_LABEL(ctx->dlg, info); @@ -336,7 +336,7 @@ if (srule == NULL) srule = spath; - role = pcb_conf_role_parse(srole); + role = rnd_conf_role_parse(srole); if (role == RND_CFR_invalid) RND_ACT_FAIL(DrcQueryEditRule); @@ -403,7 +403,7 @@ role = pcb_conf_lookup_role(rule); cell[0] = rule->name; - cell[1] = rnd_strdup(pcb_conf_role_name(role)); + 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); @@ -451,7 +451,7 @@ rnd_message(PCB_MSG_ERROR, "Select a rule first!\n"); \ return; \ } \ - role = pcb_conf_role_parse(row->cell[1]); \ + role = rnd_conf_role_parse(row->cell[1]); \ if (role == RND_CFR_invalid) { \ rnd_message(PCB_MSG_ERROR, "internal error: invalid role %s\n", row->cell[0]); \ return; \ Index: trunk/src_plugins/drc_query/drc_query.c =================================================================== --- trunk/src_plugins/drc_query/drc_query.c (revision 30948) +++ trunk/src_plugins/drc_query/drc_query.c (revision 30949) @@ -193,7 +193,7 @@ static int *drc_get_disable(const char *name) { char *path = pcb_concat(DRC_CONF_PATH_DISABLE, name, NULL); - rnd_conf_native_t *nat = pcb_conf_get_field(path); + rnd_conf_native_t *nat = rnd_conf_get_field(path); free(path); if ((nat == NULL) || (nat->type != RND_CFN_BOOLEAN)) return NULL; @@ -259,7 +259,7 @@ lht_node_t *nd = i->prop.src; char *path = pcb_concat(DRC_CONF_PATH_DISABLE, nd->name, NULL); - if (pcb_conf_get_field(path) == NULL) { + if (rnd_conf_get_field(path) == NULL) { const char *sdesc; rnd_conf_native_t *nat; pcb_bool_t *b; @@ -269,7 +269,7 @@ if ((ndesc != NULL) && (ndesc->type == LHT_TEXT)) sdesc = ndesc->data.text.value; b = calloc(sizeof(pcb_bool_t), 1); - nat = pcb_conf_reg_field_(b, 1, RND_CFN_BOOLEAN, path, rnd_strdup(sdesc), 0); + nat = rnd_conf_reg_field_(b, 1, RND_CFN_BOOLEAN, path, rnd_strdup(sdesc), 0); if (nat == NULL) { free(b); rnd_message(PCB_MSG_ERROR, "drc_query: failed to register conf node '%s'\n", path); @@ -280,7 +280,7 @@ nat->random_flags.dyn_desc = 1; nat->random_flags.dyn_val = 1; vtp0_append(&free_drc_conf_nodes, nat); - pcb_conf_set(RND_CFR_INTERNAL, path, -1, "0", RND_POL_OVERWRITE); + rnd_conf_set(RND_CFR_INTERNAL, path, -1, "0", RND_POL_OVERWRITE); } else free(path); @@ -290,7 +290,7 @@ char *path = pcb_concat(DRC_CONF_PATH_CONST, nd->name, NULL); rnd_coord_t *c; - if (pcb_conf_get_field(path) == NULL) { + if (rnd_conf_get_field(path) == NULL) { union { rnd_coord_t c; double d; @@ -315,7 +315,7 @@ goto fail; } - type = pcb_conf_native_type_parse(stype); + type = rnd_conf_native_type_parse(stype); if (type >= RND_CFN_LIST) { rnd_message(PCB_MSG_ERROR, "drc_query: invalid type '%s' for %s\n", stype, nd->name); goto fail; @@ -322,7 +322,7 @@ } c = calloc(sizeof(anyval), 1); - nat = pcb_conf_reg_field_(c, 1, type, path, rnd_strdup(sdesc), 0); + nat = rnd_conf_reg_field_(c, 1, type, path, rnd_strdup(sdesc), 0); if (nat == NULL) { free(c); rnd_message(PCB_MSG_ERROR, "drc_query: failed to register conf node '%s'\n", path); @@ -337,7 +337,7 @@ if (slegacy != NULL) pcb_conf_legacy(path, slegacy); else if (sdefault != NULL) - pcb_conf_set(RND_CFR_INTERNAL, path, -1, sdefault, RND_POL_OVERWRITE); + rnd_conf_set(RND_CFR_INTERNAL, path, -1, sdefault, RND_POL_OVERWRITE); path = NULL; /* hash key shall not be free'd */ } fail:; @@ -363,11 +363,11 @@ pcb_drc_impl_unreg(&drc_query_impl); pcb_event_unbind_allcookie(drc_query_cookie); pcb_conf_unreg_file(DRC_QUERY_CONF_FN, drc_query_conf_internal); - pcb_conf_unreg_fields(DRC_CONF_PATH_PLUGIN); + rnd_conf_unreg_fields(DRC_CONF_PATH_PLUGIN); pcb_conf_hid_unreg(drc_query_cookie); for(n = 0; n < free_drc_conf_nodes.used; n++) - pcb_conf_unreg_field(free_drc_conf_nodes.array[n]); + rnd_conf_unreg_field(free_drc_conf_nodes.array[n]); vtp0_uninit(&free_drc_conf_nodes); rnd_remove_actions_by_cookie(drc_query_cookie); @@ -390,7 +390,7 @@ pcb_conf_reg_file(DRC_QUERY_CONF_FN, drc_query_conf_internal); #define conf_reg(field,isarray,type_name,cpath,cname,desc,flags) \ - pcb_conf_reg_field(conf_drc_query, field,isarray,type_name,cpath,cname,desc,flags); + rnd_conf_reg_field(conf_drc_query, field,isarray,type_name,cpath,cname,desc,flags); #include "drc_query_conf_fields.h" RND_REGISTER_ACTIONS(drc_query_action_list, drc_query_cookie) Index: trunk/src_plugins/export_excellon/excellon.c =================================================================== --- trunk/src_plugins/export_excellon/excellon.c (revision 30948) +++ trunk/src_plugins/export_excellon/excellon.c (revision 30949) @@ -486,7 +486,7 @@ { pcb_export_remove_opts_by_cookie(excellon_cookie); free(filename); - pcb_conf_unreg_fields("plugins/export_excellon/"); + rnd_conf_unreg_fields("plugins/export_excellon/"); pcb_event_unbind_allcookie(excellon_cookie); } @@ -495,7 +495,7 @@ PCB_API_CHK_VER; #define conf_reg(field,isarray,type_name,cpath,cname,desc,flags) \ - pcb_conf_reg_field(conf_excellon, field,isarray,type_name,cpath,cname,desc,flags); + rnd_conf_reg_field(conf_excellon, field,isarray,type_name,cpath,cname,desc,flags); #include "excellon_conf_fields.h" memset(&excellon_hid, 0, sizeof(excellon_hid)); Index: trunk/src_plugins/export_gerber/gerber.c =================================================================== --- trunk/src_plugins/export_gerber/gerber.c (revision 30948) +++ trunk/src_plugins/export_gerber/gerber.c (revision 30949) @@ -1065,7 +1065,7 @@ void pplg_uninit_export_gerber(void) { pcb_export_remove_opts_by_cookie(gerber_cookie); - pcb_conf_unreg_fields("plugins/export_gerber/"); + rnd_conf_unreg_fields("plugins/export_gerber/"); pcb_event_unbind_allcookie(gerber_cookie); } @@ -1074,7 +1074,7 @@ PCB_API_CHK_VER; #define conf_reg(field,isarray,type_name,cpath,cname,desc,flags) \ - pcb_conf_reg_field(conf_gerber, field,isarray,type_name,cpath,cname,desc,flags); + rnd_conf_reg_field(conf_gerber, field,isarray,type_name,cpath,cname,desc,flags); #include "gerber_conf_fields.h" memset(&gerber_hid, 0, sizeof(gerber_hid)); Index: trunk/src_plugins/export_xy/xy.c =================================================================== --- trunk/src_plugins/export_xy/xy.c (revision 30948) +++ trunk/src_plugins/export_xy/xy.c (revision 30949) @@ -852,7 +852,7 @@ { pcb_export_remove_opts_by_cookie(xy_cookie); pcb_conf_unreg_file(CONF_FN, export_xy_conf_internal); - pcb_conf_unreg_fields("plugins/export_xy/"); + rnd_conf_unreg_fields("plugins/export_xy/"); free_fmts(); vts0_uninit(&fmt_names); vts0_uninit(&fmt_ids); @@ -868,7 +868,7 @@ memset(&xy_hid, 0, sizeof(pcb_hid_t)); #define conf_reg(field,isarray,type_name,cpath,cname,desc,flags) \ - pcb_conf_reg_field(conf_xy, field,isarray,type_name,cpath,cname,desc,flags); + rnd_conf_reg_field(conf_xy, field,isarray,type_name,cpath,cname,desc,flags); #include "xy_conf_fields.h" pcb_hid_nogui_init(&xy_hid); Index: trunk/src_plugins/extedit/extedit.c =================================================================== --- trunk/src_plugins/extedit/extedit.c (revision 30948) +++ trunk/src_plugins/extedit/extedit.c (revision 30949) @@ -264,7 +264,7 @@ int res; void *udata; - pcb_conf_save_file(&PCB->hidlib, NULL, NULL, RND_CFR_DESIGN, tmp_cfg_fn); + rnd_conf_save_file(&PCB->hidlib, NULL, NULL, RND_CFR_DESIGN, tmp_cfg_fn); f = pcb_fopen(&PCB->hidlib, tmp_fn, "w"); if (f == NULL) { Index: trunk/src_plugins/fontmode/fontmode.c =================================================================== --- trunk/src_plugins/fontmode/fontmode.c (revision 30948) +++ trunk/src_plugins/fontmode/fontmode.c (revision 30949) @@ -115,7 +115,7 @@ if (rnd_actionva(RND_ACT_HIDLIB, "New", "Font", 0)) return 1; - pcb_conf_set(RND_CFR_DESIGN, "editor/grid_unit", -1, "mil", RND_POL_OVERWRITE); + rnd_conf_set(RND_CFR_DESIGN, "editor/grid_unit", -1, "mil", RND_POL_OVERWRITE); conf_set_design("design/min_wid", "%s", "1"); conf_set_design("design/min_slk", "%s", "1"); conf_set_design("design/text_font_id", "%s", "0"); Index: trunk/src_plugins/fp_wget/fp_wget.c =================================================================== --- trunk/src_plugins/fp_wget/fp_wget.c (revision 30948) +++ trunk/src_plugins/fp_wget/fp_wget.c (revision 30949) @@ -17,7 +17,7 @@ pcb_conf_unreg_file(FP_WGET_CONF_FN, fp_wget_conf_internal); fp_gedasymbols_uninit(); fp_edakrill_uninit(); - pcb_conf_unreg_fields("plugins/fp_wget/"); + rnd_conf_unreg_fields("plugins/fp_wget/"); } int pplg_init_fp_wget(void) @@ -25,7 +25,7 @@ PCB_API_CHK_VER; #define conf_reg(field,isarray,type_name,cpath,cname,desc,flags) \ - pcb_conf_reg_field(conf_fp_wget, field,isarray,type_name,cpath,cname,desc,flags); + rnd_conf_reg_field(conf_fp_wget, field,isarray,type_name,cpath,cname,desc,flags); #include "fp_wget_conf_fields.h" pcb_conf_reg_file(FP_WGET_CONF_FN, fp_wget_conf_internal); Index: trunk/src_plugins/hid_lesstif/main.c =================================================================== --- trunk/src_plugins/hid_lesstif/main.c (revision 30948) +++ trunk/src_plugins/hid_lesstif/main.c (revision 30949) @@ -2788,7 +2788,7 @@ #if 0 static void init_conf_watch(conf_hid_callbacks_t *cbs, const char *path, void (*func)(rnd_conf_native_t *, int)) { - rnd_conf_native_t *n = pcb_conf_get_field(path); + rnd_conf_native_t *n = rnd_conf_get_field(path); if (n != NULL) { memset(cbs, 0, sizeof(conf_hid_callbacks_t)); cbs->val_change_post = func; Index: trunk/src_plugins/hid_lesstif/menu.c =================================================================== --- trunk/src_plugins/hid_lesstif/menu.c (revision 30948) +++ trunk/src_plugins/hid_lesstif/menu.c (revision 30949) @@ -499,7 +499,7 @@ if (uo != NULL) { static conf_hid_callbacks_t cbs; static int cbs_inited = 0; - rnd_conf_native_t *nat = pcb_conf_get_field(uo); + rnd_conf_native_t *nat = rnd_conf_get_field(uo); if (nat != NULL) { if (!cbs_inited) { Index: trunk/src_plugins/import_gnetlist/import_gnetlist.c =================================================================== --- trunk/src_plugins/import_gnetlist/import_gnetlist.c (revision 30948) +++ trunk/src_plugins/import_gnetlist/import_gnetlist.c (revision 30949) @@ -137,7 +137,7 @@ { PCB_HOOK_UNREGISTER(pcb_plug_import_t, pcb_plug_import_chain, &import_gnetlist); pcb_conf_unreg_file(IMPORT_GNETLIST_CONF_FN, import_gnetlist_conf_internal); - pcb_conf_unreg_fields("plugins/import_gnetlist/"); + rnd_conf_unreg_fields("plugins/import_gnetlist/"); } int pplg_init_import_gnetlist(void) @@ -161,7 +161,7 @@ pcb_conf_reg_file(IMPORT_GNETLIST_CONF_FN, import_gnetlist_conf_internal); #define conf_reg(field,isarray,type_name,cpath,cname,desc,flags) \ - pcb_conf_reg_field(conf_import_gnetlist, field,isarray,type_name,cpath,cname,desc,flags); + rnd_conf_reg_field(conf_import_gnetlist, field,isarray,type_name,cpath,cname,desc,flags); #include "import_gnetlist_conf_fields.h" return 0; Index: trunk/src_plugins/import_mentor_sch/mentor_sch.c =================================================================== --- trunk/src_plugins/import_mentor_sch/mentor_sch.c (revision 30948) +++ trunk/src_plugins/import_mentor_sch/mentor_sch.c (revision 30949) @@ -309,7 +309,7 @@ void pplg_uninit_import_mentor_sch(void) { rnd_remove_actions_by_cookie(mentor_sch_cookie); - pcb_conf_unreg_fields("plugins/import_mentor_sch/"); + rnd_conf_unreg_fields("plugins/import_mentor_sch/"); PCB_HOOK_UNREGISTER(pcb_plug_import_t, pcb_plug_import_chain, &import_mentor_sch); } @@ -318,7 +318,7 @@ PCB_API_CHK_VER; #define conf_reg(field,isarray,type_name,cpath,cname,desc,flags) \ - pcb_conf_reg_field(conf_mentor, field,isarray,type_name,cpath,cname,desc,flags); + rnd_conf_reg_field(conf_mentor, field,isarray,type_name,cpath,cname,desc,flags); #include "mentor_sch_conf_fields.h" /* register the IO hook */ Index: trunk/src_plugins/import_sch2/import_sch.c =================================================================== --- trunk/src_plugins/import_sch2/import_sch.c (revision 30948) +++ trunk/src_plugins/import_sch2/import_sch.c (revision 30949) @@ -64,8 +64,8 @@ sprintf(tmp, "import::src%d", n); src = rnd_attrib_get(PCB, tmp); if (src != NULL) { - pcb_conf_grow("plugins/import_sch/args", idx+1); - pcb_conf_set(RND_CFR_DESIGN, "plugins/import_sch/args", idx, src, RND_POL_OVERWRITE); + rnd_conf_grow("plugins/import_sch/args", idx+1); + rnd_conf_set(RND_CFR_DESIGN, "plugins/import_sch/args", idx, src, RND_POL_OVERWRITE); idx++; } } @@ -74,7 +74,7 @@ mode = "gnetlist"; else if (strcmp(mode, "make") == 0) mode = "cmd"; - pcb_conf_set(RND_CFR_DESIGN, "plugins/import_sch/import_fmt", 0, mode, RND_POL_OVERWRITE); + rnd_conf_set(RND_CFR_DESIGN, "plugins/import_sch/import_fmt", 0, mode, RND_POL_OVERWRITE); if (strcmp(mode, "cmd") == 0) { @@ -96,9 +96,9 @@ gds_append(&cmdline, ' '); gds_append_str(&cmdline, target); - pcb_conf_grow("plugins/import_sch/args", 2); - pcb_conf_set(RND_CFR_DESIGN, "plugins/import_sch/args", 0, outfile, RND_POL_OVERWRITE); - pcb_conf_set(RND_CFR_DESIGN, "plugins/import_sch/args", 1, cmdline.array, RND_POL_OVERWRITE); + rnd_conf_grow("plugins/import_sch/args", 2); + rnd_conf_set(RND_CFR_DESIGN, "plugins/import_sch/args", 0, outfile, RND_POL_OVERWRITE); + rnd_conf_set(RND_CFR_DESIGN, "plugins/import_sch/args", 1, cmdline.array, RND_POL_OVERWRITE); gds_uninit(&cmdline); } @@ -179,10 +179,10 @@ return -1; } - pcb_conf_set(RND_CFR_DESIGN, "plugins/import_sch/import_fmt", 0, argv[0].val.str, RND_POL_OVERWRITE); - pcb_conf_grow("plugins/import_sch/args", argc-1); + rnd_conf_set(RND_CFR_DESIGN, "plugins/import_sch/import_fmt", 0, argv[0].val.str, RND_POL_OVERWRITE); + rnd_conf_grow("plugins/import_sch/args", argc-1); for(n = 1; n < argc; n++) - pcb_conf_set(RND_CFR_DESIGN, "plugins/import_sch/args", n-1, argv[n].val.str, RND_POL_OVERWRITE); + rnd_conf_set(RND_CFR_DESIGN, "plugins/import_sch/args", n-1, argv[n].val.str, RND_POL_OVERWRITE); return 0; } @@ -227,7 +227,7 @@ void pplg_uninit_import_sch2(void) { rnd_remove_actions_by_cookie(import_sch_cookie); - pcb_conf_unreg_fields("plugins/import_sch/"); + rnd_conf_unreg_fields("plugins/import_sch/"); isch_dlg_uninit(); } @@ -236,7 +236,7 @@ PCB_API_CHK_VER; RND_REGISTER_ACTIONS(import_sch_action_list, import_sch_cookie) #define conf_reg(field,isarray,type_name,cpath,cname,desc,flags) \ - pcb_conf_reg_field(conf_import_sch, field,isarray,type_name,cpath,cname,desc,flags); + rnd_conf_reg_field(conf_import_sch, field,isarray,type_name,cpath,cname,desc,flags); #include "import_sch_conf_fields.h" isch_dlg_init(); Index: trunk/src_plugins/import_sch2/import_sch_dlg.c =================================================================== --- trunk/src_plugins/import_sch2/import_sch_dlg.c (revision 30948) +++ trunk/src_plugins/import_sch2/import_sch_dlg.c (revision 30949) @@ -52,7 +52,7 @@ if (newval == NULL) newval = ""; if (strcmp(ci->val.string[0], newval) != 0) { - pcb_conf_set(RND_CFR_DESIGN, "plugins/import_sch/args", n, newval, RND_POL_OVERWRITE); + rnd_conf_set(RND_CFR_DESIGN, "plugins/import_sch/args", n, newval, RND_POL_OVERWRITE); goto restart; /* elements may be deleted and added with different pointers... */ } } @@ -106,7 +106,7 @@ isch_conf_lock++; PCB_DAD_SET_VALUE(isch_ctx.dlg_hid_ctx, isch_ctx.wtab, lng, target); if (setconf && (p != NULL)) - pcb_conf_set(RND_CFR_DESIGN, "plugins/import_sch/import_fmt", 0, p->name, RND_POL_OVERWRITE); + rnd_conf_set(RND_CFR_DESIGN, "plugins/import_sch/import_fmt", 0, p->name, RND_POL_OVERWRITE); if (p == NULL) { len = 0; @@ -115,8 +115,8 @@ else if (p->single_arg) { len = pcb_conflist_length((pcb_conflist_t *)&conf_import_sch.plugins.import_sch.args); if (len < 1) { - pcb_conf_grow("plugins/import_sch/args", 1); - pcb_conf_set(RND_CFR_DESIGN, "plugins/import_sch/args", 0, "", RND_POL_OVERWRITE); + rnd_conf_grow("plugins/import_sch/args", 1); + rnd_conf_set(RND_CFR_DESIGN, "plugins/import_sch/args", 0, "", RND_POL_OVERWRITE); } len = 1; controllable = 0; @@ -171,7 +171,7 @@ { int len = pcb_conflist_length((pcb_conflist_t *)&conf_import_sch.plugins.import_sch.args); if (len > 0) { - pcb_conf_del(RND_CFR_DESIGN, "plugins/import_sch/args", len-1); + rnd_conf_del(RND_CFR_DESIGN, "plugins/import_sch/args", len-1); isch_pcb2dlg(); } } @@ -181,8 +181,8 @@ int len = pcb_conflist_length((pcb_conflist_t *)&conf_import_sch.plugins.import_sch.args); if (len < MAX_ARGS+1) { isch_conf_lock++; - pcb_conf_grow("plugins/import_sch/args", len+1); - pcb_conf_set(RND_CFR_DESIGN, "plugins/import_sch/args", len, "", RND_POL_OVERWRITE); + rnd_conf_grow("plugins/import_sch/args", len+1); + rnd_conf_set(RND_CFR_DESIGN, "plugins/import_sch/args", len, "", RND_POL_OVERWRITE); isch_pcb2dlg(); isch_conf_lock--; } @@ -211,7 +211,7 @@ return; isch_conf_lock++; - pcb_conf_set(RND_CFR_DESIGN, "plugins/import_sch/args", idx, name, RND_POL_OVERWRITE); + rnd_conf_set(RND_CFR_DESIGN, "plugins/import_sch/args", idx, name, RND_POL_OVERWRITE); isch_pcb2dlg(); free(name); isch_conf_lock--; @@ -240,7 +240,7 @@ { const char *nv = isch_ctx.dlg[isch_ctx.wverbose].val.lng ? "1" : "0"; isch_conf_lock++; - pcb_conf_set(RND_CFR_DESIGN, "plugins/import_sch/verbose", 0, nv, RND_POL_OVERWRITE); + rnd_conf_set(RND_CFR_DESIGN, "plugins/import_sch/verbose", 0, nv, RND_POL_OVERWRITE); isch_conf_lock--; } @@ -379,7 +379,7 @@ cbs.val_change_post = isch_cfg_chg; - pcb_conf_hid_set_cb(pcb_conf_get_field("plugins/import_sch/args"), cfgid, &cbs); - pcb_conf_hid_set_cb(pcb_conf_get_field("plugins/import_sch/import_fmt"), cfgid, &cbs); - pcb_conf_hid_set_cb(pcb_conf_get_field("plugins/import_sch/verbose"), cfgid, &cbs); + pcb_conf_hid_set_cb(rnd_conf_get_field("plugins/import_sch/args"), cfgid, &cbs); + pcb_conf_hid_set_cb(rnd_conf_get_field("plugins/import_sch/import_fmt"), cfgid, &cbs); + pcb_conf_hid_set_cb(rnd_conf_get_field("plugins/import_sch/verbose"), cfgid, &cbs); } Index: trunk/src_plugins/io_eagle/read_dru.c =================================================================== --- trunk/src_plugins/io_eagle/read_dru.c (revision 30948) +++ trunk/src_plugins/io_eagle/read_dru.c (revision 30949) @@ -154,7 +154,7 @@ return; } if (d > curr_val) - pcb_conf_set(RND_CFR_DESIGN, "design/min_drill", -1, val, RND_POL_OVERWRITE); + rnd_conf_set(RND_CFR_DESIGN, "design/min_drill", -1, val, RND_POL_OVERWRITE); } int io_eagle_read_pcb_dru(pcb_plug_io_t *ctx, pcb_board_t *pcb, const char *Filename, rnd_conf_role_t settings_dest) @@ -171,9 +171,9 @@ if (f == NULL) return -1; - pcb_conf_set(RND_CFR_DESIGN, "design/bloat", -1, "0", RND_POL_OVERWRITE); - pcb_conf_set(RND_CFR_DESIGN, "design/min_wid", -1, "0", RND_POL_OVERWRITE); - pcb_conf_set(RND_CFR_DESIGN, "design/min_drill", -1, "0", RND_POL_OVERWRITE); + rnd_conf_set(RND_CFR_DESIGN, "design/bloat", -1, "0", RND_POL_OVERWRITE); + rnd_conf_set(RND_CFR_DESIGN, "design/min_wid", -1, "0", RND_POL_OVERWRITE); + rnd_conf_set(RND_CFR_DESIGN, "design/min_drill", -1, "0", RND_POL_OVERWRITE); memcpy(tmp, prefix, sizeof(prefix)); Index: trunk/src_plugins/io_lihata/io_lihata.c =================================================================== --- trunk/src_plugins/io_lihata/io_lihata.c (revision 30948) +++ trunk/src_plugins/io_lihata/io_lihata.c (revision 30949) @@ -63,7 +63,7 @@ void pplg_uninit_io_lihata(void) { - pcb_conf_unreg_fields("plugins/io_lihata/"); + rnd_conf_unreg_fields("plugins/io_lihata/"); PCB_HOOK_UNREGISTER(pcb_plug_io_t, pcb_plug_io_chain, &plug_io_lihata_v6); PCB_HOOK_UNREGISTER(pcb_plug_io_t, pcb_plug_io_chain, &plug_io_lihata_v5); PCB_HOOK_UNREGISTER(pcb_plug_io_t, pcb_plug_io_chain, &plug_io_lihata_v4); @@ -227,7 +227,7 @@ PCB_HOOK_REGISTER(pcb_plug_io_t, pcb_plug_io_chain, &plug_io_lihata_v1); #define conf_reg(field,isarray,type_name,cpath,cname,desc,flags) \ - pcb_conf_reg_field(conf_io_lihata, field,isarray,type_name,cpath,cname,desc,flags); + rnd_conf_reg_field(conf_io_lihata, field,isarray,type_name,cpath,cname,desc,flags); #include "lht_conf_fields.h" return 0; Index: trunk/src_plugins/io_lihata/read.c =================================================================== --- trunk/src_plugins/io_lihata/read.c (revision 30948) +++ trunk/src_plugins/io_lihata/read.c (revision 30949) @@ -384,7 +384,7 @@ return -1; if (cfg_dest != RND_CFR_invalid) - pcb_conf_set(cfg_dest, path, -1, nd->data.text.value, RND_POL_OVERWRITE); + rnd_conf_set(cfg_dest, path, -1, nd->data.text.value, RND_POL_OVERWRITE); return 0; } @@ -2217,7 +2217,7 @@ { if (cfg_dest == RND_CFR_invalid) return; - if (pcb_conf_insert_tree_as(cfg_dest, sub) != 0) + if (rnd_conf_insert_tree_as(cfg_dest, sub) != 0) rnd_message(PCB_MSG_ERROR, "Failed to insert the config subtree '%s' found in %s\n", sub->name, pcb->hidlib.filename); else pcb_conf_update(NULL, -1); Index: trunk/src_plugins/io_pcb/attribs.c =================================================================== --- trunk/src_plugins/io_pcb/attribs.c (revision 30948) +++ trunk/src_plugins/io_pcb/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: trunk/src_plugins/io_pcb/file.c =================================================================== --- trunk/src_plugins/io_pcb/file.c (revision 30948) +++ trunk/src_plugins/io_pcb/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: trunk/src_plugins/io_pcb/parse_l.c =================================================================== --- trunk/src_plugins/io_pcb/parse_l.c (revision 30948) +++ trunk/src_plugins/io_pcb/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: trunk/src_plugins/io_pcb/parse_l.l =================================================================== --- trunk/src_plugins/io_pcb/parse_l.l (revision 30948) +++ trunk/src_plugins/io_pcb/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: trunk/src_plugins/io_pcb/parse_y.c =================================================================== --- trunk/src_plugins/io_pcb/parse_y.c (revision 30948) +++ trunk/src_plugins/io_pcb/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: trunk/src_plugins/io_pcb/parse_y.y =================================================================== --- trunk/src_plugins/io_pcb/parse_y.y (revision 30948) +++ trunk/src_plugins/io_pcb/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); } Index: trunk/src_plugins/io_tedax/tdrc.c =================================================================== --- trunk/src_plugins/io_tedax/tdrc.c (revision 30948) +++ trunk/src_plugins/io_tedax/tdrc.c (revision 30949) @@ -62,7 +62,7 @@ fputc('\n', f); for(n = 0, r = rules; n < NUM_RULES; r++,n++) { - rnd_conf_native_t *nat = pcb_conf_get_field(r->conf); + 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]); Index: trunk/src_plugins/lib_gtk_common/bu_menu.c =================================================================== --- trunk/src_plugins/lib_gtk_common/bu_menu.c (revision 30948) +++ trunk/src_plugins/lib_gtk_common/bu_menu.c (revision 30949) @@ -167,9 +167,9 @@ gtk_toggle_action_set_draw_as_radio(GTK_TOGGLE_ACTION(action), ! !strchr(checked, '=')); if (update_on != NULL) - nat = pcb_conf_get_field(update_on); + nat = rnd_conf_get_field(update_on); else - nat = pcb_conf_get_field(checked); + nat = rnd_conf_get_field(checked); if (nat != NULL) { static conf_hid_callbacks_t cbs; Index: trunk/src_plugins/lib_gtk_common/glue_common.c =================================================================== --- trunk/src_plugins/lib_gtk_common/glue_common.c (revision 30948) +++ trunk/src_plugins/lib_gtk_common/glue_common.c (revision 30949) @@ -107,7 +107,7 @@ static void init_conf_watch(conf_hid_callbacks_t *cbs, const char *path, void (*func)(rnd_conf_native_t *, int)) { - rnd_conf_native_t *n = pcb_conf_get_field(path); + rnd_conf_native_t *n = rnd_conf_get_field(path); if (n != NULL) { memset(cbs, 0, sizeof(conf_hid_callbacks_t)); cbs->val_change_post = func; Index: trunk/src_plugins/lib_gtk_common/glue_hid.c =================================================================== --- trunk/src_plugins/lib_gtk_common/glue_hid.c (revision 30948) +++ trunk/src_plugins/lib_gtk_common/glue_hid.c (revision 30949) @@ -223,7 +223,7 @@ gtk_disable_setlocale(); #endif - pcb_conf_parse_arguments("plugins/hid_gtk/", argc, argv); + rnd_conf_parse_arguments("plugins/hid_gtk/", argc, argv); if (!gtk_init_check(argc, argv)) { fprintf(stderr, "gtk_init_check() fail - maybe $DISPLAY not set or X/GUI not accessible?\n"); Index: trunk/src_plugins/lib_gtk_common/lib_gtk_config.c =================================================================== --- trunk/src_plugins/lib_gtk_common/lib_gtk_config.c (revision 30948) +++ trunk/src_plugins/lib_gtk_common/lib_gtk_config.c (revision 30949) @@ -42,7 +42,7 @@ void pcb_gtk_conf_uninit(void) { pcb_conf_hid_unreg(lib_gtk_config_cookie); - pcb_conf_unreg_fields("plugins/hid_gtk/"); + rnd_conf_unreg_fields("plugins/hid_gtk/"); } /* Config paths that got removed but can be converted. Pairs of old,new strings */ @@ -100,7 +100,7 @@ ghid_conf_id = pcb_conf_hid_reg(lib_gtk_config_cookie, NULL); #define conf_reg(field,isarray,type_name,cpath,cname,desc,flags) \ - pcb_conf_reg_field(pcb_conf_hid_gtk, field,isarray,type_name,cpath,cname,desc,flags); + rnd_conf_reg_field(pcb_conf_hid_gtk, field,isarray,type_name,cpath,cname,desc,flags); #include "../src_plugins/lib_gtk_common/hid_gtk_conf_fields.h" /* check for legacy win geo settings */ @@ -109,7 +109,7 @@ char *end, dirname[128]; pcb_conf_update(p[0], -1); - nat = pcb_conf_get_field(p[0]); + nat = rnd_conf_get_field(p[0]); if ((nat == NULL) || (nat->prop->src == NULL)) continue; if (!warned) { @@ -122,8 +122,8 @@ end = strrchr(dirname, '/'); assert(end != NULL); *end = '\0'; - if (pcb_conf_get_field(p[1]) == NULL) - pcb_conf_reg_field_(&dummy_gtk_conf_init, 1, RND_CFN_INTEGER, p[1], "", 0); + if (rnd_conf_get_field(p[1]) == NULL) + rnd_conf_reg_field_(&dummy_gtk_conf_init, 1, RND_CFN_INTEGER, p[1], "", 0); r = pcb_conf_lookup_role(nat->prop->src); pcb_conf_setf(r, p[1], -1, "%d", nat->val.integer[0]); dirty[r] = 1; Index: trunk/src_plugins/lib_hid_common/dlg_comm_m.c =================================================================== --- trunk/src_plugins/lib_hid_common/dlg_comm_m.c (revision 30948) +++ trunk/src_plugins/lib_hid_common/dlg_comm_m.c (revision 30949) @@ -276,9 +276,9 @@ res->type = FGW_INT; PCB_DAD_AUTORUN("MayOverwriteFile", dlg, "File overwrite question", NULL, res->val.nat_int); if (dlg[wdontask].val.lng) { - pcb_conf_set(RND_CFR_USER, "plugins/dialogs/file_overwrite_dialog/dont_ask", 0, "1", RND_POL_OVERWRITE); - if (pcb_conf_isdirty(RND_CFR_USER)) - pcb_conf_save_file(hidlib, NULL, NULL, RND_CFR_USER, NULL); + rnd_conf_set(RND_CFR_USER, "plugins/dialogs/file_overwrite_dialog/dont_ask", 0, "1", RND_POL_OVERWRITE); + if (rnd_conf_isdirty(RND_CFR_USER)) + rnd_conf_save_file(hidlib, NULL, NULL, RND_CFR_USER, NULL); } PCB_DAD_FREE(dlg); Index: trunk/src_plugins/lib_hid_common/grid_menu.c =================================================================== --- trunk/src_plugins/lib_hid_common/grid_menu.c (revision 30948) +++ trunk/src_plugins/lib_hid_common/grid_menu.c (revision 30949) @@ -49,7 +49,7 @@ char act[256], chk[256]; int idx; - nat = pcb_conf_get_field("editor/grids"); + nat = rnd_conf_get_field("editor/grids"); if (nat == NULL) return; Index: trunk/src_plugins/lib_hid_common/lib_hid_common.c =================================================================== --- trunk/src_plugins/lib_hid_common/lib_hid_common.c (revision 30948) +++ trunk/src_plugins/lib_hid_common/lib_hid_common.c (revision 30949) @@ -103,7 +103,7 @@ pcb_dialog_place_uninit(); rnd_remove_actions_by_cookie(hid_common_cookie); pcb_act_dad_uninit(); - pcb_conf_unreg_fields("plugins/lib_hid_common/"); + rnd_conf_unreg_fields("plugins/lib_hid_common/"); pcb_dlg_log_uninit(); } @@ -114,7 +114,7 @@ PCB_API_CHK_VER; #define conf_reg(field,isarray,type_name,cpath,cname,desc,flags) \ - pcb_conf_reg_field(dialogs_conf, field,isarray,type_name,cpath,cname,desc,flags); + rnd_conf_reg_field(dialogs_conf, field,isarray,type_name,cpath,cname,desc,flags); /*#include "lib_hid_common_conf_fields.h"*/ #include "dialogs_conf_fields.h" @@ -136,13 +136,13 @@ memset(&ccb, 0, sizeof(ccb)); ccb.val_change_post = pcb_grid_update_conf; - nat = pcb_conf_get_field("editor/grids"); + nat = rnd_conf_get_field("editor/grids"); if (nat != NULL) pcb_conf_hid_set_cb(nat, conf_id, &ccb); memset(&ccbu, 0, sizeof(ccbu)); ccbu.val_change_post = grid_unit_chg_ev; - nat = pcb_conf_get_field("editor/grid_unit"); + nat = rnd_conf_get_field("editor/grid_unit"); if (nat != NULL) pcb_conf_hid_set_cb(nat, conf_id, &ccbu); Index: trunk/src_plugins/lib_hid_common/menu_helper.c =================================================================== --- trunk/src_plugins/lib_hid_common/menu_helper.c (revision 30948) +++ trunk/src_plugins/lib_hid_common/menu_helper.c (revision 30949) @@ -50,7 +50,7 @@ cp = strchr(name, '('); if (cp == NULL) { - rnd_conf_native_t *n = pcb_conf_get_field(name); + rnd_conf_native_t *n = rnd_conf_get_field(name); if (n == NULL) return -1; if ((n->type != RND_CFN_BOOLEAN) || (n->used != 1)) Index: trunk/src_plugins/lib_hid_common/place.c =================================================================== --- trunk/src_plugins/lib_hid_common/place.c (revision 30948) +++ trunk/src_plugins/lib_hid_common/place.c (revision 30949) @@ -121,23 +121,23 @@ { static int dummy; - if (pcb_conf_get_field(path) == NULL) - pcb_conf_reg_field_(&dummy, 1, RND_CFN_INTEGER, str_cleanup_later(path), "", 0); + if (rnd_conf_get_field(path) == NULL) + rnd_conf_reg_field_(&dummy, 1, RND_CFN_INTEGER, str_cleanup_later(path), "", 0); pcb_conf_setf(role, path, -1, "%d", val); } static void place_conf_load(rnd_conf_role_t role, const char *path, int *val) { - rnd_conf_native_t *nat = pcb_conf_get_field(path); + rnd_conf_native_t *nat = rnd_conf_get_field(path); rnd_conf_role_t crole; static int dummy; - if (pcb_conf_get_field(path) == NULL) { - pcb_conf_reg_field_(&dummy, 1, RND_CFN_INTEGER, str_cleanup_later(path), "", 0); + if (rnd_conf_get_field(path) == NULL) { + rnd_conf_reg_field_(&dummy, 1, RND_CFN_INTEGER, str_cleanup_later(path), "", 0); pcb_conf_update(path, -1); } - nat = pcb_conf_get_field(path); + nat = rnd_conf_get_field(path); if ((nat == NULL) || (nat->prop->src == NULL) || (nat->prop->src->type != LHT_TEXT)) { rnd_message(PCB_MSG_ERROR, "Can not load window geometry from invalid node for %s\n", path); return; @@ -226,9 +226,9 @@ if (role != RND_CFR_DESIGN) { - int r = pcb_conf_save_file(hidlib, NULL, (hidlib == NULL ? NULL : hidlib->filename), role, NULL); + int r = rnd_conf_save_file(hidlib, NULL, (hidlib == NULL ? NULL : hidlib->filename), role, NULL); if (r != 0) - rnd_message(PCB_MSG_ERROR, "Failed to save window geometry in %s\n", pcb_conf_role_name(role)); + rnd_message(PCB_MSG_ERROR, "Failed to save window geometry in %s\n", rnd_conf_role_name(role)); } } @@ -291,7 +291,7 @@ htsw_entry_t *e; int n; - pcb_conf_unreg_fields(BASEPATH); + rnd_conf_unreg_fields(BASEPATH); place_maybe_save(NULL, RND_CFR_USER, 0); Index: trunk/src_plugins/lib_hid_common/toolbar.c =================================================================== --- trunk/src_plugins/lib_hid_common/toolbar.c (revision 30948) +++ trunk/src_plugins/lib_hid_common/toolbar.c (revision 30949) @@ -221,7 +221,7 @@ for(rp = paths, n = 0; *rp != NULL; rp++, n++) { memset(&cb[n], 0, sizeof(cb[0])); cb[n].val_change_post = update_cb; - nat = pcb_conf_get_field(*rp); + nat = rnd_conf_get_field(*rp); if (nat != NULL) pcb_conf_hid_set_cb(nat, conf_id, &cb[n]); } Index: trunk/src_plugins/lib_hid_pcbui/lib_hid_pcbui.c =================================================================== --- trunk/src_plugins/lib_hid_pcbui/lib_hid_pcbui.c (revision 30948) +++ trunk/src_plugins/lib_hid_pcbui/lib_hid_pcbui.c (revision 30949) @@ -104,7 +104,7 @@ for(rp = paths, n = 0; *rp != NULL; rp++, n++) { memset(&cb[n], 0, sizeof(cb[0])); cb[n].val_change_post = update_cb; - nat = pcb_conf_get_field(*rp); + nat = rnd_conf_get_field(*rp); if (nat != NULL) pcb_conf_hid_set_cb(nat, conf_id, &cb[n]); } Index: trunk/src_plugins/lib_vfs/lib_vfs.c =================================================================== --- trunk/src_plugins/lib_vfs/lib_vfs.c (revision 30948) +++ trunk/src_plugins/lib_vfs/lib_vfs.c (revision 30949) @@ -508,7 +508,7 @@ static int vfs_access_conf(pcb_board_t *pcb, const char *path, gds_t *buff, int wr, int *isdir) { - rnd_conf_native_t *nat = pcb_conf_get_field(path); + rnd_conf_native_t *nat = rnd_conf_get_field(path); if (nat == NULL) { if (isdir != NULL) *isdir = 1; @@ -522,9 +522,9 @@ *isdir = 0; if (wr) - return pcb_conf_set(RND_CFR_DESIGN, path, 0, buff->array, RND_POL_OVERWRITE); + return rnd_conf_set(RND_CFR_DESIGN, path, 0, buff->array, RND_POL_OVERWRITE); else - pcb_conf_print_native((conf_pfn)vfs_conf_printf, buff, NULL, 0, nat); + rnd_conf_print_native((conf_pfn)vfs_conf_printf, buff, NULL, 0, nat); return 0; } Index: trunk/src_plugins/mincut/rats_mincut.c =================================================================== --- trunk/src_plugins/mincut/rats_mincut.c (revision 30948) +++ trunk/src_plugins/mincut/rats_mincut.c (revision 30949) @@ -363,7 +363,7 @@ void pplg_uninit_mincut(void) { - pcb_conf_unreg_fields("plugins/mincut/"); + rnd_conf_unreg_fields("plugins/mincut/"); pcb_event_unbind_allcookie(pcb_mincut_cookie); } @@ -374,7 +374,7 @@ pcb_event_bind(PCB_EVENT_NET_INDICATE_SHORT, pcb_mincut_ev, NULL, pcb_mincut_cookie); #define conf_reg(field,isarray,type_name,cpath,cname,desc,flags) \ - pcb_conf_reg_field(conf_mincut, field,isarray,type_name,cpath,cname,desc,flags); + rnd_conf_reg_field(conf_mincut, field,isarray,type_name,cpath,cname,desc,flags); #include "rats_mincut_conf_fields.h" return 0; } Index: trunk/src_plugins/oldactions/oldactions.c =================================================================== --- trunk/src_plugins/oldactions/oldactions.c (revision 30948) +++ trunk/src_plugins/oldactions/oldactions.c (revision 30949) @@ -47,7 +47,7 @@ static void conf_toggle(rnd_conf_role_t role, const char *path) { - rnd_conf_native_t *n = pcb_conf_get_field(path); + rnd_conf_native_t *n = rnd_conf_get_field(path); if (n == NULL) { rnd_message(PCB_MSG_ERROR, "Error: can't find config node %s to toggle\n", path); return; @@ -57,7 +57,7 @@ return; } - pcb_conf_set(role, path, -1, n->val.boolean[0] ? "0" : "1", RND_POL_OVERWRITE); + rnd_conf_set(role, path, -1, n->val.boolean[0] ? "0" : "1", RND_POL_OVERWRITE); } static const char pcb_acts_DumpLibrary[] = "DumpLibrary()"; @@ -208,7 +208,7 @@ */ fgw_error_t pcb_act_EnableVendor(fgw_arg_t *res, int argc, fgw_arg_t *argv) { - pcb_conf_set(RND_CFR_DESIGN, "plugins/vendor/enable", -1, "1", RND_POL_OVERWRITE); + rnd_conf_set(RND_CFR_DESIGN, "plugins/vendor/enable", -1, "1", RND_POL_OVERWRITE); RND_ACT_IRES(0); return 0; } @@ -225,7 +225,7 @@ */ fgw_error_t pcb_act_DisableVendor(fgw_arg_t *res, int argc, fgw_arg_t *argv) { - pcb_conf_set(RND_CFR_DESIGN, "plugins/vendor/enable", -1, "0", RND_POL_OVERWRITE); + rnd_conf_set(RND_CFR_DESIGN, "plugins/vendor/enable", -1, "0", RND_POL_OVERWRITE); RND_ACT_IRES(0); return 0; } Index: trunk/src_plugins/order/order.c =================================================================== --- trunk/src_plugins/order/order.c (revision 30948) +++ trunk/src_plugins/order/order.c (revision 30949) @@ -205,7 +205,7 @@ rnd_remove_actions_by_cookie(order_cookie); pcb_event_unbind_allcookie(order_cookie); pcb_conf_unreg_file(ORDER_CONF_FN, order_conf_internal); - pcb_conf_unreg_fields("plugins/order/"); + rnd_conf_unreg_fields("plugins/order/"); } int pplg_init_order(void) @@ -214,7 +214,7 @@ pcb_conf_reg_file(ORDER_CONF_FN, order_conf_internal); #define conf_reg(field,isarray,type_name,cpath,cname,desc,flags) \ - pcb_conf_reg_field(conf_order, field,isarray,type_name,cpath,cname,desc,flags); + rnd_conf_reg_field(conf_order, field,isarray,type_name,cpath,cname,desc,flags); #include "order_conf_fields.h" RND_REGISTER_ACTIONS(order_action_list, order_cookie) Index: trunk/src_plugins/order_pcbway/pcbway.c =================================================================== --- trunk/src_plugins/order_pcbway/pcbway.c (revision 30948) +++ trunk/src_plugins/order_pcbway/pcbway.c (revision 30949) @@ -571,7 +571,7 @@ void pplg_uninit_order_pcbway(void) { pcb_conf_unreg_file(ORDER_PCBWAY_CONF_FN, order_pcbway_conf_internal); - pcb_conf_unreg_fields("plugins/order_pcbway/"); + rnd_conf_unreg_fields("plugins/order_pcbway/"); } int pplg_init_order_pcbway(void) @@ -580,7 +580,7 @@ pcb_conf_reg_file(ORDER_PCBWAY_CONF_FN, order_pcbway_conf_internal); #define conf_reg(field,isarray,type_name,cpath,cname,desc,flags) \ - pcb_conf_reg_field(conf_order_pcbway, field,isarray,type_name,cpath,cname,desc,flags); + rnd_conf_reg_field(conf_order_pcbway, field,isarray,type_name,cpath,cname,desc,flags); #include "order_pcbway_conf_fields.h" pcb_order_reg(&pcbway); Index: trunk/src_plugins/propedit/propdlg.c =================================================================== --- trunk/src_plugins/propedit/propdlg.c (revision 30948) +++ trunk/src_plugins/propedit/propdlg.c (revision 30949) @@ -693,7 +693,7 @@ void pcb_propdlg_init(void) { static conf_hid_callbacks_t cbs; - rnd_conf_native_t *n = pcb_conf_get_field("editor/grid_unit"); + rnd_conf_native_t *n = rnd_conf_get_field("editor/grid_unit"); propdlg_conf_id = pcb_conf_hid_reg(propdlg_cookie, NULL); if (n != NULL) { Index: trunk/src_plugins/query/fnc_glue.c =================================================================== --- trunk/src_plugins/query/fnc_glue.c (revision 30948) +++ trunk/src_plugins/query/fnc_glue.c (revision 30949) @@ -215,7 +215,7 @@ if (argv[0].type != PCBQ_VT_STRING) return -1; - nat = pcb_conf_get_field(argv[0].data.str); + nat = rnd_conf_get_field(argv[0].data.str); if (nat == NULL) PCB_QRY_RET_INV(res); Index: trunk/src_plugins/report/report.c =================================================================== --- trunk/src_plugins/report/report.c (revision 30948) +++ trunk/src_plugins/report/report.c (revision 30949) @@ -831,7 +831,7 @@ void pplg_uninit_report(void) { rnd_remove_actions_by_cookie(report_cookie); - pcb_conf_unreg_fields("plugins/report/"); + rnd_conf_unreg_fields("plugins/report/"); } int pplg_init_report(void) @@ -839,7 +839,7 @@ PCB_API_CHK_VER; RND_REGISTER_ACTIONS(report_action_list, report_cookie) #define conf_reg(field,isarray,type_name,cpath,cname,desc,flags) \ - pcb_conf_reg_field(conf_report, field,isarray,type_name,cpath,cname,desc,flags); + rnd_conf_reg_field(conf_report, field,isarray,type_name,cpath,cname,desc,flags); #include "report_conf_fields.h" return 0; } Index: trunk/src_plugins/rubberband_orig/rubberband.c =================================================================== --- trunk/src_plugins/rubberband_orig/rubberband.c (revision 30948) +++ trunk/src_plugins/rubberband_orig/rubberband.c (revision 30949) @@ -1434,7 +1434,7 @@ void pplg_uninit_rubberband_orig(void) { pcb_event_unbind_allcookie(rubber_cookie); - pcb_conf_unreg_fields("plugins/rubberband_orig/"); + rnd_conf_unreg_fields("plugins/rubberband_orig/"); } int pplg_init_rubberband_orig(void) @@ -1451,7 +1451,7 @@ pcb_event_bind(PCB_EVENT_RUBBER_CONSTRAIN_MAIN_LINE, rbe_constrain_main_line, ctx, rubber_cookie); #define conf_reg(field,isarray,type_name,cpath,cname,desc,flags) \ - pcb_conf_reg_field(conf_rbo, field,isarray,type_name,cpath,cname,desc,flags); + rnd_conf_reg_field(conf_rbo, field,isarray,type_name,cpath,cname,desc,flags); #include "rubberband_conf_fields.h" return 0; Index: trunk/src_plugins/serpentine/serpentine.c =================================================================== --- trunk/src_plugins/serpentine/serpentine.c (revision 30948) +++ trunk/src_plugins/serpentine/serpentine.c (revision 30949) @@ -446,7 +446,7 @@ { rnd_remove_actions_by_cookie(serpentine_cookie); pcb_tool_unreg_by_cookie(serpentine_cookie); - pcb_conf_unreg_fields("plugins/serpentine/"); + rnd_conf_unreg_fields("plugins/serpentine/"); } int pplg_init_serpentine(void) @@ -454,7 +454,7 @@ PCB_API_CHK_VER; RND_REGISTER_ACTIONS(serpentine_action_list, serpentine_cookie) #define conf_reg(field,isarray,type_name,cpath,cname,desc,flags) \ - pcb_conf_reg_field(conf_serpentine, field,isarray,type_name,cpath,cname,desc,flags); + rnd_conf_reg_field(conf_serpentine, field,isarray,type_name,cpath,cname,desc,flags); #include "serpentine_conf_fields.h" pcb_tool_reg(&tool_serpentine, serpentine_cookie); Index: trunk/src_plugins/stroke/stroke.c =================================================================== --- trunk/src_plugins/stroke/stroke.c (revision 30948) +++ trunk/src_plugins/stroke/stroke.c (revision 30949) @@ -159,7 +159,7 @@ int pplg_uninit_stroke(void) { pcb_conf_unreg_file(STROKE_CONF_FN, stroke_conf_internal); - pcb_conf_unreg_fields("plugins/stroke/"); + rnd_conf_unreg_fields("plugins/stroke/"); rnd_remove_actions_by_cookie(pcb_stroke_cookie); pcb_event_unbind_allcookie(pcb_stroke_cookie); return 0; @@ -172,7 +172,7 @@ pcb_conf_reg_file(STROKE_CONF_FN, stroke_conf_internal); #define conf_reg(field,isarray,type_name,cpath,cname,desc,flags) \ - pcb_conf_reg_field(conf_stroke, field,isarray,type_name,cpath,cname,desc,flags); + rnd_conf_reg_field(conf_stroke, field,isarray,type_name,cpath,cname,desc,flags); #include "stroke_conf_fields.h" RND_REGISTER_ACTIONS(stroke_action_list, pcb_stroke_cookie) Index: trunk/src_plugins/vendordrill/vendor.c =================================================================== --- trunk/src_plugins/vendordrill/vendor.c (revision 30948) +++ trunk/src_plugins/vendordrill/vendor.c (revision 30949) @@ -97,7 +97,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 rnd_bool vendorIsSubcMappable(pcb_subc_t *subc); @@ -270,7 +270,7 @@ rnd_message(PCB_MSG_INFO, "Loaded %d vendor drills from %s\n", n_vendor_drills, fname); rnd_message(PCB_MSG_INFO, "Loaded %d RefDes skips, %d Value skips, %d Descr skips\n", n_refdes, n_value, n_descr); - pcb_conf_set(RND_CFR_DESIGN, "plugins/vendor/enable", -1, "0", RND_POL_OVERWRITE); + rnd_conf_set(RND_CFR_DESIGN, "plugins/vendor/enable", -1, "0", RND_POL_OVERWRITE); apply_vendor_map(); if (free_fname) @@ -659,7 +659,7 @@ pcb_event_unbind_allcookie(vendor_cookie); rnd_remove_actions_by_cookie(vendor_cookie); vendor_free_all(); - pcb_conf_unreg_fields("plugins/vendor/"); + rnd_conf_unreg_fields("plugins/vendor/"); } int pplg_init_vendordrill(void) @@ -666,7 +666,7 @@ { PCB_API_CHK_VER; #define conf_reg(field,isarray,type_name,cpath,cname,desc,flags) \ - pcb_conf_reg_field(conf_vendor, field,isarray,type_name,cpath,cname,desc,flags); + rnd_conf_reg_field(conf_vendor, field,isarray,type_name,cpath,cname,desc,flags); #include "vendor_conf_fields.h" pcb_event_bind(PCB_EVENT_NEW_PSTK, vendor_new_pstk, NULL, vendor_cookie); Index: trunk/tests/conf/conftest.c =================================================================== --- trunk/tests/conf/conftest.c (revision 30948) +++ trunk/tests/conf/conftest.c (revision 30949) @@ -92,7 +92,7 @@ rnd_conf_role_t role; arg+=7; while(isspace(*arg)) arg++; - role = pcb_conf_role_parse(arg); + role = rnd_conf_role_parse(arg); if (role == RND_CFR_invalid) { rnd_message(PCB_MSG_ERROR, "Invalid role: '%s'", arg); return; @@ -115,13 +115,13 @@ rnd_message(PCB_MSG_ERROR, "Need an arg: a native path"); return; } - node = pcb_conf_get_field(arg); + node = rnd_conf_get_field(arg); if (node == NULL) { rnd_message(PCB_MSG_ERROR, "No such path: '%s'", arg); return; } gds_init(&s); - pcb_conf_print_native((conf_pfn)pcb_append_printf, &s, NULL, 0, node); + rnd_conf_print_native((conf_pfn)pcb_append_printf, &s, NULL, 0, node); printf("%s='%s'\n", node->hash_path, s.array); gds_uninit(&s); } @@ -138,7 +138,7 @@ } if (*arg == '*') { - pcb_conf_load_all(NULL, NULL); + rnd_conf_load_all(NULL, NULL); return; } @@ -149,12 +149,12 @@ fn++; while(isspace(*fn)) fn++; - role = pcb_conf_role_parse(arg); + role = rnd_conf_role_parse(arg); if (role == RND_CFR_invalid) { rnd_message(PCB_MSG_ERROR, "Invalid role: '%s'", arg); return; } - printf("Result: %d\n", pcb_conf_load_as(role, fn, is_text)); + printf("Result: %d\n", rnd_conf_load_as(role, fn, is_text)); pcb_conf_update(NULL, -1); } @@ -163,7 +163,7 @@ void cmd_policy(char *arg) { - rnd_conf_policy_t np = pcb_conf_policy_parse(arg); + rnd_conf_policy_t np = rnd_conf_policy_parse(arg); if (np == RND_POL_invalid) rnd_message(PCB_MSG_ERROR, "Invalid/unknown policy: '%s'", arg); else @@ -172,7 +172,7 @@ void cmd_role(char *arg) { - rnd_conf_role_t nr = pcb_conf_role_parse(arg); + rnd_conf_role_t nr = rnd_conf_role_parse(arg); if (nr == RND_CFR_invalid) rnd_message(PCB_MSG_ERROR, "Invalid/unknown role: '%s'", arg); else @@ -212,7 +212,7 @@ rnd_message(PCB_MSG_ERROR, "need a policy", arg); return; } - np = pcb_conf_policy_parse(arg); + np = rnd_conf_policy_parse(arg); if (np == RND_POL_invalid) { rnd_message(PCB_MSG_ERROR, "Invalid integer policy: '%s'", arg); return; @@ -251,7 +251,7 @@ val++; while(isspace(*val) || (*val == '=')) val++; - res = pcb_conf_set(current_role, path, -1, val, current_policy); + res = rnd_conf_set(current_role, path, -1, val, current_policy); if (res != 0) printf("set error: %d\n", res); } @@ -258,7 +258,7 @@ void cmd_watch(char *arg, int add) { - rnd_conf_native_t *n = pcb_conf_get_field(arg); + rnd_conf_native_t *n = rnd_conf_get_field(arg); if (n == NULL) { rnd_message(PCB_MSG_ERROR, "unknown path"); return; @@ -286,20 +286,20 @@ void cmd_reset(char *arg) { if (arg == NULL) { - pcb_conf_reset(current_role, ""); + rnd_conf_reset(current_role, ""); } else if (*arg == '*') { int n; for(n = 0; n < RND_CFR_max_real; n++) - pcb_conf_reset(n, ""); + rnd_conf_reset(n, ""); } else { - rnd_conf_role_t role = pcb_conf_role_parse(arg); + rnd_conf_role_t role = rnd_conf_role_parse(arg); if (role == RND_CFR_invalid) { rnd_message(PCB_MSG_ERROR, "Invalid role: '%s'", arg); return; } - pcb_conf_reset(role, ""); + rnd_conf_reset(role, ""); } pcb_conf_update(NULL, -1); } @@ -350,11 +350,11 @@ hid_id = pcb_conf_hid_reg(hid_cookie, &global_cbs); - pcb_conf_init(); + rnd_conf_init(); conf_core_init(); pcb_hidlib_conf_init(); - pcb_conf_reset(RND_CFR_SYSTEM, "
"); - pcb_conf_reset(RND_CFR_USER, "
"); + rnd_conf_reset(RND_CFR_SYSTEM, "
"); + rnd_conf_reset(RND_CFR_USER, "
"); while(getline_cont(stdin)) { char *arg, *cmd = line; @@ -404,6 +404,6 @@ conf_core_uninit_pre(); pcb_conf_hid_unreg(hid_cookie); - pcb_conf_uninit(); + rnd_conf_uninit(); return 0; } Index: trunk/tests/conf/help.c =================================================================== --- trunk/tests/conf/help.c (revision 30948) +++ trunk/tests/conf/help.c (revision 30949) @@ -31,7 +31,7 @@ "Change the policy of the first confroot of the current role's in-memory lihata document to pol and merge. Pol is a policy, see: help policies", "set", "path value", - "Call pcb_conf_set() on a given path with the given value, using the current set-role and the current set-policy. See also: help role; help policy.", + "Call rnd_conf_set() on a given path with the given value, using the current set-role and the current set-policy. See also: help role; help policy.", "watch", "path", "Announce changes of a given path. See also: help unwatch", Index: trunk/tests/librnd/glue.c =================================================================== --- trunk/tests/librnd/glue.c (revision 30948) +++ trunk/tests/librnd/glue.c (revision 30949) @@ -33,7 +33,7 @@ void conf_core_init() { - pcb_conf_reg_field_(NULL, 1, RND_CFN_COORD, "should_never_match", "dummy", 0); + rnd_conf_reg_field_(NULL, 1, RND_CFN_COORD, "should_never_match", "dummy", 0); } void pcb_hidlib_adjust_attached_objects(rnd_hidlib_t *hl) Index: trunk/tests/librnd/librnd_test.c =================================================================== --- trunk/tests/librnd/librnd_test.c (revision 30948) +++ trunk/tests/librnd/librnd_test.c (revision 30949) @@ -33,7 +33,7 @@ n += pcbhl_main_args_add(&ga, argv[n], argv[n+1]); pcb_hidlib_init2(pup_buildins, local_buildins); - pcb_conf_set(RND_CFR_CLI, "editor/view/flip_y", 0, "1", RND_POL_OVERWRITE); + rnd_conf_set(RND_CFR_CLI, "editor/view/flip_y", 0, "1", RND_POL_OVERWRITE); if (pcbhl_main_args_setup1(&ga) != 0) { fprintf(stderr, "setup1 fail\n"); Index: trunk/util/gsch2pcb-rnd/gsch2pcb.c =================================================================== --- trunk/util/gsch2pcb-rnd/gsch2pcb.c (revision 30948) +++ trunk/util/gsch2pcb-rnd/gsch2pcb.c (revision 30949) @@ -120,7 +120,7 @@ const char *suff = loc_str_has_suffix(sch, ".sch", 4); if (suff != NULL) { char *tmp = rnd_strndup(sch, suff - sch); - pcb_conf_set(RND_CFR_CLI, "utils/gsch2pcb_rnd/sch_basename", -1, tmp, RND_POL_OVERWRITE); + rnd_conf_set(RND_CFR_CLI, "utils/gsch2pcb_rnd/sch_basename", -1, tmp, RND_POL_OVERWRITE); free(tmp); } } @@ -164,23 +164,23 @@ if (!strcmp(config, "remove-unfound") || !strcmp(config, "r")) { /* This is default behavior set in header section */ - pcb_conf_set(RND_CFR_CLI, "utils/gsch2pcb_rnd/remove_unfound_elements", -1, "1", RND_POL_OVERWRITE); + rnd_conf_set(RND_CFR_CLI, "utils/gsch2pcb_rnd/remove_unfound_elements", -1, "1", RND_POL_OVERWRITE); return 0; } if (!strcmp(config, "keep-unfound") || !strcmp(config, "k")) { - pcb_conf_set(RND_CFR_CLI, "utils/gsch2pcb_rnd/remove_unfound_elements", -1, "0", RND_POL_OVERWRITE); + rnd_conf_set(RND_CFR_CLI, "utils/gsch2pcb_rnd/remove_unfound_elements", -1, "0", RND_POL_OVERWRITE); return 0; } if (!strcmp(config, "quiet") || !strcmp(config, "q")) { - pcb_conf_set(RND_CFR_CLI, "utils/gsch2pcb_rnd/quiet_mode", -1, "1", RND_POL_OVERWRITE); + rnd_conf_set(RND_CFR_CLI, "utils/gsch2pcb_rnd/quiet_mode", -1, "1", RND_POL_OVERWRITE); return 0; } if (!strcmp(config, "preserve") || !strcmp(config, "p")) { - pcb_conf_set(RND_CFR_CLI, "utils/gsch2pcb_rnd/preserve", -1, "1", RND_POL_OVERWRITE); + rnd_conf_set(RND_CFR_CLI, "utils/gsch2pcb_rnd/preserve", -1, "1", RND_POL_OVERWRITE); return 0; } if (!strcmp(config, "elements-shell") || !strcmp(config, "s")) - pcb_conf_set(RND_CFR_CLI, "rc/library_shell", -1, arg, RND_POL_OVERWRITE); + rnd_conf_set(RND_CFR_CLI, "rc/library_shell", -1, arg, RND_POL_OVERWRITE); else if (!strcmp(config, "elements-dir") || !strcmp(config, "d")) { static int warned = 0; if (!warned) { @@ -187,12 +187,12 @@ rnd_message(PCB_MSG_WARNING, "WARNING: using elements-dir from %s - this overrides the normal pcb-rnd configured library search paths\n", config); warned = 1; } - pcb_conf_set(RND_CFR_CLI, "rc/library_search_paths", -1, arg, RND_POL_PREPEND); + rnd_conf_set(RND_CFR_CLI, "rc/library_search_paths", -1, arg, RND_POL_PREPEND); } else if (!strcmp(config, "output-name") || !strcmp(config, "o")) - pcb_conf_set(RND_CFR_CLI, "utils/gsch2pcb_rnd/sch_basename", -1, arg, RND_POL_OVERWRITE); + rnd_conf_set(RND_CFR_CLI, "utils/gsch2pcb_rnd/sch_basename", -1, arg, RND_POL_OVERWRITE); else if (!strcmp(config, "default-pcb") || !strcmp(config, "P")) - pcb_conf_set(RND_CFR_CLI, "utils/gsch2pcb_rnd/default_pcb", -1, arg, RND_POL_OVERWRITE); + rnd_conf_set(RND_CFR_CLI, "utils/gsch2pcb_rnd/default_pcb", -1, arg, RND_POL_OVERWRITE); else if (!strcmp(config, "schematics")) add_multiple_schematics(arg); else if (!strcmp(config, "gnetlist")) { @@ -202,7 +202,7 @@ gadl_append(&extra_gnetlist_list, n); } else if (!strcmp(config, "empty-footprint")) - pcb_conf_set(RND_CFR_CLI, "utils/gsch2pcb_rnd/empty_footprint_name", -1, arg, RND_POL_OVERWRITE); + rnd_conf_set(RND_CFR_CLI, "utils/gsch2pcb_rnd/empty_footprint_name", -1, arg, RND_POL_OVERWRITE); else return -1; @@ -252,7 +252,7 @@ lihata_prj:; fclose(f); - if (pcb_conf_load_as(RND_CFR_PROJECT, path, 0) != 0) { + if (rnd_conf_load_as(RND_CFR_PROJECT, path, 0) != 0) { rnd_message(PCB_MSG_ERROR, "Failed to parse project file %s.\n", path); exit(1); } @@ -298,7 +298,7 @@ else if (!strcmp(opt, "verbose") || !strcmp(opt, "v")) { char tmp[64]; sprintf(tmp, "%ld", conf_g2pr.utils.gsch2pcb_rnd.verbose + 1); - pcb_conf_set(RND_CFR_CLI, "utils/gsch2pcb_rnd/verbose", -1, tmp, RND_POL_OVERWRITE); + rnd_conf_set(RND_CFR_CLI, "utils/gsch2pcb_rnd/verbose", -1, tmp, RND_POL_OVERWRITE); continue; } else if (!strcmp(opt, "m") || !strcmp(opt, "method")) { @@ -306,13 +306,13 @@ rnd_message(PCB_MSG_ERROR, "Error: can't use unknown method '%s'; try --help\n", arg); exit(1); } - pcb_conf_set(RND_CFR_CLI, "utils/gsch2pcb_rnd/method", -1, arg, RND_POL_OVERWRITE); + rnd_conf_set(RND_CFR_CLI, "utils/gsch2pcb_rnd/method", -1, arg, RND_POL_OVERWRITE); i++; continue; } else if (!strcmp(opt, "c") || !strcmp(opt, "conf")) { const char *stmp; - if (pcb_conf_set_from_cli(NULL, arg, NULL, &stmp) != 0) { + if (rnd_conf_set_from_cli(NULL, arg, NULL, &stmp) != 0) { fprintf(stderr, "Error: failed to set config %s: %s\n", arg, stmp); exit(1); } @@ -320,7 +320,7 @@ continue; } else if (!strcmp(opt, "fix-elements")) { - pcb_conf_set(RND_CFR_CLI, "utils/gsch2pcb_rnd/fix_elements", -1, "1", RND_POL_OVERWRITE); + rnd_conf_set(RND_CFR_CLI, "utils/gsch2pcb_rnd/fix_elements", -1, "1", RND_POL_OVERWRITE); continue; } else if (!strcmp(opt, "gnetlist-arg")) { @@ -399,7 +399,7 @@ pcbhl_menu_file_paths[3] = NULL; pcb_file_loaded_init(); - pcb_conf_init(); + rnd_conf_init(); conf_core_init(); pcb_hidlib_conf_init(); @@ -408,12 +408,12 @@ gadl_list_init(&extra_gnetlist_list, sizeof(char *), NULL, NULL); #define conf_reg(field,isarray,type_name,cpath,cname,desc,flags) \ - pcb_conf_reg_field(conf_g2pr, field,isarray,type_name,cpath,cname,desc,flags); + rnd_conf_reg_field(conf_g2pr, field,isarray,type_name,cpath,cname,desc,flags); #include "gsch2pcb_rnd_conf_fields.h" get_args(argc, argv); - pcb_conf_load_all(NULL, NULL); + rnd_conf_load_all(NULL, NULL); pcb_conf_update(NULL, -1); load_extra_project_files(); @@ -424,7 +424,7 @@ rnd_message(PCB_MSG_ERROR, "Don't know what to do: no project or schematics given, no local project file %s found. Try %s --help\n", LOCAL_PROJECT_FILE, argv[0]); exit(1); } - if (pcb_conf_load_as(RND_CFR_PROJECT, LOCAL_PROJECT_FILE, 0) != 0) { + if (rnd_conf_load_as(RND_CFR_PROJECT, LOCAL_PROJECT_FILE, 0) != 0) { rnd_message(PCB_MSG_ERROR, "Failed to load project file %s. Try %s --help\n", LOCAL_PROJECT_FILE, argv[0]); exit(1); } @@ -431,10 +431,10 @@ pcb_conf_update(NULL, -1); /* because of our new project file */ } else if ((local_project_pcb_name != NULL) && (!have_cli_project_file)) - pcb_conf_load_project(NULL, local_project_pcb_name); + rnd_conf_load_project(NULL, local_project_pcb_name); if (!have_cli_schematics) { /* load all schematics from the project file unless we have schematics from the cli */ - rnd_conf_native_t *nat = pcb_conf_get_field("utils/gsch2pcb_rnd/schematics"); + rnd_conf_native_t *nat = rnd_conf_get_field("utils/gsch2pcb_rnd/schematics"); if (nat != NULL) { pcb_conf_listitem_t *ci; for (ci = pcb_conflist_first(nat->val.list); ci != NULL; ci = pcb_conflist_next(ci)) { @@ -491,7 +491,7 @@ current_method->uninit(); - pcb_conf_uninit(); + rnd_conf_uninit(); free_strlist(&schematics); free_strlist(&extra_gnetlist_arg_list);