@@ -711,79 +711,6 @@ static struct command_result *json_commando(struct command *cmd,
711
711
return send_more_cmd (cmd , NULL , NULL , NULL , outgoing );
712
712
}
713
713
714
- /* Handles error or success */
715
- static struct command_result * forward_reply (struct command * cmd ,
716
- const char * method ,
717
- const char * buf ,
718
- const jsmntok_t * result ,
719
- void * arg )
720
- {
721
- const jsmntok_t * err = json_get_member (buf , result , "error" );
722
- if (err )
723
- return forward_error (cmd , method , buf , err , arg );
724
- return forward_result (cmd , method , buf , json_get_member (buf , result , "result" ), arg );
725
- }
726
-
727
- static struct command_result * forward_command (struct command * cmd ,
728
- const char * buffer ,
729
- const jsmntok_t * params ,
730
- const char * method )
731
- {
732
- /* params could be an array, so use low-level helper */
733
- struct out_req * req ;
734
-
735
- req = jsonrpc_request_whole_object_start (cmd , method , NULL ,
736
- forward_reply , NULL );
737
- json_add_tok (req -> js , "params" , params , buffer );
738
- return send_outreq (req );
739
- }
740
-
741
- static struct command_result * json_commando_rune (struct command * cmd ,
742
- const char * buffer ,
743
- const jsmntok_t * params )
744
- {
745
- const char * unused1 , * unused2 ;
746
-
747
- /* param call needed to generate help messages */
748
- if (!param (cmd , buffer , params ,
749
- p_opt ("rune" , param_string , & unused1 ),
750
- p_opt ("restrictions" , param_string , & unused2 ),
751
- NULL ))
752
- return command_param_failed ();
753
-
754
- return forward_command (cmd , buffer , params , "createrune" );
755
- }
756
-
757
- static struct command_result * json_commando_blacklist (struct command * cmd ,
758
- const char * buffer ,
759
- const jsmntok_t * params )
760
- {
761
- const char * unused1 , * unused2 ;
762
-
763
- /* param call needed to generate help messages */
764
- if (!param (cmd , buffer , params ,
765
- p_opt ("start" , param_string , & unused1 ),
766
- p_opt ("end" , param_string , & unused2 ),
767
- NULL ))
768
- return command_param_failed ();
769
-
770
- return forward_command (cmd , buffer , params , "blacklistrune" );
771
- }
772
-
773
- static struct command_result * json_commando_listrunes (struct command * cmd ,
774
- const char * buffer ,
775
- const jsmntok_t * params )
776
- {
777
- const char * unused ;
778
-
779
- /* param call needed to generate help messages */
780
- if (!param (cmd , buffer , params ,
781
- p_opt ("rune" , param_string , & unused ), NULL ))
782
- return command_param_failed ();
783
-
784
- return forward_command (cmd , buffer , params , "showrunes" );
785
- }
786
-
787
714
static void memleak_mark_globals (struct plugin * p , struct htable * memtable )
788
715
{
789
716
memleak_scan_obj (memtable , outgoing_commands );
@@ -804,23 +731,6 @@ static const char *init(struct command *init_cmd,
804
731
static const struct plugin_command commands [] = { {
805
732
"commando" ,
806
733
json_commando ,
807
- }, {
808
- "commando-rune" ,
809
- json_commando_rune ,
810
- "v23.08" ,
811
- "v25.02" ,
812
- },
813
- {
814
- "commando-listrunes" ,
815
- json_commando_listrunes ,
816
- "v23.08" ,
817
- "v25.02" ,
818
- },
819
- {
820
- "commando-blacklist" ,
821
- json_commando_blacklist ,
822
- "v23.08" ,
823
- "v25.02" ,
824
734
},
825
735
};
826
736
0 commit comments