Index: conf_act.c =================================================================== --- conf_act.c (revision 17464) +++ conf_act.c (revision 17465) @@ -53,7 +53,7 @@ return res; } -static fgw_error_t pcb_act_Conf(int oargc, const char **oargv) +static fgw_error_t pcb_act_Conf(fgw_arg_t *ores, int oargc, fgw_arg_t *oargv) { PCB_OLD_ACT_BEGIN; const char *cmd = argc > 0 ? argv[0] : 0; @@ -224,7 +224,7 @@ /*------------ get/chk (check flag actions for menus) ------------------*/ static const char GetStyle_syntax[] = "GetStyle()" ; static const char GetStyle_help[] = "Return integer index (>=0) of the currently active style or -1 if no style is selected (== custom style)"; -static fgw_error_t pcb_act_GetStyle(int oargc, const char **oargv) +static fgw_error_t pcb_act_GetStyle(fgw_arg_t *ores, int oargc, fgw_arg_t *oargv) { PCB_OLD_ACT_BEGIN; return pcb_route_style_lookup(&PCB->RouteStyle, conf_core.design.line_thickness, conf_core.design.via_thickness, conf_core.design.via_drilling_hole, conf_core.design.clearance, NULL); @@ -233,7 +233,7 @@ static const char ChkMode_syntax[] = "ChkMode(expected_mode)" ; static const char ChkMode_help[] = "Return 1 if the currently selected mode is the expected_mode"; -static fgw_error_t pcb_act_ChkMode(int oargc, const char **oargv) +static fgw_error_t pcb_act_ChkMode(fgw_arg_t *ores, int oargc, fgw_arg_t *oargv) { PCB_OLD_ACT_BEGIN; #warning cleanup TODO: convert this to a compile-time hash; or make the toolbar configurable from the menu file @@ -278,7 +278,7 @@ "ChkGridSize(none)\n" ; static const char ChkGridSize_help[] = "Return 1 if the currently selected grid matches the expected_size. If argument is \"none\" return 1 if there is no grid."; -static fgw_error_t pcb_act_ChkGridSize(int oargc, const char **oargv) +static fgw_error_t pcb_act_ChkGridSize(fgw_arg_t *ores, int oargc, fgw_arg_t *oargv) { PCB_OLD_ACT_BEGIN; assert(argc == 1); @@ -291,7 +291,7 @@ static const char ChkSubcID_syntax[] = "ChkSubcID(pattern)\n"; static const char ChkSubcID_help[] = "Return 1 if currently shown subc ID matches the requested pattern"; -static fgw_error_t pcb_act_ChkSubcID(int oargc, const char **oargv) +static fgw_error_t pcb_act_ChkSubcID(fgw_arg_t *ores, int oargc, fgw_arg_t *oargv) { PCB_OLD_ACT_BEGIN; const char *have = conf_core.editor.subc_id, *expected; @@ -306,7 +306,7 @@ static const char ChkGridUnits_syntax[] = "ChkGridUnits(expected)"; static const char ChkGridUnits_help[] = "Return 1 if currently selected grid unit matches the expected (normally mm or mil)"; -static fgw_error_t pcb_act_ChkGridUnits(int oargc, const char **oargv) +static fgw_error_t pcb_act_ChkGridUnits(fgw_arg_t *ores, int oargc, fgw_arg_t *oargv) { PCB_OLD_ACT_BEGIN; assert(argc == 1); @@ -316,7 +316,7 @@ static const char ChkBuffer_syntax[] = "ChkBuffer(idx)"; static const char ChkBuffer_help[] = "Return 1 if currently selected buffer's index matches idx"; -static fgw_error_t pcb_act_ChkBuffer(int oargc, const char **oargv) +static fgw_error_t pcb_act_ChkBuffer(fgw_arg_t *ores, int oargc, fgw_arg_t *oargv) { PCB_OLD_ACT_BEGIN; int expected = argv[0][0] - '0';