X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Fxsvf%2Fxsvf.c;h=e1a30e6e0caf37426a5a2834e718acf5da68ccfd;hb=42ef503d37b18d907da16d26e99167566d5aabd1;hp=17af9eadd783e7481c3a33f8a605222bee337cda;hpb=db6c2871dd3f106ca8b5dc8828a17f8b729de181;p=openocd.git

diff --git a/src/xsvf/xsvf.c b/src/xsvf/xsvf.c
index 17af9eadd7..e1a30e6e0c 100644
--- a/src/xsvf/xsvf.c
+++ b/src/xsvf/xsvf.c
@@ -175,7 +175,7 @@ static int xsvf_read_buffer(int num_bits, int fd, uint8_t* buf)
 }
 
 
-static int handle_xsvf_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
+COMMAND_HANDLER(handle_xsvf_command)
 {
 	uint8_t *dr_out_buf = NULL;				/* from host to device (TDI) */
 	uint8_t *dr_in_buf = NULL;				/* from device to host (TDO) */
@@ -202,7 +202,6 @@ static int handle_xsvf_command(struct command_context_s *cmd_ctx, char *cmd, cha
 	int		tdo_mismatch = 0;
 	int		result;
 	int		verbose = 1;
-	char		*filename;
 
 	bool		collecting_path = false;
 	tap_state_t	path[XSTATE_MAX_PATH];
@@ -218,7 +217,7 @@ static int handle_xsvf_command(struct command_context_s *cmd_ctx, char *cmd, cha
 	   additional devices in the scan chain, otherwise the device
 	   that should be affected
 	*/
-	jtag_tap_t *tap = NULL;
+	struct jtag_tap *tap = NULL;
 
 	if (argc < 2)
 	{
@@ -226,7 +225,8 @@ static int handle_xsvf_command(struct command_context_s *cmd_ctx, char *cmd, cha
 		return ERROR_FAIL;
 	}
 
-	filename = args[1];		/* we mess with args starting point below, snapshot filename here */
+	/* we mess with args starting point below, snapshot filename here */
+	const char *filename = args[1];
 
 	if (strcmp(args[0], "plain") != 0)
 	{