Index: trunk/src/hid_attrib.c =================================================================== --- trunk/src/hid_attrib.c (revision 26948) +++ trunk/src/hid_attrib.c (revision 26949) @@ -35,7 +35,7 @@ #include "pcb-printf.h" #include "macro.h" -void pcb_hid_register_attributes(pcb_export_opt_t *a, int n, const char *cookie, int copy) +void pcb_export_register_opts(pcb_export_opt_t *a, int n, const char *cookie, int copy) { pcb_hid_attr_node_t *ha; Index: trunk/src/hid_attrib.h =================================================================== --- trunk/src/hid_attrib.h (revision 26948) +++ trunk/src/hid_attrib.h (revision 26949) @@ -222,9 +222,9 @@ void *value; }; -extern void pcb_hid_register_attributes(pcb_export_opt_t *, int, const char *cookie, int copy); +extern void pcb_export_register_opts(pcb_export_opt_t *, int, const char *cookie, int copy); #define PCB_REGISTER_ATTRIBUTES(a, cookie) PCB_HIDCONCAT(void register_,a) ()\ -{ pcb_hid_register_attributes(a, sizeof(a)/sizeof(a[0]), cookie, 0); } +{ pcb_export_register_opts(a, sizeof(a)/sizeof(a[0]), cookie, 0); } /* Remove all attributes registered with the given cookie */ void pcb_hid_remove_attributes_by_cookie(const char *cookie); Index: trunk/src_plugins/export_bboard/bboard.c =================================================================== --- trunk/src_plugins/export_bboard/bboard.c (revision 26948) +++ trunk/src_plugins/export_bboard/bboard.c (revision 26949) @@ -624,7 +624,7 @@ bboard_hid.set_crosshair = bboard_set_crosshair; pcb_hid_register_hid(&bboard_hid); - pcb_hid_register_attributes(bboard_options, sizeof(bboard_options) / sizeof(bboard_options[0]), bboard_cookie, 0); + pcb_export_register_opts(bboard_options, sizeof(bboard_options) / sizeof(bboard_options[0]), bboard_cookie, 0); return 0; } Index: trunk/src_plugins/export_bom/bom.c =================================================================== --- trunk/src_plugins/export_bom/bom.c (revision 26948) +++ trunk/src_plugins/export_bom/bom.c (revision 26949) @@ -291,7 +291,7 @@ static int bom_parse_arguments(pcb_hid_t *hid, int *argc, char ***argv) { - pcb_hid_register_attributes(bom_options, sizeof(bom_options) / sizeof(bom_options[0]), bom_cookie, 0); + pcb_export_register_opts(bom_options, sizeof(bom_options) / sizeof(bom_options[0]), bom_cookie, 0); return pcb_hid_parse_command_line(argc, argv); } Index: trunk/src_plugins/export_dsn/dsn.c =================================================================== --- trunk/src_plugins/export_dsn/dsn.c (revision 26948) +++ trunk/src_plugins/export_dsn/dsn.c (revision 26949) @@ -616,7 +616,7 @@ dsn_hid.parse_arguments = dsn_parse_arguments; pcb_hid_register_hid(&dsn_hid); - pcb_hid_register_attributes(dsn_options, sizeof(dsn_options) / sizeof(dsn_options[0]), dsn_cookie, 0); + pcb_export_register_opts(dsn_options, sizeof(dsn_options) / sizeof(dsn_options[0]), dsn_cookie, 0); return 0; } Index: trunk/src_plugins/export_dxf/dxf.c =================================================================== --- trunk/src_plugins/export_dxf/dxf.c (revision 26948) +++ trunk/src_plugins/export_dxf/dxf.c (revision 26949) @@ -342,7 +342,7 @@ static int dxf_parse_arguments(pcb_hid_t *hid, int *argc, char ***argv) { - pcb_hid_register_attributes(dxf_attribute_list, sizeof(dxf_attribute_list) / sizeof(dxf_attribute_list[0]), dxf_cookie, 0); + pcb_export_register_opts(dxf_attribute_list, sizeof(dxf_attribute_list) / sizeof(dxf_attribute_list[0]), dxf_cookie, 0); return pcb_hid_parse_command_line(argc, argv); } Index: trunk/src_plugins/export_excellon/excellon.c =================================================================== --- trunk/src_plugins/export_excellon/excellon.c (revision 26948) +++ trunk/src_plugins/export_excellon/excellon.c (revision 26949) @@ -284,7 +284,7 @@ static int excellon_parse_arguments(pcb_hid_t *hid, int *argc, char ***argv) { - pcb_hid_register_attributes(excellon_options, NUM_OPTIONS, excellon_cookie, 0); + pcb_export_register_opts(excellon_options, NUM_OPTIONS, excellon_cookie, 0); return pcb_hid_parse_command_line(argc, argv); } Index: trunk/src_plugins/export_fidocadj/fidocadj.c =================================================================== --- trunk/src_plugins/export_fidocadj/fidocadj.c (revision 26948) +++ trunk/src_plugins/export_fidocadj/fidocadj.c (revision 26949) @@ -345,7 +345,7 @@ static int fidocadj_parse_arguments(pcb_hid_t *hid, int *argc, char ***argv) { - pcb_hid_register_attributes(fidocadj_attribute_list, sizeof(fidocadj_attribute_list) / sizeof(fidocadj_attribute_list[0]), fidocadj_cookie, 0); + pcb_export_register_opts(fidocadj_attribute_list, sizeof(fidocadj_attribute_list) / sizeof(fidocadj_attribute_list[0]), fidocadj_cookie, 0); return pcb_hid_parse_command_line(argc, argv); } Index: trunk/src_plugins/export_gcode/gcode.c =================================================================== --- trunk/src_plugins/export_gcode/gcode.c (revision 26948) +++ trunk/src_plugins/export_gcode/gcode.c (revision 26949) @@ -230,7 +230,7 @@ static int gcode_parse_arguments(pcb_hid_t *hid, int *argc, char ***argv) { - pcb_hid_register_attributes(gcode_attribute_list, sizeof(gcode_attribute_list) / sizeof(gcode_attribute_list[0]), gcode_cookie, 0); + pcb_export_register_opts(gcode_attribute_list, sizeof(gcode_attribute_list) / sizeof(gcode_attribute_list[0]), gcode_cookie, 0); return pcb_hid_parse_command_line(argc, argv); } Index: trunk/src_plugins/export_gerber/gerber.c =================================================================== --- trunk/src_plugins/export_gerber/gerber.c (revision 26948) +++ trunk/src_plugins/export_gerber/gerber.c (revision 26949) @@ -668,7 +668,7 @@ static int gerber_parse_arguments(pcb_hid_t *hid, int *argc, char ***argv) { - pcb_hid_register_attributes(gerber_options, NUM_OPTIONS, gerber_cookie, 0); + pcb_export_register_opts(gerber_options, NUM_OPTIONS, gerber_cookie, 0); return pcb_hid_parse_command_line(argc, argv); } Index: trunk/src_plugins/export_ipcd356/ipcd356.c =================================================================== --- trunk/src_plugins/export_ipcd356/ipcd356.c (revision 26948) +++ trunk/src_plugins/export_ipcd356/ipcd356.c (revision 26949) @@ -487,6 +487,6 @@ pcb_hid_register_hid(&ipcd356_hid); - pcb_hid_register_attributes(ipcd356_options, sizeof(ipcd356_options) / sizeof(ipcd356_options[0]), ipcd356_cookie, 0); + pcb_export_register_opts(ipcd356_options, sizeof(ipcd356_options) / sizeof(ipcd356_options[0]), ipcd356_cookie, 0); return 0; } Index: trunk/src_plugins/export_lpr/lpr.c =================================================================== --- trunk/src_plugins/export_lpr/lpr.c (revision 26948) +++ trunk/src_plugins/export_lpr/lpr.c (revision 26949) @@ -96,7 +96,7 @@ static int lpr_parse_arguments(pcb_hid_t *hid, int *argc, char ***argv) { lpr_get_export_options(hid, 0); - pcb_hid_register_attributes(lpr_options, num_lpr_options, lpr_cookie, 0); + pcb_export_register_opts(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 26948) +++ trunk/src_plugins/export_openems/export_openems.c (revision 26949) @@ -683,7 +683,7 @@ static int openems_parse_arguments(pcb_hid_t *hid, int *argc, char ***argv) { - pcb_hid_register_attributes(openems_attribute_list, sizeof(openems_attribute_list) / sizeof(openems_attribute_list[0]), openems_cookie, 0); + pcb_export_register_opts(openems_attribute_list, sizeof(openems_attribute_list) / sizeof(openems_attribute_list[0]), openems_cookie, 0); return pcb_hid_parse_command_line(argc, argv); } Index: trunk/src_plugins/export_openscad/export_openscad.c =================================================================== --- trunk/src_plugins/export_openscad/export_openscad.c (revision 26948) +++ trunk/src_plugins/export_openscad/export_openscad.c (revision 26949) @@ -350,7 +350,7 @@ static int openscad_parse_arguments(pcb_hid_t *hid, int *argc, char ***argv) { - pcb_hid_register_attributes(openscad_attribute_list, sizeof(openscad_attribute_list) / sizeof(openscad_attribute_list[0]), openscad_cookie, 0); + pcb_export_register_opts(openscad_attribute_list, sizeof(openscad_attribute_list) / sizeof(openscad_attribute_list[0]), openscad_cookie, 0); return pcb_hid_parse_command_line(argc, argv); } Index: trunk/src_plugins/export_png/png.c =================================================================== --- trunk/src_plugins/export_png/png.c (revision 26948) +++ trunk/src_plugins/export_png/png.c (revision 26949) @@ -1207,7 +1207,7 @@ static int png_parse_arguments(pcb_hid_t *hid, int *argc, char ***argv) { - pcb_hid_register_attributes(png_attribute_list, sizeof(png_attribute_list) / sizeof(png_attribute_list[0]), png_cookie, 0); + pcb_export_register_opts(png_attribute_list, sizeof(png_attribute_list) / sizeof(png_attribute_list[0]), png_cookie, 0); return pcb_hid_parse_command_line(argc, argv); } Index: trunk/src_plugins/export_ps/eps.c =================================================================== --- trunk/src_plugins/export_ps/eps.c (revision 26948) +++ trunk/src_plugins/export_ps/eps.c (revision 26949) @@ -356,7 +356,7 @@ static int eps_parse_arguments(pcb_hid_t *hid, int *argc, char ***argv) { - pcb_hid_register_attributes(eps_attribute_list, sizeof(eps_attribute_list) / sizeof(eps_attribute_list[0]), ps_cookie, 0); + pcb_export_register_opts(eps_attribute_list, sizeof(eps_attribute_list) / sizeof(eps_attribute_list[0]), ps_cookie, 0); return pcb_hid_parse_command_line(argc, argv); } Index: trunk/src_plugins/export_ps/ps.c =================================================================== --- trunk/src_plugins/export_ps/ps.c (revision 26948) +++ trunk/src_plugins/export_ps/ps.c (revision 26949) @@ -664,7 +664,7 @@ static int ps_parse_arguments(pcb_hid_t *hid, int *argc, char ***argv) { - pcb_hid_register_attributes(ps_attribute_list, NUM_OPTIONS, ps_cookie, 0); + pcb_export_register_opts(ps_attribute_list, NUM_OPTIONS, ps_cookie, 0); return pcb_hid_parse_command_line(argc, argv); } Index: trunk/src_plugins/export_stat/stat.c =================================================================== --- trunk/src_plugins/export_stat/stat.c (revision 26948) +++ trunk/src_plugins/export_stat/stat.c (revision 26949) @@ -368,7 +368,7 @@ static int stat_parse_arguments(pcb_hid_t *hid, int *argc, char ***argv) { - pcb_hid_register_attributes(stat_attribute_list, sizeof(stat_attribute_list) / sizeof(stat_attribute_list[0]), stat_cookie, 0); + pcb_export_register_opts(stat_attribute_list, sizeof(stat_attribute_list) / sizeof(stat_attribute_list[0]), stat_cookie, 0); return pcb_hid_parse_command_line(argc, argv); } Index: trunk/src_plugins/export_svg/svg.c =================================================================== --- trunk/src_plugins/export_svg/svg.c (revision 26948) +++ trunk/src_plugins/export_svg/svg.c (revision 26949) @@ -374,7 +374,7 @@ static int svg_parse_arguments(pcb_hid_t *hid, int *argc, char ***argv) { - pcb_hid_register_attributes(svg_attribute_list, sizeof(svg_attribute_list) / sizeof(svg_attribute_list[0]), svg_cookie, 0); + pcb_export_register_opts(svg_attribute_list, sizeof(svg_attribute_list) / sizeof(svg_attribute_list[0]), svg_cookie, 0); return pcb_hid_parse_command_line(argc, argv); } Index: trunk/src_plugins/export_test/export_test.c =================================================================== --- trunk/src_plugins/export_test/export_test.c (revision 26948) +++ trunk/src_plugins/export_test/export_test.c (revision 26949) @@ -88,7 +88,7 @@ static int export_test_parse_arguments(pcb_hid_t *hid, int *argc, char ***argv) { - pcb_hid_register_attributes(export_test_options, sizeof(export_test_options) / sizeof(export_test_options[0]), export_test_cookie, 0); + pcb_export_register_opts(export_test_options, sizeof(export_test_options) / sizeof(export_test_options[0]), export_test_cookie, 0); return pcb_hid_parse_command_line(argc, argv); } Index: trunk/src_plugins/export_vfs_mc/export_vfs_mc.c =================================================================== --- trunk/src_plugins/export_vfs_mc/export_vfs_mc.c (revision 26948) +++ trunk/src_plugins/export_vfs_mc/export_vfs_mc.c (revision 26949) @@ -137,7 +137,7 @@ static int export_vfs_mc_parse_arguments(pcb_hid_t *hid, int *argc, char ***argv) { - pcb_hid_register_attributes(export_vfs_mc_options, sizeof(export_vfs_mc_options) / sizeof(export_vfs_mc_options[0]), export_vfs_mc_cookie, 0); + pcb_export_register_opts(export_vfs_mc_options, sizeof(export_vfs_mc_options) / sizeof(export_vfs_mc_options[0]), export_vfs_mc_cookie, 0); return pcb_hid_parse_command_line(argc, argv); } Index: trunk/src_plugins/export_xy/xy.c =================================================================== --- trunk/src_plugins/export_xy/xy.c (revision 26948) +++ trunk/src_plugins/export_xy/xy.c (revision 26949) @@ -831,7 +831,7 @@ static int xy_parse_arguments(pcb_hid_t *hid, int *argc, char ***argv) { - pcb_hid_register_attributes(xy_options, sizeof(xy_options) / sizeof(xy_options[0]), xy_cookie, 0); + pcb_export_register_opts(xy_options, sizeof(xy_options) / sizeof(xy_options[0]), xy_cookie, 0); return pcb_hid_parse_command_line(argc, argv); } Index: trunk/src_plugins/loghid/loghid.c =================================================================== --- trunk/src_plugins/loghid/loghid.c (revision 26948) +++ trunk/src_plugins/loghid/loghid.c (revision 26949) @@ -60,7 +60,7 @@ pcb_hid_t *target, *me; const char *target_name; - pcb_hid_register_attributes(loghid_attribute_list, NUM_OPTIONS, loghid_cookie, 0); + pcb_export_register_opts(loghid_attribute_list, NUM_OPTIONS, loghid_cookie, 0); pcb_hid_parse_command_line(argc, argv); target_name = loghid_attribute_list[HA_target_hid].default_val.str;