Index: trunk/src/hid.h =================================================================== --- trunk/src/hid.h (revision 26768) +++ trunk/src/hid.h (revision 26769) @@ -224,7 +224,7 @@ set up the selectable options. In command line mode, these are used to interpret command line options. If n_ret_ is non-NULL, the number of attributes is stored there. */ - pcb_hid_attribute_t *(*get_export_options)(int *n_ret); + pcb_hid_attribute_t *(*get_export_options)(pcb_hid_t *hid, int *n_ret); /* Exports (or print) the current PCB. The options given represent the choices made from the options returned from Index: trunk/src/hid_init.c =================================================================== --- trunk/src/hid_init.c (revision 26768) +++ trunk/src/hid_init.c (revision 26769) @@ -353,7 +353,7 @@ for(;;) { int res; if (pcb_gui->get_export_options != NULL) - pcb_gui->get_export_options(NULL); + pcb_gui->get_export_options(pcb_gui, NULL); res = pcb_gui->parse_arguments(pcb_gui, hid_argc, hid_argv); if (res == 0) break; /* HID accepted, don't try anything else */ Index: trunk/src/hid_nogui.c =================================================================== --- trunk/src/hid_nogui.c (revision 26768) +++ trunk/src/hid_nogui.c (revision 26769) @@ -54,7 +54,7 @@ int nothing_interesting_here; } hid_gc_s; -static pcb_hid_attribute_t *nogui_get_export_options(int *n_ret) +static pcb_hid_attribute_t *nogui_get_export_options(pcb_hid_t *hid, int *n_ret) { if (n_ret != NULL) *n_ret = 0; Index: trunk/src_plugins/cam/cam.c =================================================================== --- trunk/src_plugins/cam/cam.c (revision 26768) +++ trunk/src_plugins/cam/cam.c (revision 26769) @@ -208,7 +208,7 @@ PCB_REGISTER_ACTIONS(cam_action_list, cam_cookie) -static pcb_hid_attribute_t *export_cam_get_export_options(int *n) +static pcb_hid_attribute_t *export_cam_get_export_options(pcb_hid_t *hid, int *n) { return 0; } Index: trunk/src_plugins/dialogs/dlg_export.c =================================================================== --- trunk/src_plugins/dialogs/dlg_export.c (revision 26768) +++ trunk/src_plugins/dialogs/dlg_export.c (revision 26769) @@ -182,7 +182,7 @@ export_ctx.tabs = PCB_DAD_CURRENT(export_ctx.dlg); for(n = 0; n < export_ctx.len; n++) { int numa; - pcb_hid_attribute_t *attrs = export_ctx.hid[n]->get_export_options(&numa); + pcb_hid_attribute_t *attrs = export_ctx.hid[n]->get_export_options(export_ctx.hid[n], &numa); export_ctx.numa[n] = numa; export_ctx.ea[n] = attrs; if (numa < 1) { Index: trunk/src_plugins/export_bboard/bboard.c =================================================================== --- trunk/src_plugins/export_bboard/bboard.c (revision 26768) +++ trunk/src_plugins/export_bboard/bboard.c (revision 26769) @@ -158,7 +158,7 @@ * Export filter implementation starts here ********************************************/ -static pcb_hid_attribute_t *bboard_get_export_options(int *n) +static pcb_hid_attribute_t *bboard_get_export_options(pcb_hid_t *hid, int *n) { if ((PCB != NULL) && (bboard_options[HA_bboardfile].default_val.str_value == NULL)) pcb_derive_default_filename(PCB->hidlib.filename, &bboard_options[HA_bboardfile], ".png"); @@ -493,7 +493,7 @@ pcb_layergrp_id_t gtop, gbottom; if (!options) { - bboard_get_export_options(0); + bboard_get_export_options(hid, 0); for (i = 0; i < NUM_OPTIONS; i++) bboard_values[i] = bboard_options[i].default_val; options = bboard_values; Index: trunk/src_plugins/export_bom/bom.c =================================================================== --- trunk/src_plugins/export_bom/bom.c (revision 26768) +++ trunk/src_plugins/export_bom/bom.c (revision 26769) @@ -64,7 +64,7 @@ struct _BomList *next; } BomList; -static pcb_hid_attribute_t *bom_get_export_options(int *n) +static pcb_hid_attribute_t *bom_get_export_options(pcb_hid_t *hid, int *n) { if ((PCB != NULL) && (bom_options[HA_bomfile].default_val.str_value == NULL)) pcb_derive_default_filename(PCB->hidlib.filename, &bom_options[HA_bomfile], ".bom"); @@ -267,7 +267,7 @@ int i; if (!options) { - bom_get_export_options(0); + bom_get_export_options(hid, 0); for (i = 0; i < NUM_OPTIONS; i++) bom_values[i] = bom_options[i].default_val; options = bom_values; Index: trunk/src_plugins/export_dsn/dsn.c =================================================================== --- trunk/src_plugins/export_dsn/dsn.c (revision 26768) +++ trunk/src_plugins/export_dsn/dsn.c (revision 26769) @@ -105,7 +105,7 @@ static const char *dsn_filename; -static pcb_hid_attribute_t *dsn_get_export_options(int *n) +static pcb_hid_attribute_t *dsn_get_export_options(pcb_hid_t *hid, int *n) { if ((PCB != NULL) && (dsn_options[HA_dsnfile].default_val.str_value == NULL)) pcb_derive_default_filename(PCB->hidlib.filename, &dsn_options[HA_dsnfile], ".dsn"); @@ -572,7 +572,7 @@ { int i; if (!options) { - dsn_get_export_options(0); + dsn_get_export_options(hid, 0); for (i = 0; i < NUM_OPTIONS; i++) dsn_values[i] = dsn_options[i].default_val; options = dsn_values; Index: trunk/src_plugins/export_dxf/dxf.c =================================================================== --- trunk/src_plugins/export_dxf/dxf.c (revision 26768) +++ trunk/src_plugins/export_dxf/dxf.c (revision 26769) @@ -200,7 +200,7 @@ static pcb_hid_attr_val_t dxf_values[NUM_OPTIONS]; -static pcb_hid_attribute_t *dxf_get_export_options(int *n) +static pcb_hid_attribute_t *dxf_get_export_options(pcb_hid_t *hid, int *n) { const char *suffix = ".dxf"; @@ -276,7 +276,7 @@ lht_err_t err; if (!options) { - dxf_get_export_options(0); + dxf_get_export_options(hid, 0); for (i = 0; i < NUM_OPTIONS; i++) dxf_values[i] = dxf_attribute_list[i].default_val; options = dxf_values; Index: trunk/src_plugins/export_excellon/excellon.c =================================================================== --- trunk/src_plugins/export_excellon/excellon.c (revision 26768) +++ trunk/src_plugins/export_excellon/excellon.c (revision 26769) @@ -190,7 +190,7 @@ static pcb_hid_attr_val_t excellon_values[NUM_OPTIONS]; -static pcb_hid_attribute_t *excellon_get_export_options(int *n) +static pcb_hid_attribute_t *excellon_get_export_options(pcb_hid_t *hid, int *n) { if ((PCB != NULL) && (excellon_options[HA_excellonfile].default_val.str_value == NULL)) pcb_derive_default_filename(PCB->hidlib.filename, &excellon_options[HA_excellonfile], ""); @@ -217,7 +217,7 @@ memset(&warn, 0, sizeof(warn)); if (!options) { - excellon_get_export_options(NULL); + excellon_get_export_options(hid, NULL); for (i = 0; i < NUM_OPTIONS; i++) excellon_values[i] = excellon_options[i].default_val; options = excellon_values; Index: trunk/src_plugins/export_fidocadj/fidocadj.c =================================================================== --- trunk/src_plugins/export_fidocadj/fidocadj.c (revision 26768) +++ trunk/src_plugins/export_fidocadj/fidocadj.c (revision 26769) @@ -84,7 +84,7 @@ static pcb_hid_attr_val_t fidocadj_values[NUM_OPTIONS]; -static pcb_hid_attribute_t *fidocadj_get_export_options(int *n) +static pcb_hid_attribute_t *fidocadj_get_export_options(pcb_hid_t *hid, int *n) { const char *suffix = ".fcd"; @@ -172,7 +172,7 @@ htsi_t lib_names; /* hash of names found in the library, if have_lib is 1 */ if (!options) { - fidocadj_get_export_options(0); + fidocadj_get_export_options(hid, 0); for (n = 0; n < NUM_OPTIONS; n++) fidocadj_values[n] = fidocadj_attribute_list[n].default_val; options = fidocadj_values; Index: trunk/src_plugins/export_gcode/gcode.c =================================================================== --- trunk/src_plugins/export_gcode/gcode.c (revision 26768) +++ trunk/src_plugins/export_gcode/gcode.c (revision 26769) @@ -234,7 +234,7 @@ return pcb_hid_parse_command_line(argc, argv); } -static pcb_hid_attribute_t *gcode_get_export_options(int *n) +static pcb_hid_attribute_t *gcode_get_export_options(pcb_hid_t *hid, int *n) { static int last_unit_value = -1; @@ -382,7 +382,7 @@ }; if (!options) { - gcode_get_export_options(0); + gcode_get_export_options(hid, 0); for (i = 0; i < NUM_OPTIONS; i++) { gcode_values[i] = gcode_attribute_list[i].default_val; } Index: trunk/src_plugins/export_gerber/gerber.c =================================================================== --- trunk/src_plugins/export_gerber/gerber.c (revision 26768) +++ trunk/src_plugins/export_gerber/gerber.c (revision 26769) @@ -53,7 +53,7 @@ static pcb_cam_t gerber_cam; -static pcb_hid_attribute_t *gerber_get_export_options(int *n); +static pcb_hid_attribute_t *gerber_get_export_options(pcb_hid_t *hid, int *n); static void gerber_do_export(pcb_hid_t *hid, pcb_hidlib_t *hidlib, pcb_hid_attr_val_t *options); static int gerber_parse_arguments(pcb_hid_t *hid, int *argc, char ***argv); static pcb_hid_gc_t gerber_make_gc(void); @@ -284,7 +284,7 @@ static pcb_hid_attr_val_t gerber_values[NUM_OPTIONS]; -static pcb_hid_attribute_t *gerber_get_export_options(int *n) +static pcb_hid_attribute_t *gerber_get_export_options(pcb_hid_t *hid, int *n) { if ((PCB != NULL) && (gerber_options[HA_gerberfile].default_val.str_value == NULL)) pcb_derive_default_filename(PCB->hidlib.filename, &gerber_options[HA_gerberfile], ""); @@ -554,7 +554,7 @@ drawing_mode_issued = PCB_HID_COMP_POSITIVE; if (!options) { - gerber_get_export_options(NULL); + gerber_get_export_options(hid, NULL); for (i = 0; i < NUM_OPTIONS; i++) gerber_values[i] = gerber_options[i].default_val; options = gerber_values; Index: trunk/src_plugins/export_ipcd356/ipcd356.c =================================================================== --- trunk/src_plugins/export_ipcd356/ipcd356.c (revision 26768) +++ trunk/src_plugins/export_ipcd356/ipcd356.c (revision 26769) @@ -416,7 +416,7 @@ static pcb_hid_attr_val_t ipcd356_values[NUM_OPTIONS]; -static pcb_hid_attribute_t *ipcd356_get_export_options(int *n) +static pcb_hid_attribute_t *ipcd356_get_export_options(pcb_hid_t *hid, int *n) { if ((PCB != NULL) && (ipcd356_options[HA_ipcd356_filename].default_val.str_value == NULL)) pcb_derive_default_filename(PCB->hidlib.filename, &ipcd356_options[HA_ipcd356_filename], ".net"); @@ -439,7 +439,7 @@ FILE *f; if (!options) { - ipcd356_get_export_options(0); + ipcd356_get_export_options(hid, 0); for (n = 0; n < NUM_OPTIONS; n++) ipcd356_values[n] = ipcd356_options[n].default_val; Index: trunk/src_plugins/export_lpr/lpr.c =================================================================== --- trunk/src_plugins/export_lpr/lpr.c (revision 26768) +++ trunk/src_plugins/export_lpr/lpr.c (revision 26769) @@ -43,7 +43,7 @@ static int num_lpr_options = 0; static pcb_hid_attr_val_t *lpr_values; -static pcb_hid_attribute_t *lpr_get_export_options(int *n) +static pcb_hid_attribute_t *lpr_get_export_options(pcb_hid_t *hid, int *n) { /* * We initialize the default value in this manner because the GUI @@ -55,7 +55,7 @@ } if (lpr_options == 0) { - pcb_hid_attribute_t *ps_opts = ps_hid.get_export_options(&num_lpr_options); + pcb_hid_attribute_t *ps_opts = ps_hid.get_export_options(&ps_hid, &num_lpr_options); lpr_options = (pcb_hid_attribute_t *) calloc(num_lpr_options, sizeof(pcb_hid_attribute_t)); memcpy(lpr_options, ps_opts, num_lpr_options * sizeof(pcb_hid_attribute_t)); memcpy(lpr_options, base_lpr_options, sizeof(base_lpr_options)); @@ -73,7 +73,7 @@ const char *filename; if (!options) { - lpr_get_export_options(0); + lpr_get_export_options(hid, 0); for (i = 0; i < num_lpr_options; i++) lpr_values[i] = lpr_options[i].default_val; options = lpr_values; @@ -95,7 +95,7 @@ static int lpr_parse_arguments(pcb_hid_t *hid, int *argc, char ***argv) { - lpr_get_export_options(0); + lpr_get_export_options(hid, 0); pcb_hid_register_attributes(lpr_options, num_lpr_options, lpr_cookie, 0); return pcb_hid_parse_command_line(argc, argv); } Index: trunk/src_plugins/export_openems/export_openems.c =================================================================== --- trunk/src_plugins/export_openems/export_openems.c (revision 26768) +++ trunk/src_plugins/export_openems/export_openems.c (revision 26769) @@ -157,7 +157,7 @@ static pcb_hid_attr_val_t openems_values[NUM_OPTIONS]; -static pcb_hid_attribute_t *openems_get_export_options(int *n) +static pcb_hid_attribute_t *openems_get_export_options(pcb_hid_t *hid, int *n) { const char *suffix = ".m"; pcb_mesh_t *mesh = pcb_mesh_get(MESH_NAME); @@ -639,7 +639,7 @@ FILE *fsim; if (!options) { - openems_get_export_options(0); + openems_get_export_options(hid, 0); for (i = 0; i < NUM_OPTIONS; i++) openems_values[i] = openems_attribute_list[i].default_val; options = openems_values; Index: trunk/src_plugins/export_openscad/export_openscad.c =================================================================== --- trunk/src_plugins/export_openscad/export_openscad.c (revision 26768) +++ trunk/src_plugins/export_openscad/export_openscad.c (revision 26769) @@ -127,7 +127,7 @@ static pcb_hid_attr_val_t openscad_values[NUM_OPTIONS]; -static pcb_hid_attribute_t *openscad_get_export_options(int *n) +static pcb_hid_attribute_t *openscad_get_export_options(pcb_hid_t *hid, int *n) { const char *suffix = ".scad"; @@ -299,7 +299,7 @@ int i; if (!options) { - openscad_get_export_options(0); + openscad_get_export_options(hid, 0); for (i = 0; i < NUM_OPTIONS; i++) openscad_values[i] = openscad_attribute_list[i].default_val; options = openscad_values; Index: trunk/src_plugins/export_png/png.c =================================================================== --- trunk/src_plugins/export_png/png.c (revision 26768) +++ trunk/src_plugins/export_png/png.c (revision 26769) @@ -485,7 +485,7 @@ return result; } -static pcb_hid_attribute_t *png_get_export_options(int *n) +static pcb_hid_attribute_t *png_get_export_options(pcb_hid_t *hid, int *n) { const char *suffix = get_file_suffix(); @@ -1006,7 +1006,7 @@ png_free_cache(); if (!options) { - png_get_export_options(0); + png_get_export_options(hid, 0); for (i = 0; i < NUM_OPTIONS; i++) png_values[i] = png_attribute_list[i].default_val; options = png_values; Index: trunk/src_plugins/export_ps/eps.c =================================================================== --- trunk/src_plugins/export_ps/eps.c (revision 26768) +++ trunk/src_plugins/export_ps/eps.c (revision 26769) @@ -30,7 +30,7 @@ /*----------------------------------------------------------------------------*/ /* Function prototypes */ /*----------------------------------------------------------------------------*/ -static pcb_hid_attribute_t *eps_get_export_options(int *n); +static pcb_hid_attribute_t *eps_get_export_options(pcb_hid_t *hid, int *n); static void eps_do_export(pcb_hid_t *hid, pcb_hidlib_t *hidlib, pcb_hid_attr_val_t *options); static int eps_parse_arguments(pcb_hid_t *hid, int *argc, char ***argv); static int eps_set_layer_group(pcb_hidlib_t *hidlib, pcb_layergrp_id_t group, const char *purpose, int purpi, pcb_layer_id_t layer, unsigned int flags, int is_empty, pcb_xform_t **xform); @@ -145,7 +145,7 @@ static pcb_hid_attr_val_t eps_values[NUM_OPTIONS]; -static pcb_hid_attribute_t *eps_get_export_options(int *n) +static pcb_hid_attribute_t *eps_get_export_options(pcb_hid_t *hid, int *n) { if ((PCB != NULL) && (eps_attribute_list[HA_psfile].default_val.str_value == NULL)) pcb_derive_default_filename(PCB->hidlib.filename, &eps_attribute_list[HA_psfile], ".eps"); @@ -346,7 +346,7 @@ int save_ons[PCB_MAX_LAYER]; if (!options) { - eps_get_export_options(0); + eps_get_export_options(hid, 0); for (i = 0; i < NUM_OPTIONS; i++) eps_values[i] = eps_attribute_list[i].default_val; options = eps_values; Index: trunk/src_plugins/export_ps/ps.c =================================================================== --- trunk/src_plugins/export_ps/ps.c (revision 26768) +++ trunk/src_plugins/export_ps/ps.c (revision 26769) @@ -340,7 +340,7 @@ pcb_composite_op_t drawing_mode; } global; -static pcb_hid_attribute_t *ps_get_export_options(int *n) +static pcb_hid_attribute_t *ps_get_export_options(pcb_hid_t *hid, int *n) { if ((PCB != NULL) && (ps_attribute_list[HA_psfile].default_val.str_value == NULL)) pcb_derive_default_filename(PCB->hidlib.filename, &ps_attribute_list[HA_psfile], ".ps"); @@ -614,7 +614,7 @@ int i; if (!options) { - ps_get_export_options(0); + ps_get_export_options(hid, 0); for (i = 0; i < NUM_OPTIONS; i++) global.ps_values[i] = ps_attribute_list[i].default_val; options = global.ps_values; Index: trunk/src_plugins/export_stat/stat.c =================================================================== --- trunk/src_plugins/export_stat/stat.c (revision 26768) +++ trunk/src_plugins/export_stat/stat.c (revision 26769) @@ -109,7 +109,7 @@ static pcb_hid_attr_val_t stat_values[NUM_OPTIONS]; -static pcb_hid_attribute_t *stat_get_export_options(int *n) +static pcb_hid_attribute_t *stat_get_export_options(pcb_hid_t *hid, int *n) { const char *suffix = ".stat.lht"; @@ -143,7 +143,7 @@ memset(group_not_empty, 0, sizeof(group_not_empty)); if (!options) { - stat_get_export_options(0); + stat_get_export_options(hid, 0); for (i = 0; i < NUM_OPTIONS; i++) stat_values[i] = stat_attribute_list[i].default_val; options = stat_values; Index: trunk/src_plugins/export_svg/svg.c =================================================================== --- trunk/src_plugins/export_svg/svg.c (revision 26768) +++ trunk/src_plugins/export_svg/svg.c (revision 26769) @@ -198,7 +198,7 @@ static pcb_hid_attr_val_t svg_values[NUM_OPTIONS]; -static pcb_hid_attribute_t *svg_get_export_options(int *n) +static pcb_hid_attribute_t *svg_get_export_options(pcb_hid_t *hid, int *n) { const char *suffix = ".svg"; @@ -333,7 +333,7 @@ comp_cnt = 0; if (!options) { - svg_get_export_options(0); + svg_get_export_options(hid, 0); for (i = 0; i < NUM_OPTIONS; i++) svg_values[i] = svg_attribute_list[i].default_val; options = svg_values; Index: trunk/src_plugins/export_test/export_test.c =================================================================== --- trunk/src_plugins/export_test/export_test.c (revision 26768) +++ trunk/src_plugins/export_test/export_test.c (revision 26769) @@ -41,7 +41,7 @@ static const char *export_test_filename; -static pcb_hid_attribute_t *export_test_get_export_options(int *n) +static pcb_hid_attribute_t *export_test_get_export_options(pcb_hid_t *hid, int *n) { if ((PCB != NULL) && (export_test_options[HA_export_testfile].default_val.str_value == NULL)) pcb_derive_default_filename(PCB->hidlib.filename, &export_test_options[HA_export_testfile], ".export_test"); @@ -61,7 +61,7 @@ int i; if (!options) { - export_test_get_export_options(0); + export_test_get_export_options(hid, 0); for (i = 0; i < NUM_OPTIONS; i++) export_test_values[i] = export_test_options[i].default_val; options = export_test_values; Index: trunk/src_plugins/export_vfs_fuse/export_vfs_fuse.c =================================================================== --- trunk/src_plugins/export_vfs_fuse/export_vfs_fuse.c (revision 26768) +++ trunk/src_plugins/export_vfs_fuse/export_vfs_fuse.c (revision 26769) @@ -38,7 +38,7 @@ static int pcb_fuse_changed; static char fuse_cwd[PCB_PATH_MAX]; -static pcb_hid_attribute_t *export_vfs_fuse_get_export_options(int *n) +static pcb_hid_attribute_t *export_vfs_fuse_get_export_options(pcb_hid_t *hid, int *n) { return 0; } Index: trunk/src_plugins/export_vfs_mc/export_vfs_mc.c =================================================================== --- trunk/src_plugins/export_vfs_mc/export_vfs_mc.c (revision 26768) +++ trunk/src_plugins/export_vfs_mc/export_vfs_mc.c (revision 26769) @@ -40,7 +40,7 @@ static pcb_hid_attr_val_t export_vfs_mc_values[NUM_OPTIONS]; -static pcb_hid_attribute_t *export_vfs_mc_get_export_options(int *n) +static pcb_hid_attribute_t *export_vfs_mc_get_export_options(pcb_hid_t *hid, int *n) { if (n) *n = NUM_OPTIONS; @@ -110,7 +110,7 @@ int i; if (!options) { - export_vfs_mc_get_export_options(0); + export_vfs_mc_get_export_options(hid, 0); for (i = 0; i < NUM_OPTIONS; i++) export_vfs_mc_values[i] = export_vfs_mc_options[i].default_val; options = export_vfs_mc_values; Index: trunk/src_plugins/export_xy/xy.c =================================================================== --- trunk/src_plugins/export_xy/xy.c (revision 26768) +++ trunk/src_plugins/export_xy/xy.c (revision 26769) @@ -96,7 +96,7 @@ } } -static pcb_hid_attribute_t *xy_get_export_options(int *n) +static pcb_hid_attribute_t *xy_get_export_options(pcb_hid_t *hid, int *n) { static int last_unit_value = -1; conf_listitem_t *li; @@ -797,7 +797,7 @@ gather_templates(); if (!options) { - xy_get_export_options(0); + xy_get_export_options(hid, 0); for (i = 0; i < NUM_OPTIONS; i++) xy_values[i] = xy_options[i].default_val; options = xy_values; Index: trunk/src_plugins/hid_batch/batch.c =================================================================== --- trunk/src_plugins/hid_batch/batch.c (revision 26768) +++ trunk/src_plugins/hid_batch/batch.c (revision 26769) @@ -34,7 +34,7 @@ pcb_core_gc_t core_gc; } hid_gc_s; -static pcb_hid_attribute_t *batch_get_export_options(int *n_ret) +static pcb_hid_attribute_t *batch_get_export_options(pcb_hid_t *hid, int *n_ret) { if (n_ret != NULL) *n_ret = 0; Index: trunk/src_plugins/hid_lesstif/main.c =================================================================== --- trunk/src_plugins/hid_lesstif/main.c (revision 26768) +++ trunk/src_plugins/hid_lesstif/main.c (revision 26769) @@ -771,7 +771,7 @@ /* ---------------------------------------------------------------------- */ -static pcb_hid_attribute_t *lesstif_get_export_options(int *n) +static pcb_hid_attribute_t *lesstif_get_export_options(pcb_hid_t *hid, int *n) { if (n != NULL) *n = sizeof(lesstif_attribute_list) / sizeof(pcb_hid_attribute_t); Index: trunk/src_plugins/hid_remote/remote.c =================================================================== --- trunk/src_plugins/hid_remote/remote.c (revision 26768) +++ trunk/src_plugins/hid_remote/remote.c (revision 26769) @@ -31,7 +31,7 @@ int nop; } hid_gc_s; -static pcb_hid_attribute_t *remote_get_export_options(int *n_ret) +static pcb_hid_attribute_t *remote_get_export_options(pcb_hid_t *hid, int *n_ret) { if (n_ret != NULL) *n_ret = 0; Index: trunk/src_plugins/loghid/hid-logger.c =================================================================== --- trunk/src_plugins/loghid/hid-logger.c (revision 26768) +++ trunk/src_plugins/loghid/hid-logger.c (revision 26769) @@ -14,9 +14,9 @@ static pcb_hid_t *delegatee_ = NULL; static FILE *out_ = NULL; -static pcb_hid_attribute_t *log_get_export_options(int *ret) +static pcb_hid_attribute_t *log_get_export_options(pcb_hid_t *hid, int *ret) { - pcb_hid_attribute_t *result = delegatee_->get_export_options(ret); + pcb_hid_attribute_t *result = delegatee_->get_export_options(hid, ret); if (ret != NULL) pcb_fprintf(out_, "get_export_options(ret) -> ret=%d\n", *ret); else Index: trunk/src_plugins/loghid/loghid.c =================================================================== --- trunk/src_plugins/loghid/loghid.c (revision 26768) +++ trunk/src_plugins/loghid/loghid.c (revision 26769) @@ -102,7 +102,7 @@ PCB_REGISTER_ATTRIBUTES(loghid_attribute_list, loghid_cookie) -static pcb_hid_attribute_t *loghid_get_export_options(int *n) +static pcb_hid_attribute_t *loghid_get_export_options(pcb_hid_t *hid, int *n) { /* loghid_attribute_list[HA_psfile] = pcb_strdup("default?");*/