helper/jim-nvp: comply with coding style [2/2]

With the API fixed to comply with OpenOCD coding style, fix all
the references in the code.

Patch generated automatically with the script below.
The list is in reverse order to replace a common prefix after the
replacement of the symbols with the same prefix.

%<---%<---%<---%<---%<---%<---%<---%<---%<---%<---%<---%<---%<---
(cat << EOF
Jim_SetResult_NvpUnknown         jim_set_result_nvp_unknown
Jim_Nvp_value2name_simple        jim_nvp_value2name_simple
Jim_Nvp_value2name_obj           jim_nvp_value2name_obj
Jim_Nvp_value2name               jim_nvp_value2name
Jim_Nvp_name2value_simple        jim_nvp_name2value_simple
Jim_Nvp_name2value_obj_nocase    jim_nvp_name2value_obj_nocase
Jim_Nvp_name2value_obj           jim_nvp_name2value_obj
Jim_Nvp_name2value_nocase_simple jim_nvp_name2value_nocase_simple
Jim_Nvp_name2value_nocase        jim_nvp_name2value_nocase
Jim_Nvp_name2value               jim_nvp_name2value
Jim_Nvp                        struct jim_nvp
Jim_GetOpt_Wide                  jim_getopt_wide
Jim_GetOpt_String                jim_getopt_string
Jim_GetOpt_Setup                 jim_getopt_setup
Jim_GetOpt_Obj                   jim_getopt_obj
Jim_GetOpt_NvpUnknown            jim_getopt_nvp_unknown
Jim_GetOpt_Nvp                   jim_getopt_nvp
Jim_GetOpt_Enum                  jim_getopt_enum
Jim_GetOpt_Double                jim_getopt_double
Jim_GetOpt_Debug                 jim_getopt_debug
Jim_GetOptInfo                 struct jim_getopt_info
Jim_GetNvp                       jim_get_nvp
Jim_Debug_ArgvString             jim_debug_argv_string
EOF
) | while read a b; do
    sed -i "s/$a/$b/g" $(find src -type f ! -name jim-nvp.\? )
done
%<---%<---%<---%<---%<---%<---%<---%<---%<---%<---%<---%<---%<---

Change-Id: I10a12bd64bb8b17575fd9150482c989c92b298a2
Signed-off-by: Antonio Borneo <borneo.antonio@gmail.com>
Reviewed-on: http://openocd.zylin.com/6184
Reviewed-by: Marc Schink <dev@zapb.de>
Tested-by: jenkins

1 files changed, 15 insertions, 15 deletions

diff --git a/src/jtag/aice/aice_transport.c b/src/jtag/aice/aice_transport.c
index c02a42f..322d8ae 100644
--- a/src/jtag/aice/aice_transport.c
+++ b/src/jtag/aice/aice_transport.c
@@ -30,11 +30,11 @@
 #include <string.h>
 
 /* */
-static int jim_newtap_expected_id(Jim_Nvp *n, Jim_GetOptInfo *goi,
+static int jim_newtap_expected_id(struct jim_nvp *n, struct jim_getopt_info *goi,
 		struct jtag_tap *pTap)
 {
 	jim_wide w;
-	int e = Jim_GetOpt_Wide(goi, &w);
+	int e = jim_getopt_wide(goi, &w);
 	if (e != JIM_OK) {
 		Jim_SetResultFormatted(goi->interp, "option: %s bad parameter",
 				n->name);
@@ -63,14 +63,14 @@ static int jim_newtap_expected_id(Jim_Nvp *n, Jim_GetOptInfo *goi,
 #define NTAP_OPT_EXPECTED_ID 0
 
 /* */
-static int jim_aice_newtap_cmd(Jim_GetOptInfo *goi)
+static int jim_aice_newtap_cmd(struct jim_getopt_info *goi)
 {
 	struct jtag_tap *pTap;
 	int x;
 	int e;
-	Jim_Nvp *n;
+	struct jim_nvp *n;
 	char *cp;
-	const Jim_Nvp opts[] = {
+	const struct jim_nvp opts[] = {
 		{.name = "-expected-id", .value = NTAP_OPT_EXPECTED_ID},
 		{.name = NULL, .value = -1},
 	};
@@ -92,10 +92,10 @@ static int jim_aice_newtap_cmd(Jim_GetOptInfo *goi)
 	}
 
 	const char *tmp;
-	Jim_GetOpt_String(goi, &tmp, NULL);
+	jim_getopt_string(goi, &tmp, NULL);
 	pTap->chip = strdup(tmp);
 
-	Jim_GetOpt_String(goi, &tmp, NULL);
+	jim_getopt_string(goi, &tmp, NULL);
 	pTap->tapname = strdup(tmp);
 
 	/* name + dot + name + null */
@@ -108,9 +108,9 @@ static int jim_aice_newtap_cmd(Jim_GetOptInfo *goi)
 			pTap->chip, pTap->tapname, pTap->dotted_name, goi->argc);
 
 	while (goi->argc) {
-		e = Jim_GetOpt_Nvp(goi, opts, &n);
+		e = jim_getopt_nvp(goi, opts, &n);
 		if (e != JIM_OK) {
-			Jim_GetOpt_NvpUnknown(goi, opts, 0);
+			jim_getopt_nvp_unknown(goi, opts, 0);
 			free(cp);
 			free(pTap);
 			return e;
@@ -138,8 +138,8 @@ static int jim_aice_newtap_cmd(Jim_GetOptInfo *goi)
 /* */
 static int jim_aice_newtap(Jim_Interp *interp, int argc, Jim_Obj * const *argv)
 {
-	Jim_GetOptInfo goi;
-	Jim_GetOpt_Setup(&goi, interp, argc - 1, argv + 1);
+	struct jim_getopt_info goi;
+	jim_getopt_setup(&goi, interp, argc - 1, argv + 1);
 	return jim_aice_newtap_cmd(&goi);
 }
 
@@ -246,8 +246,8 @@ static int aice_init_reset(struct command_context *cmd_ctx)
 static int jim_aice_arp_init_reset(Jim_Interp *interp, int argc, Jim_Obj * const *argv)
 {
 	int e = ERROR_OK;
-	Jim_GetOptInfo goi;
-	Jim_GetOpt_Setup(&goi, interp, argc - 1, argv + 1);
+	struct jim_getopt_info goi;
+	jim_getopt_setup(&goi, interp, argc - 1, argv + 1);
 	if (goi.argc != 0) {
 		Jim_WrongNumArgs(goi.interp, 1, goi.argv - 1, "(no params)");
 		return JIM_ERR;
@@ -265,8 +265,8 @@ static int jim_aice_arp_init_reset(Jim_Interp *interp, int argc, Jim_Obj * const
 
 static int jim_aice_names(Jim_Interp *interp, int argc, Jim_Obj *const *argv)
 {
-	Jim_GetOptInfo goi;
-	Jim_GetOpt_Setup(&goi, interp, argc - 1, argv + 1);
+	struct jim_getopt_info goi;
+	jim_getopt_setup(&goi, interp, argc - 1, argv + 1);
 	if (goi.argc != 0) {
 		Jim_WrongNumArgs(goi.interp, 1, goi.argv, "Too many parameters");
 		return JIM_ERR;