Index: trunk/doc-rnd/hacking/renames =================================================================== --- trunk/doc-rnd/hacking/renames (revision 4893) +++ trunk/doc-rnd/hacking/renames (revision 4894) @@ -376,3 +376,8 @@ hid_actionv_ -> pcb_hid_actionv_ hid_parse_command -> pcb_hid_parse_command hid_parse_actions -> pcb_hid_parse_actions +hid_register_attributes -> pcb_hid_register_attributes +hid_remove_attributes_by_cookie -> pcb_hid_remove_attributes_by_cookie +hid_attributes_uninit -> pcb_hid_attributes_uninit +hid_usage -> pcb_hid_usage +hid_usage_option -> pcb_hid_usage_option Index: trunk/src/hid_attrib.c =================================================================== --- trunk/src/hid_attrib.c (revision 4893) +++ trunk/src/hid_attrib.c (revision 4894) @@ -5,7 +5,7 @@ pcb_hid_attr_node_t *hid_attr_nodes = 0; -void hid_register_attributes(pcb_hid_attribute_t * a, int n, const char *cookie, int copy) +void pcb_hid_register_attributes(pcb_hid_attribute_t * a, int n, const char *cookie, int copy) { pcb_hid_attr_node_t *ha; @@ -18,7 +18,7 @@ ha->cookie = cookie; } -void hid_attributes_uninit(void) +void pcb_hid_attributes_uninit(void) { pcb_hid_attr_node_t *ha, *next; for (ha = hid_attr_nodes; ha; ha = next) { @@ -30,7 +30,7 @@ hid_attr_nodes = NULL; } -void hid_remove_attributes_by_cookie(const char *cookie) +void pcb_hid_remove_attributes_by_cookie(const char *cookie) { pcb_hid_attr_node_t *ha, *next, *prev = NULL; for (ha = hid_attr_nodes; ha; ha = next) { @@ -205,12 +205,12 @@ } } -void hid_usage_option(const char *name, const char *help) +void pcb_hid_usage_option(const char *name, const char *help) { fprintf(stderr, "%-20s %s\n", name, help); } -void hid_usage(pcb_hid_attribute_t * a, int numa) +void pcb_hid_usage(pcb_hid_attribute_t * a, int numa) { for (; numa > 0; numa--,a++) { const char *help; @@ -217,6 +217,6 @@ if (a->help_text == NULL) help = ""; else if (a->help_text == ATTR_UNDOCUMENTED) help = ""; else help = a->help_text; - hid_usage_option(a->name, help); + pcb_hid_usage_option(a->name, help); } } Index: trunk/src/hid_attrib.h =================================================================== --- trunk/src/hid_attrib.h (revision 4893) +++ trunk/src/hid_attrib.h (revision 4894) @@ -39,15 +39,15 @@ int hash; /* for detecting changes. */ }; -extern void hid_register_attributes(pcb_hid_attribute_t *, int, const char *cookie, int copy); +extern void pcb_hid_register_attributes(pcb_hid_attribute_t *, int, const char *cookie, int copy); #define PCB_REGISTER_ATTRIBUTES(a, cookie) PCB_HIDCONCAT(void register_,a) ()\ -{ hid_register_attributes(a, sizeof(a)/sizeof(a[0]), cookie, 0); } +{ pcb_hid_register_attributes(a, sizeof(a)/sizeof(a[0]), cookie, 0); } /* Remove all attributes registered with the given cookie */ -void hid_remove_attributes_by_cookie(const char *cookie); +void pcb_hid_remove_attributes_by_cookie(const char *cookie); /* remove all attributes and free the list */ -void hid_attributes_uninit(void); +void pcb_hid_attributes_uninit(void); typedef struct pcb_hid_attr_node_s { struct pcb_hid_attr_node_s *next; @@ -58,6 +58,6 @@ extern pcb_hid_attr_node_t *hid_attr_nodes; -void hid_usage(pcb_hid_attribute_t * a, int numa); -void hid_usage_option(const char *name, const char *help); +void pcb_hid_usage(pcb_hid_attribute_t * a, int numa); +void pcb_hid_usage_option(const char *name, const char *help); #endif Index: trunk/src/hid_init.c =================================================================== --- trunk/src/hid_init.c (revision 4893) +++ trunk/src/hid_init.c (revision 4894) @@ -126,7 +126,7 @@ free(hid_list); pcb_hid_actions_uninit(); - hid_attributes_uninit(); + pcb_hid_attributes_uninit(); } void hid_register_hid(pcb_hid_t * hid) Index: trunk/src_plugins/export_bboard/bboard.c =================================================================== --- trunk/src_plugins/export_bboard/bboard.c (revision 4893) +++ trunk/src_plugins/export_bboard/bboard.c (revision 4894) @@ -607,7 +607,7 @@ bboard_hid.set_crosshair = bboard_set_crosshair; hid_register_hid(&bboard_hid); - hid_register_attributes(bboard_options, sizeof(bboard_options) / sizeof(bboard_options[0]), bboard_cookie, 0); + pcb_hid_register_attributes(bboard_options, sizeof(bboard_options) / sizeof(bboard_options[0]), bboard_cookie, 0); return NULL; } Index: trunk/src_plugins/export_bom/bom.c =================================================================== --- trunk/src_plugins/export_bom/bom.c (revision 4893) +++ trunk/src_plugins/export_bom/bom.c (revision 4894) @@ -289,7 +289,7 @@ static int bom_usage(const char *topic) { fprintf(stderr, "\nbom exporter command line arguments:\n\n"); - hid_usage(bom_options, sizeof(bom_options) / sizeof(bom_options[0])); + pcb_hid_usage(bom_options, sizeof(bom_options) / sizeof(bom_options[0])); fprintf(stderr, "\nUsage: pcb-rnd [generic_options] -x bom foo.pcb [bom_options]\n\n"); return 0; } @@ -297,7 +297,7 @@ static void bom_parse_arguments(int *argc, char ***argv) { - hid_register_attributes(bom_options, sizeof(bom_options) / sizeof(bom_options[0]), bom_cookie, 0); + pcb_hid_register_attributes(bom_options, sizeof(bom_options) / sizeof(bom_options[0]), bom_cookie, 0); hid_parse_command_line(argc, argv); } Index: trunk/src_plugins/export_dsn/dsn.c =================================================================== --- trunk/src_plugins/export_dsn/dsn.c (revision 4893) +++ trunk/src_plugins/export_dsn/dsn.c (revision 4894) @@ -583,7 +583,7 @@ dsn_hid.parse_arguments = dsn_parse_arguments; hid_register_hid(&dsn_hid); - hid_register_attributes(dsn_options, sizeof(dsn_options) / sizeof(dsn_options[0]), dsn_cookie, 0); + pcb_hid_register_attributes(dsn_options, sizeof(dsn_options) / sizeof(dsn_options[0]), dsn_cookie, 0); return hid_dsn_uninit; } Index: trunk/src_plugins/export_dxf/dxf.c =================================================================== --- trunk/src_plugins/export_dxf/dxf.c (revision 4893) +++ trunk/src_plugins/export_dxf/dxf.c (revision 4894) @@ -5966,7 +5966,7 @@ hid_register_hid(&dxf_hid); - hid_register_attributes(dxf_options, sizeof(dxf_options) / sizeof(dxf_options[0]), dxf_cookie, 0); + pcb_hid_register_attributes(dxf_options, sizeof(dxf_options) / sizeof(dxf_options[0]), dxf_cookie, 0); /* return hid_dxf_uninit();*/ return NULL; Index: trunk/src_plugins/export_gcode/gcode.c =================================================================== --- trunk/src_plugins/export_gcode/gcode.c (revision 4893) +++ trunk/src_plugins/export_gcode/gcode.c (revision 4894) @@ -222,7 +222,7 @@ static void gcode_parse_arguments(int *argc, char ***argv) { - hid_register_attributes(gcode_attribute_list, sizeof(gcode_attribute_list) / sizeof(gcode_attribute_list[0]), gcode_cookie, 0); + pcb_hid_register_attributes(gcode_attribute_list, sizeof(gcode_attribute_list) / sizeof(gcode_attribute_list[0]), gcode_cookie, 0); hid_parse_command_line(argc, argv); } @@ -864,7 +864,7 @@ static int gcode_usage(const char *topic) { fprintf(stderr, "\ngcode exporter command line arguments:\n\n"); - hid_usage(gcode_attribute_list, sizeof(gcode_attribute_list) / sizeof(gcode_attribute_list[0])); + pcb_hid_usage(gcode_attribute_list, sizeof(gcode_attribute_list) / sizeof(gcode_attribute_list[0])); fprintf(stderr, "\nUsage: pcb-rnd [generic_options] -x gcode foo.pcb [gcode options]\n\n"); return 0; } Index: trunk/src_plugins/export_gerber/gerber.c =================================================================== --- trunk/src_plugins/export_gerber/gerber.c (revision 4893) +++ trunk/src_plugins/export_gerber/gerber.c (revision 4894) @@ -595,7 +595,7 @@ static void gerber_parse_arguments(int *argc, char ***argv) { - hid_register_attributes(gerber_options, NUM_OPTIONS, gerber_cookie, 0); + pcb_hid_register_attributes(gerber_options, NUM_OPTIONS, gerber_cookie, 0); hid_parse_command_line(argc, argv); } @@ -1154,7 +1154,7 @@ static int gerber_usage(const char *topic) { fprintf(stderr, "\ngerber exporter command line arguments:\n\n"); - hid_usage(gerber_options, sizeof(gerber_options) / sizeof(gerber_options[0])); + pcb_hid_usage(gerber_options, sizeof(gerber_options) / sizeof(gerber_options[0])); fprintf(stderr, "\nUsage: pcb-rnd [generic_options] -x gerber foo.pcb [gerber options]\n\n"); return 0; } Index: trunk/src_plugins/export_ipcd356/ipcd356.c =================================================================== --- trunk/src_plugins/export_ipcd356/ipcd356.c (revision 4893) +++ trunk/src_plugins/export_ipcd356/ipcd356.c (revision 4894) @@ -620,7 +620,7 @@ hid_register_hid(&IPCD356_hid); - hid_register_attributes(IPCD356_options, sizeof(IPCD356_options) / sizeof(IPCD356_options[0]), ipcd356_cookie, 0); + pcb_hid_register_attributes(IPCD356_options, sizeof(IPCD356_options) / sizeof(IPCD356_options[0]), ipcd356_cookie, 0); return NULL; } Index: trunk/src_plugins/export_lpr/lpr.c =================================================================== --- trunk/src_plugins/export_lpr/lpr.c (revision 4893) +++ trunk/src_plugins/export_lpr/lpr.c (revision 4894) @@ -99,7 +99,7 @@ static void lpr_parse_arguments(int *argc, char ***argv) { lpr_get_export_options(0); - hid_register_attributes(lpr_options, num_lpr_options, lpr_cookie, 0); + pcb_hid_register_attributes(lpr_options, num_lpr_options, lpr_cookie, 0); hid_parse_command_line(argc, argv); } @@ -113,7 +113,7 @@ static int lpr_usage(const char *topic) { fprintf(stderr, "\nlpr exporter command line arguments:\n\n"); - hid_usage(base_lpr_options, sizeof(base_lpr_options) / sizeof(base_lpr_options[0])); + pcb_hid_usage(base_lpr_options, sizeof(base_lpr_options) / sizeof(base_lpr_options[0])); fprintf(stderr, "\nUsage: pcb-rnd [generic_options] -x lpr foo.pcb [lpr options]\n\n"); return 0; } Index: trunk/src_plugins/export_nelma/nelma.c =================================================================== --- trunk/src_plugins/export_nelma/nelma.c (revision 4893) +++ trunk/src_plugins/export_nelma/nelma.c (revision 4894) @@ -476,7 +476,7 @@ static void nelma_parse_arguments(int *argc, char ***argv) { - hid_register_attributes(nelma_attribute_list, sizeof(nelma_attribute_list) / sizeof(nelma_attribute_list[0]), nelma_cookie, 0); + pcb_hid_register_attributes(nelma_attribute_list, sizeof(nelma_attribute_list) / sizeof(nelma_attribute_list[0]), nelma_cookie, 0); hid_parse_command_line(argc, argv); } @@ -975,7 +975,7 @@ static int nelma_usage(const char *topic) { fprintf(stderr, "\nnelma exporter command line arguments:\n\n"); - hid_usage(nelma_attribute_list, sizeof(nelma_attribute_list) / sizeof(nelma_attribute_list[0])); + pcb_hid_usage(nelma_attribute_list, sizeof(nelma_attribute_list) / sizeof(nelma_attribute_list[0])); fprintf(stderr, "\nUsage: pcb-rnd [generic_options] -x nelma foo.pcb [nelma options]\n\n"); return 0; } Index: trunk/src_plugins/export_openscad/scad.c =================================================================== --- trunk/src_plugins/export_openscad/scad.c (revision 4893) +++ trunk/src_plugins/export_openscad/scad.c (revision 4894) @@ -1170,6 +1170,6 @@ hid_register_hid(&scad_hid); - hid_register_attributes(scad_options, sizeof(scad_options) / sizeof(scad_options[0]), openscad_cookie, 0); + pcb_hid_register_attributes(scad_options, sizeof(scad_options) / sizeof(scad_options[0]), openscad_cookie, 0); return NULL; } Index: trunk/src_plugins/export_png/png.c =================================================================== --- trunk/src_plugins/export_png/png.c (revision 4893) +++ trunk/src_plugins/export_png/png.c (revision 4894) @@ -936,7 +936,7 @@ static void png_parse_arguments(int *argc, char ***argv) { - hid_register_attributes(png_attribute_list, sizeof(png_attribute_list) / sizeof(png_attribute_list[0]), png_cookie, 0); + pcb_hid_register_attributes(png_attribute_list, sizeof(png_attribute_list) / sizeof(png_attribute_list[0]), png_cookie, 0); hid_parse_command_line(argc, argv); } @@ -1482,7 +1482,7 @@ static int png_usage(const char *topic) { fprintf(stderr, "\npng exporter command line arguments:\n\n"); - hid_usage(png_attribute_list, sizeof(png_attribute_list) / sizeof(png_attribute_list[0])); + pcb_hid_usage(png_attribute_list, sizeof(png_attribute_list) / sizeof(png_attribute_list[0])); fprintf(stderr, "\nUsage: pcb-rnd [generic_options] -x png foo.pcb [png options]\n\n"); return 0; } Index: trunk/src_plugins/export_ps/eps.c =================================================================== --- trunk/src_plugins/export_ps/eps.c (revision 4893) +++ trunk/src_plugins/export_ps/eps.c (revision 4894) @@ -336,7 +336,7 @@ static void eps_parse_arguments(int *argc, char ***argv) { - hid_register_attributes(eps_attribute_list, sizeof(eps_attribute_list) / sizeof(eps_attribute_list[0]), ps_cookie, 0); + pcb_hid_register_attributes(eps_attribute_list, sizeof(eps_attribute_list) / sizeof(eps_attribute_list[0]), ps_cookie, 0); hid_parse_command_line(argc, argv); } @@ -594,7 +594,7 @@ static int eps_usage(const char *topic) { fprintf(stderr, "\neps exporter command line arguments:\n\n"); - hid_usage(eps_attribute_list, sizeof(eps_attribute_list) / sizeof(eps_attribute_list[0])); + pcb_hid_usage(eps_attribute_list, sizeof(eps_attribute_list) / sizeof(eps_attribute_list[0])); fprintf(stderr, "\nUsage: pcb-rnd [generic_options] -x eps foo.pcb [eps options]\n\n"); return 0; } Index: trunk/src_plugins/export_ps/ps.c =================================================================== --- trunk/src_plugins/export_ps/ps.c (revision 4893) +++ trunk/src_plugins/export_ps/ps.c (revision 4894) @@ -744,7 +744,7 @@ static void ps_parse_arguments(int *argc, char ***argv) { - hid_register_attributes(ps_attribute_list, NUM_OPTIONS, ps_cookie, 0); + pcb_hid_register_attributes(ps_attribute_list, NUM_OPTIONS, ps_cookie, 0); hid_parse_command_line(argc, argv); } @@ -1596,7 +1596,7 @@ static int ps_usage(const char *topic) { fprintf(stderr, "\nps exporter command line arguments:\n\n"); - hid_usage(ps_attribute_list, sizeof(ps_attribute_list) / sizeof(ps_attribute_list[0])); + pcb_hid_usage(ps_attribute_list, sizeof(ps_attribute_list) / sizeof(ps_attribute_list[0])); fprintf(stderr, "\nUsage: pcb-rnd [generic_options] -x ps foo.pcb [ps options]\n\n"); return 0; } Index: trunk/src_plugins/export_svg/svg.c =================================================================== --- trunk/src_plugins/export_svg/svg.c (revision 4893) +++ trunk/src_plugins/export_svg/svg.c (revision 4894) @@ -325,7 +325,7 @@ static void svg_parse_arguments(int *argc, char ***argv) { - hid_register_attributes(svg_attribute_list, sizeof(svg_attribute_list) / sizeof(svg_attribute_list[0]), svg_cookie, 0); + pcb_hid_register_attributes(svg_attribute_list, sizeof(svg_attribute_list) / sizeof(svg_attribute_list[0]), svg_cookie, 0); hid_parse_command_line(argc, argv); } @@ -686,7 +686,7 @@ static int svg_usage(const char *topic) { fprintf(stderr, "\nsvg exporter command line arguments:\n\n"); - hid_usage(svg_attribute_list, sizeof(svg_attribute_list) / sizeof(svg_attribute_list[0])); + pcb_hid_usage(svg_attribute_list, sizeof(svg_attribute_list) / sizeof(svg_attribute_list[0])); fprintf(stderr, "\nUsage: pcb-rnd [generic_options] -x svg foo.pcb [svg options]\n\n"); return 0; } Index: trunk/src_plugins/export_test/export_test.c =================================================================== --- trunk/src_plugins/export_test/export_test.c (revision 4893) +++ trunk/src_plugins/export_test/export_test.c (revision 4894) @@ -316,7 +316,7 @@ static int export_test_usage(const char *topic) { fprintf(stderr, "\nexport_test exporter command line arguments:\n\n"); - hid_usage(export_test_options, sizeof(export_test_options) / sizeof(export_test_options[0])); + pcb_hid_usage(export_test_options, sizeof(export_test_options) / sizeof(export_test_options[0])); fprintf(stderr, "\nUsage: pcb-rnd [generic_options] -x export_test foo.pcb [export_test_options]\n\n"); return 0; } @@ -324,7 +324,7 @@ static void export_test_parse_arguments(int *argc, char ***argv) { - hid_register_attributes(export_test_options, sizeof(export_test_options) / sizeof(export_test_options[0]), export_test_cookie, 0); + pcb_hid_register_attributes(export_test_options, sizeof(export_test_options) / sizeof(export_test_options[0]), export_test_cookie, 0); hid_parse_command_line(argc, argv); } Index: trunk/src_plugins/export_xy/xy.c =================================================================== --- trunk/src_plugins/export_xy/xy.c (revision 4893) +++ trunk/src_plugins/export_xy/xy.c (revision 4894) @@ -351,7 +351,7 @@ static int xy_usage(const char *topic) { fprintf(stderr, "\nXY exporter command line arguments:\n\n"); - hid_usage(xy_options, sizeof(xy_options) / sizeof(xy_options[0])); + pcb_hid_usage(xy_options, sizeof(xy_options) / sizeof(xy_options[0])); fprintf(stderr, "\nUsage: pcb-rnd [generic_options] -x xy foo.pcb [xy_options]\n\n"); return 0; } @@ -358,7 +358,7 @@ static void xy_parse_arguments(int *argc, char ***argv) { - hid_register_attributes(xy_options, sizeof(xy_options) / sizeof(xy_options[0]), xy_cookie, 0); + pcb_hid_register_attributes(xy_options, sizeof(xy_options) / sizeof(xy_options[0]), xy_cookie, 0); hid_parse_command_line(argc, argv); } Index: trunk/src_plugins/hid_gtk/gtkhid-main.c =================================================================== --- trunk/src_plugins/hid_gtk/gtkhid-main.c (revision 4893) +++ trunk/src_plugins/hid_gtk/gtkhid-main.c (revision 4894) @@ -2151,6 +2151,6 @@ void gtkhid_end(void) { pcb_hid_remove_actions_by_cookie(ghid_cookie); - hid_remove_attributes_by_cookie(ghid_cookie); + pcb_hid_remove_attributes_by_cookie(ghid_cookie); gtkhid_active = 0; } Index: trunk/src_plugins/hid_gtk/gui-top-window.c =================================================================== --- trunk/src_plugins/hid_gtk/gui-top-window.c (revision 4893) +++ trunk/src_plugins/hid_gtk/gui-top-window.c (revision 4894) @@ -1367,7 +1367,7 @@ int ghid_usage(const char *topic) { fprintf(stderr, "\nGTK GUI command line arguments:\n\n"); - conf_usage("plugins/hid_gtk", hid_usage_option); + conf_usage("plugins/hid_gtk", pcb_hid_usage_option); fprintf(stderr, "\nInvocation: pcb-rnd --gui gtk [options]\n"); return 0; } Index: trunk/src_plugins/hid_lesstif/main.c =================================================================== --- trunk/src_plugins/hid_lesstif/main.c (revision 4893) +++ trunk/src_plugins/hid_lesstif/main.c (revision 4894) @@ -3751,7 +3751,7 @@ static int lesstif_usage(const char *topic) { fprintf(stderr, "\nLesstif GUI command line arguments:\n\n"); - hid_usage(lesstif_attribute_list, sizeof(lesstif_attribute_list) / sizeof(lesstif_attribute_list[0])); + pcb_hid_usage(lesstif_attribute_list, sizeof(lesstif_attribute_list) / sizeof(lesstif_attribute_list[0])); fprintf(stderr, "\nInvocation: pcb-rnd --gui lesstif [options]\n"); return 0; } @@ -3849,5 +3849,5 @@ static void lesstif_end(void) { pcb_hid_remove_actions_by_cookie(lesstif_cookie); - hid_remove_attributes_by_cookie(lesstif_cookie); + pcb_hid_remove_attributes_by_cookie(lesstif_cookie); } Index: trunk/src_plugins/loghid/loghid.c =================================================================== --- trunk/src_plugins/loghid/loghid.c (revision 4893) +++ trunk/src_plugins/loghid/loghid.c (revision 4894) @@ -49,7 +49,7 @@ pcb_hid_t *target; const char *target_name; - hid_register_attributes(loghid_attribute_list, NUM_OPTIONS, loghid_cookie, 0); + pcb_hid_register_attributes(loghid_attribute_list, NUM_OPTIONS, loghid_cookie, 0); hid_parse_command_line(argc, argv); target_name = loghid_attribute_list[HA_target_hid].default_val.str_value; @@ -78,7 +78,7 @@ static int loghid_usage(const char *topic) { fprintf(stderr, "\nhidlog command line arguments:\n\n"); - hid_usage(loghid_attribute_list, NUM_OPTIONS); + pcb_hid_usage(loghid_attribute_list, NUM_OPTIONS); fprintf(stderr, "\n"); fprintf(stderr, "Usage: pcb-rnd [generic_options] --gui hidlog-gui --target-hid gtk foo.pcb\n"); fprintf(stderr, "Usage: pcb-rnd [generic_options] --x hidlog-exp --target-hid png foo.pcb\n");