Index: trunk/src/conf_core.c =================================================================== --- trunk/src/conf_core.c (revision 30949) +++ trunk/src/conf_core.c (revision 30950) @@ -35,7 +35,7 @@ const char *dst_path = ndst->hash_path; gds_init(&tmp); - rnd_conf_print_native_field((conf_pfn)pcb_append_printf, &tmp, 0, &nlegacy->val, nlegacy->type, nlegacy->prop, 0); + rnd_conf_print_native_field((rnd_conf_pfn)pcb_append_printf, &tmp, 0, &nlegacy->val, nlegacy->type, nlegacy->prop, 0); if (tmp.used > 0) rnd_conf_set(RND_CFR_INTERNAL, dst_path, -1, tmp.array, RND_POL_OVERWRITE); gds_uninit(&tmp); Index: trunk/src/librnd/core/conf.c =================================================================== --- trunk/src/librnd/core/conf.c (revision 30949) +++ trunk/src/librnd/core/conf.c (revision 30950) @@ -59,7 +59,7 @@ void (*pcb_conf_core_postproc)(void) = NULL; extern void pcbhl_conf_postproc(void); -int pcb_conf_in_production = 0; +int rnd_conf_in_production = 0; /* The main conf: monolithic config files affecting all parts of the conf tree; By default every operation is done on these trees. */ @@ -76,7 +76,7 @@ lht_doc_t *pcb_conf_plug_root[RND_CFR_max_alloc]; -htsp_t *pcb_conf_fields = NULL; +htsp_t *rnd_conf_fields = NULL; const int rnd_conf_default_prio[] = { /* RND_CFR_INTERNAL */ 100, /* RND_CFR_SYSTEM */ 200, @@ -1062,7 +1062,7 @@ } int rnd_conf_rev = 0; -void pcb_conf_update(const char *path, int arr_idx) +void rnd_conf_update(const char *path, int arr_idx) { rnd_conf_native_t *n; @@ -1091,7 +1091,7 @@ /* if a valid node is found, update it */ if (n != NULL) - pcb_conf_update(path_, arr_idx); + rnd_conf_update(path_, arr_idx); free(path_); return; @@ -1265,7 +1265,7 @@ if (pcb_conf_main_root[RND_CFR_USER] == NULL) rnd_conf_reset(RND_CFR_USER, pcphl_conf_user_path); - pcb_conf_in_production = 1; + rnd_conf_in_production = 1; } void rnd_conf_load_extra(const char *project_fn, const char *pcb_fn) @@ -1291,7 +1291,7 @@ pc = NULL; if (pc == NULL) rnd_conf_reset(RND_CFR_PROJECT, ""); - pcb_conf_update(NULL, -1); + rnd_conf_update(NULL, -1); } 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) @@ -1298,13 +1298,13 @@ { rnd_conf_native_t *node; - if (pcb_conf_fields == NULL) { - pcb_conf_fields = htsp_alloc(strhash, strkeyeq); - assert(pcb_conf_fields != NULL); + if (rnd_conf_fields == NULL) { + rnd_conf_fields = htsp_alloc(strhash, strkeyeq); + assert(rnd_conf_fields != NULL); } assert(array_size >= 1); - assert(htsp_get(pcb_conf_fields, path) == NULL); + assert(htsp_get(rnd_conf_fields, path) == NULL); node = calloc(sizeof(rnd_conf_native_t), 1); node->array_size = array_size; @@ -1317,7 +1317,7 @@ vtp0_init(&(node->hid_data)); vtp0_init(&(node->hid_callbacks)); - htsp_set(pcb_conf_fields, (char *)path, node); + htsp_set(rnd_conf_fields, (char *)path, node); conf_hid_global_cb(node, -1, new_item_post); return node; @@ -1378,7 +1378,7 @@ conf_fields_foreach(e) { if (strncmp(e->key, prefix, len) == 0) { pcb_conf_free_native(e->value); - htsp_delentry(pcb_conf_fields, e); + htsp_delentry(rnd_conf_fields, e); } } } @@ -1385,7 +1385,7 @@ void rnd_conf_unreg_field(rnd_conf_native_t *field) { - htsp_pop(pcb_conf_fields, field->hash_path); + htsp_pop(rnd_conf_fields, field->hash_path); pcb_conf_free_native(field); } @@ -1392,7 +1392,7 @@ rnd_conf_native_t *rnd_conf_get_field(const char *path) { - return htsp_get(pcb_conf_fields, path); + return htsp_get(rnd_conf_fields, path); } 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) @@ -1622,7 +1622,7 @@ res = rnd_conf_set_dry(target, path, arr_idx, new_val, pol, 1); if (res < 0) return res; - pcb_conf_update(path, arr_idx); + rnd_conf_update(path, arr_idx); return 0; } @@ -1632,7 +1632,7 @@ 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); + rnd_conf_update(path, arr_idx); return 0; } @@ -1831,7 +1831,7 @@ } } else { - rnd_conf_print_native_field((conf_pfn)pcb_append_printf, &s, 0, &n->val, n->type, n->prop+i, i); + rnd_conf_print_native_field((rnd_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) @@ -2103,7 +2103,7 @@ } \ } while(0) -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 rnd_conf_print_native_field(rnd_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) { @@ -2146,7 +2146,7 @@ return ret; } -int rnd_conf_print_native(conf_pfn pfn, void *ctx, const char * prefix, int verbose, rnd_conf_native_t *node) +int rnd_conf_print_native(rnd_conf_pfn pfn, void *ctx, const char * prefix, int verbose, rnd_conf_native_t *node) { int ret = 0; if ((node->used <= 0) && (!verbose)) @@ -2215,9 +2215,9 @@ conf_fields_foreach(e) { pcb_conf_free_native(e->value); - htsp_delentry(pcb_conf_fields, e); + htsp_delentry(rnd_conf_fields, e); } - htsp_free(pcb_conf_fields); + htsp_free(rnd_conf_fields); vmst_uninit(&merge_subtree); pcb_conf_files_uninit(); Index: trunk/src/librnd/core/conf.h =================================================================== --- trunk/src/librnd/core/conf.h (revision 30949) +++ trunk/src/librnd/core/conf.h (revision 30950) @@ -157,16 +157,16 @@ 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 +/* Load all config files from disk into memory-lht and run rnd_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 rnd_conf_load_all(const char *project_fn, const char *pcb_fn); +void rnd_conf_load_all(const char *project_fn, const char *design_fn); /* 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; +extern int rnd_conf_in_production; /* Load a file or a string as a role */ int rnd_conf_load_as(rnd_conf_role_t role, const char *fn, int fn_is_text); @@ -175,15 +175,15 @@ return 0 on success and removes/invalidates 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. +/* Load a project file into RND_CFR_PROJECT. Both project_fn and design_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 rnd_conf_load_project(const char *project_fn, const char *pcb_fn); + found. Runs rnd_conf_update(NULL); */ +void rnd_conf_load_project(const char *project_fn, const char *design_fn); -void rnd_conf_load_extra(const char *project_fn, const char *pcb_fn); +void rnd_conf_load_extra(const char *project_fn, const char *design_fn); /* Update the binary representation from the memory-lht representation */ -void pcb_conf_update(const char *path, int arr_idx); +void rnd_conf_update(const char *path, int arr_idx); 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); @@ -198,18 +198,18 @@ 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. */ + considerations as in rnd_conf_set. */ 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 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. +/* Same as rnd_conf_set, but without updating the binary - useful for multiple + rnd_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 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 +/* Same as rnd_conf_set, but doesn't look up where to set things: change the value of the lihata node backing the native field */ int rnd_conf_set_native(rnd_conf_native_t *field, int arr_idx, const char *new_val); @@ -221,7 +221,7 @@ Returns 0 on success. */ 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 */ +/* Attempt to consume argv[] using rnd_conf_set_from_cli */ int rnd_conf_parse_arguments(const char *prefix, int *argc, char ***argv); #define rnd_conf_reg_field_array(globvar, field, type_name, path, desc, flags) \ @@ -267,7 +267,7 @@ void rnd_conf_reset(rnd_conf_role_t target, const char *source_fn); /* Save an in-memory lihata representation to the disk */ -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 rnd_conf_save_file(rnd_hidlib_t *hidlib, const char *project_fn, const char *design_fn, rnd_conf_role_t role, const char *fn); /* Returns whether a given lihata tree is locked */ int rnd_conf_islocked(rnd_conf_role_t target); @@ -277,22 +277,22 @@ void rnd_conf_makedirty(rnd_conf_role_t target); /* all configuration fields ever seen */ -extern htsp_t *pcb_conf_fields; +extern htsp_t *rnd_conf_fields; /***** print fields from binary to lihata/text *****/ -typedef int (*conf_pfn)(void *ctx, const char *fmt, ...); +typedef int (*rnd_conf_pfn)(void *ctx, const char *fmt, ...); /* Prints the value of a node in a form that is suitable for lihata. Prints 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 + the sum of rnd_conf_pfn call return values - this is usually the number of bytes printed. */ -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 rnd_conf_print_native_field(rnd_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 + full arrays. Returns the sum of rnd_conf_pfn call return values - this is usually the number of bytes printed. */ -int rnd_conf_print_native(conf_pfn pfn, void *ctx, const char * prefix, int verbose, rnd_conf_native_t *node); +int rnd_conf_print_native(rnd_conf_pfn pfn, void *ctx, const char * prefix, int verbose, rnd_conf_native_t *node); /* Mark a path read-only */ void rnd_conf_ro(const char *path); @@ -329,7 +329,7 @@ /* htsp_entry_t *e; */ #define conf_fields_foreach(e) \ - for (e = htsp_first(pcb_conf_fields); e; e = htsp_next(pcb_conf_fields, e)) + for (e = htsp_first(rnd_conf_fields); e; e = htsp_next(rnd_conf_fields, e)) /* helpers to make the code shorter */ #define conf_set_design(path, fmt, new_val) \ Index: trunk/src/librnd/core/conf_act.c =================================================================== --- trunk/src/librnd/core/conf_act.c (revision 30949) +++ trunk/src/librnd/core/conf_act.c (revision 30950) @@ -129,7 +129,7 @@ return FGW_ERR_ARG_CONV; } rs = rnd_conf_set_native(n, 0, val); - pcb_conf_update(a1, 0); + rnd_conf_update(a1, 0); } else rs = rnd_conf_set(role, path, -1, val, pol); @@ -208,7 +208,7 @@ rnd_message(PCB_MSG_ERROR, "Can not toggle '%s': failed to set new value\n", a1); return FGW_ERR_UNKNOWN; } - pcb_conf_update(a1, -1); + rnd_conf_update(a1, -1); } else if (op == F_Reset) { @@ -219,7 +219,7 @@ return FGW_ERR_ARG_CONV; } rnd_conf_reset(role, ""); - pcb_conf_update(a1, -1); + rnd_conf_update(a1, -1); } else { Index: trunk/src/librnd/core/conf_regfile.c =================================================================== --- trunk/src/librnd/core/conf_regfile.c (revision 30949) +++ trunk/src/librnd/core/conf_regfile.c (revision 30950) @@ -61,7 +61,7 @@ else e->value++; - if (pcb_conf_in_production) { + if (rnd_conf_in_production) { if (conf_load_plug_interns(RND_CFR_INTERNAL)) pcb_conf_merge_all(NULL); } Index: trunk/src/librnd/core/hid_init.c =================================================================== --- trunk/src/librnd/core/hid_init.c (revision 30949) +++ trunk/src/librnd/core/hid_init.c (revision 30950) @@ -660,7 +660,7 @@ /* plugins may have installed their new fields, reinterpret the config (memory lht -> memory bin) to get the new fields */ - pcb_conf_update(NULL, -1); + rnd_conf_update(NULL, -1); if (ga->main_action != NULL) { int res = rnd_parse_command(NULL, ga->main_action, pcb_true); /* hidlib is NULL because there is no context yet */ Index: trunk/src/librnd/pcb_compat.h =================================================================== --- trunk/src/librnd/pcb_compat.h (revision 30949) +++ trunk/src/librnd/pcb_compat.h (revision 30950) @@ -302,3 +302,7 @@ #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 +#define pcb_conf_in_production rnd_conf_in_production +#define pcb_conf_update rnd_conf_update +#define pcb_conf_fields rnd_conf_fields +#define conf_pfn rnd_conf_pfn Index: trunk/src_plugins/diag/diag.c =================================================================== --- trunk/src_plugins/diag/diag.c (revision 30949) +++ trunk/src_plugins/diag/diag.c (revision 30950) @@ -153,7 +153,7 @@ } printf(" Native:\n"); - rnd_conf_print_native((conf_pfn)pcb_fprintf, stdout, " ", 1, nat); + rnd_conf_print_native((rnd_conf_pfn)pcb_fprintf, stdout, " ", 1, nat); RND_ACT_IRES(0); return 0; Index: trunk/src_plugins/diag/diag_conf.c =================================================================== --- trunk/src_plugins/diag/diag_conf.c (revision 30949) +++ trunk/src_plugins/diag/diag_conf.c (revision 30950) @@ -35,12 +35,12 @@ if (match_prefix != NULL) pl = strlen(match_prefix); - for (e = htsp_first(pcb_conf_fields); e; e = htsp_next(pcb_conf_fields, e)) { + for (e = htsp_first(rnd_conf_fields); e; e = htsp_next(rnd_conf_fields, e)) { rnd_conf_native_t *node = (rnd_conf_native_t *)e->value; if (match_prefix != NULL) { if (strncmp(node->hash_path, match_prefix, pl) != 0) continue; } - rnd_conf_print_native((conf_pfn)pcb_fprintf, f, prefix, verbose, node); + rnd_conf_print_native((rnd_conf_pfn)pcb_fprintf, f, prefix, verbose, node); } } Index: trunk/src_plugins/dialogs/dlg_pref_conf.c =================================================================== --- trunk/src_plugins/dialogs/dlg_pref_conf.c (revision 30949) +++ trunk/src_plugins/dialogs/dlg_pref_conf.c (revision 30950) @@ -58,10 +58,10 @@ char path[1024]; /* alpha sort keys for the more consistend UI */ - for(e = htsp_first(pcb_conf_fields), num_paths = 0; e; e = htsp_next(pcb_conf_fields, e)) + for(e = htsp_first(rnd_conf_fields), num_paths = 0; e; e = htsp_next(rnd_conf_fields, e)) num_paths++; sorted = malloc(sizeof(htsp_entry_t *) * num_paths); - for(e = htsp_first(pcb_conf_fields), n = 0; e; e = htsp_next(pcb_conf_fields, e), n++) + for(e = htsp_first(rnd_conf_fields), n = 0; e; e = htsp_next(rnd_conf_fields, e), n++) sorted[n] = e; qsort(sorted, num_paths, sizeof(htsp_entry_t *), conf_tree_cmp); Index: trunk/src_plugins/dialogs/dlg_pref_confedit.c =================================================================== --- trunk/src_plugins/dialogs/dlg_pref_confedit.c (revision 30949) +++ trunk/src_plugins/dialogs/dlg_pref_confedit.c (revision 30950) @@ -168,7 +168,7 @@ n->data.text.value = rnd_strdup(r->cell[0]); } rnd_conf_makedirty(ctx->role); - pcb_conf_update(ctx->nat->hash_path, ctx->idx); + rnd_conf_update(ctx->nat->hash_path, ctx->idx); } return; case RND_CFN_HLIST: Index: trunk/src_plugins/dialogs/dlg_pref_lib.c =================================================================== --- trunk/src_plugins/dialogs/dlg_pref_lib.c (revision 30949) +++ trunk/src_plugins/dialogs/dlg_pref_lib.c (revision 30950) @@ -175,7 +175,7 @@ pcb_dad_tree_modify_cell(attr, r, 2, rnd_strdup(pref_node_src(nd))); } - pcb_conf_update("rc/library_search_paths", -1); + rnd_conf_update("rc/library_search_paths", -1); 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); Index: trunk/src_plugins/drc_query/dlg.c =================================================================== --- trunk/src_plugins/drc_query/dlg.c (revision 30949) +++ trunk/src_plugins/drc_query/dlg.c (revision 30950) @@ -213,7 +213,7 @@ MKDIR_ND_SET_TEXT(nd, "title", ctx->dlg[ctx->wtitle].val.str); MKDIR_ND_SET_TEXT(nd, "query", txt->hid_get_text(atxt, hid_ctx)); - pcb_conf_update(NULL, -1); + rnd_conf_update(NULL, -1); drc_rlist_pcb2dlg(); } Index: trunk/src_plugins/export_dxf/dxf.c =================================================================== --- trunk/src_plugins/export_dxf/dxf.c (revision 30949) +++ trunk/src_plugins/export_dxf/dxf.c (revision 30950) @@ -232,7 +232,7 @@ pcbhl_expose_main(&dxf_hid, &hectx, xform); - pcb_conf_update(NULL, -1); /* restore forced sets */ + rnd_conf_update(NULL, -1); /* restore forced sets */ } int insert_hdr(FILE *f, const char *prefix, char *name, lht_err_t *err) Index: trunk/src_plugins/export_excellon/excellon.c =================================================================== --- trunk/src_plugins/export_excellon/excellon.c (revision 30949) +++ trunk/src_plugins/export_excellon/excellon.c (revision 30950) @@ -258,7 +258,7 @@ lastwidth = -1; finding_apertures = 0; pcbhl_expose_main(&excellon_hid, &ctx, &xform); - pcb_conf_update(NULL, -1); /* resotre forced sets */ + rnd_conf_update(NULL, -1); /* resotre forced sets */ if (excellon_cam.active) { Index: trunk/src_plugins/export_gerber/gerber.c =================================================================== --- trunk/src_plugins/export_gerber/gerber.c (revision 30949) +++ trunk/src_plugins/export_gerber/gerber.c (revision 30950) @@ -400,7 +400,7 @@ f = NULL; if (!gerber_cam.active) pcb_hid_restore_layer_ons(save_ons); - pcb_conf_update(NULL, -1); /* resotre forced sets */ + rnd_conf_update(NULL, -1); /* resotre forced sets */ if (!gerber_cam.active) gerber_cam.okempty_content = 1; /* never warn in direct export */ Index: trunk/src_plugins/export_openems/export_openems.c =================================================================== --- trunk/src_plugins/export_openems/export_openems.c (revision 30949) +++ trunk/src_plugins/export_openems/export_openems.c (revision 30950) @@ -625,7 +625,7 @@ fprintf(wctx.f, "%%%%%% Port(s) on terminals\n"); openems_write_testpoints(&wctx, wctx.pcb->Data); - pcb_conf_update(NULL, -1); /* restore forced sets */ + rnd_conf_update(NULL, -1); /* restore forced sets */ } static void openems_do_export(pcb_hid_t *hid, pcb_hid_attr_val_t *options) Index: trunk/src_plugins/export_openscad/export_openscad.c =================================================================== --- trunk/src_plugins/export_openscad/export_openscad.c (revision 30949) +++ trunk/src_plugins/export_openscad/export_openscad.c (revision 30950) @@ -159,7 +159,7 @@ pcbhl_expose_main(&openscad_hid, &ctx, NULL); - pcb_conf_update(NULL, -1); /* restore forced sets */ + rnd_conf_update(NULL, -1); /* restore forced sets */ } static void scad_close_layer() Index: trunk/src_plugins/export_png/png.c =================================================================== --- trunk/src_plugins/export_png/png.c (revision 30949) +++ trunk/src_plugins/export_png/png.c (revision 30950) @@ -577,7 +577,7 @@ pcbhl_expose_main(&png_hid, &ctx, xform); memcpy(pcb_layer_stack, saved_layer_stack, sizeof(pcb_layer_stack)); - pcb_conf_update(NULL, -1); /* restore forced sets */ + rnd_conf_update(NULL, -1); /* restore forced sets */ } Index: trunk/src_plugins/export_svg/svg.c =================================================================== --- trunk/src_plugins/export_svg/svg.c (revision 30949) +++ trunk/src_plugins/export_svg/svg.c (revision 30950) @@ -258,7 +258,7 @@ pcbhl_expose_main(&svg_hid, &ctx, xform); - pcb_conf_update(NULL, -1); /* restore forced sets */ + rnd_conf_update(NULL, -1); /* restore forced sets */ } static void group_close() Index: trunk/src_plugins/io_lihata/read.c =================================================================== --- trunk/src_plugins/io_lihata/read.c (revision 30949) +++ trunk/src_plugins/io_lihata/read.c (revision 30950) @@ -2220,7 +2220,7 @@ 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); + rnd_conf_update(NULL, -1); } Index: trunk/src_plugins/io_pcb/parse_l.c =================================================================== --- trunk/src_plugins/io_pcb/parse_l.c (revision 30949) +++ trunk/src_plugins/io_pcb/parse_l.c (revision 30950) @@ -2811,7 +2811,7 @@ /* load config nodes not disabled above, from optional attributes */ io_pcb_attrib_a2c(Ptr); - pcb_conf_update(NULL, -1); + rnd_conf_update(NULL, -1); } if (retval == 0) { /* restore loader so the next save will use the same units */ Index: trunk/src_plugins/io_pcb/parse_l.l =================================================================== --- trunk/src_plugins/io_pcb/parse_l.l (revision 30949) +++ trunk/src_plugins/io_pcb/parse_l.l (revision 30950) @@ -428,7 +428,7 @@ /* load config nodes not disabled above, from optional attributes */ io_pcb_attrib_a2c(Ptr); - pcb_conf_update(NULL, -1); + rnd_conf_update(NULL, -1); } if (retval == 0) { /* restore loader so the next save will use the same units */ Index: trunk/src_plugins/lib_gtk_common/lib_gtk_config.c =================================================================== --- trunk/src_plugins/lib_gtk_common/lib_gtk_config.c (revision 30949) +++ trunk/src_plugins/lib_gtk_common/lib_gtk_config.c (revision 30950) @@ -108,7 +108,7 @@ rnd_conf_native_t *nat; char *end, dirname[128]; - pcb_conf_update(p[0], -1); + rnd_conf_update(p[0], -1); nat = rnd_conf_get_field(p[0]); if ((nat == NULL) || (nat->prop->src == NULL)) continue; Index: trunk/src_plugins/lib_hid_common/place.c =================================================================== --- trunk/src_plugins/lib_hid_common/place.c (revision 30949) +++ trunk/src_plugins/lib_hid_common/place.c (revision 30950) @@ -134,7 +134,7 @@ 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); + rnd_conf_update(path, -1); } nat = rnd_conf_get_field(path); Index: trunk/src_plugins/lib_vfs/lib_vfs.c =================================================================== --- trunk/src_plugins/lib_vfs/lib_vfs.c (revision 30949) +++ trunk/src_plugins/lib_vfs/lib_vfs.c (revision 30950) @@ -524,7 +524,7 @@ if (wr) return rnd_conf_set(RND_CFR_DESIGN, path, 0, buff->array, RND_POL_OVERWRITE); else - rnd_conf_print_native((conf_pfn)vfs_conf_printf, buff, NULL, 0, nat); + rnd_conf_print_native((rnd_conf_pfn)vfs_conf_printf, buff, NULL, 0, nat); return 0; } Index: trunk/src_plugins/renumber/renumber.c =================================================================== --- trunk/src_plugins/renumber/renumber.c (revision 30949) +++ trunk/src_plugins/renumber/renumber.c (revision 30950) @@ -297,7 +297,7 @@ fclose(out); /* restore the unique flag setting */ - pcb_conf_update(NULL, -1); + rnd_conf_update(NULL, -1); if (changed) { htsp_entry_t *e; Index: trunk/tests/conf/conftest.c =================================================================== --- trunk/tests/conf/conftest.c (revision 30949) +++ trunk/tests/conf/conftest.c (revision 30950) @@ -121,7 +121,7 @@ return; } gds_init(&s); - rnd_conf_print_native((conf_pfn)pcb_append_printf, &s, NULL, 0, node); + rnd_conf_print_native((rnd_conf_pfn)pcb_append_printf, &s, NULL, 0, node); printf("%s='%s'\n", node->hash_path, s.array); gds_uninit(&s); } @@ -155,7 +155,7 @@ return; } printf("Result: %d\n", rnd_conf_load_as(role, fn, is_text)); - pcb_conf_update(NULL, -1); + rnd_conf_update(NULL, -1); } rnd_conf_policy_t current_policy = RND_POL_OVERWRITE; @@ -199,7 +199,7 @@ sprintf(tmp, "%s-%d", first->name, np); free(first->name); first->name = rnd_strdup(tmp); - pcb_conf_update(NULL, -1); + rnd_conf_update(NULL, -1); } } @@ -232,7 +232,7 @@ free(first->name); first->name = rnd_strdup(arg); } - pcb_conf_update(NULL, -1); + rnd_conf_update(NULL, -1); } } @@ -301,7 +301,7 @@ } rnd_conf_reset(role, ""); } - pcb_conf_update(NULL, -1); + rnd_conf_update(NULL, -1); } extern void cmd_help(char *arg); Index: trunk/util/gsch2pcb-rnd/gsch2pcb.c =================================================================== --- trunk/util/gsch2pcb-rnd/gsch2pcb.c (revision 30949) +++ trunk/util/gsch2pcb-rnd/gsch2pcb.c (revision 30950) @@ -256,7 +256,7 @@ rnd_message(PCB_MSG_ERROR, "Failed to parse project file %s.\n", path); exit(1); } - pcb_conf_update(NULL, -1); /* because of our new project file */ + rnd_conf_update(NULL, -1); /* because of our new project file */ } static void load_extra_project_files(void) @@ -414,10 +414,10 @@ get_args(argc, argv); rnd_conf_load_all(NULL, NULL); - pcb_conf_update(NULL, -1); + rnd_conf_update(NULL, -1); load_extra_project_files(); - pcb_conf_update(NULL, -1); /* because of CLI changes */ + rnd_conf_update(NULL, -1); /* because of CLI changes */ if (!have_cli_project_file && !have_cli_schematics) { if (!rnd_file_readable(LOCAL_PROJECT_FILE)) { @@ -428,7 +428,7 @@ rnd_message(PCB_MSG_ERROR, "Failed to load project file %s. Try %s --help\n", LOCAL_PROJECT_FILE, argv[0]); exit(1); } - pcb_conf_update(NULL, -1); /* because of our new project file */ + rnd_conf_update(NULL, -1); /* because of our new project file */ } else if ((local_project_pcb_name != NULL) && (!have_cli_project_file)) rnd_conf_load_project(NULL, local_project_pcb_name); @@ -455,7 +455,7 @@ exit(1); } - pcb_conf_update(NULL, -1); /* because of the project file */ + rnd_conf_update(NULL, -1); /* because of the project file */ want_method = conf_g2pr.utils.gsch2pcb_rnd.method; if (want_method == NULL) { @@ -484,7 +484,7 @@ } current_method->init(); - pcb_conf_update(NULL, -1); + rnd_conf_update(NULL, -1); current_method->go(); /* the traditional, "parse element and edit the pcb file" approach */