This is an automated email from Gerrit.
"Antonio Borneo <borneo.anto...@gmail.com>" just uploaded a new patch set to
Gerrit, which you can find at https://review.openocd.org/c/openocd/+/7052
-- gerrit
commit a565309aceeca3718bbafd5fd6cb2e2c52db89ac
Author: Antonio Borneo <borneo.anto...@gmail.com>
Date: Mon Apr 26 08:57:28 2021 +0200
helper/jim-nvp: avoid camelcase error by deprecated API
Commit b8e18d292eb6 ("helper/jim-nvp: comply with coding style
[1/2]") tags as deprecated the old CamelCase API of jim-nvp, so
that old patches already in gerrit or in user's local git can
still build while dumping a deprecated message.
So far, we have not found any such case, so the deprecated API can
be safely dropped in preparation of v0.12.0-rc1.
Drop the compile flag "-Wno-error=deprecated-declarations" and the
deprecated API.
Change-Id: I52ce47eda69a51c2dd29aac15f16e285492d89b4
Signed-off-by: Antonio Borneo <borneo.anto...@gmail.com>
diff --git a/configure.ac b/configure.ac
index 7eada3a32e..1d9a30445b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -792,7 +792,6 @@ AS_IF([test "x${gcc_wextra}" = "xyes"], [
GCC_WARNINGS="${GCC_WARNINGS} -Wredundant-decls"
GCC_WARNINGS="${GCC_WARNINGS} -Wpointer-arith"
GCC_WARNINGS="${GCC_WARNINGS} -Wundef"
- GCC_WARNINGS="${GCC_WARNINGS} -Wno-error=deprecated-declarations"
])
AS_IF([test "x${gcc_werror}" = "xyes"], [
GCC_WARNINGS="${GCC_WARNINGS} -Werror"
diff --git a/src/helper/jim-nvp.h b/src/helper/jim-nvp.h
index 00e4af944b..caf972af28 100644
--- a/src/helper/jim-nvp.h
+++ b/src/helper/jim-nvp.h
@@ -326,144 +326,4 @@ void jim_getopt_nvp_unknown(struct jim_getopt_info *goi,
const struct jim_nvp *l
*/
int jim_getopt_enum(struct jim_getopt_info *goi, const char *const *lookup,
int *puthere);
-/*
- * DEPRECATED API
- * Do not use these API anymore, as they do not comply with OpenOCD coding
style
- * They are listed here to avoid breaking build after merge of patches already
queued in gerrit
- */
-
-static inline __attribute__ ((deprecated))
-const char *Jim_Debug_ArgvString(Jim_Interp *interp, int argc, Jim_Obj *const
*argv)
-{
- return jim_debug_argv_string(interp, argc, argv);
-}
-
-static inline __attribute__ ((deprecated))
-int Jim_GetNvp(Jim_Interp *interp, Jim_Obj *objptr, const struct jim_nvp
*nvp_table, const struct jim_nvp **result)
-{
- return jim_get_nvp(interp, objptr, nvp_table, result);
-}
-
-static inline __attribute__ ((deprecated))
-void Jim_GetOpt_Debug(struct jim_getopt_info *goi)
-{
- jim_getopt_debug(goi);
-}
-
-static inline __attribute__ ((deprecated))
-int Jim_GetOpt_Double(struct jim_getopt_info *goi, double *puthere)
-{
- return jim_getopt_double(goi, puthere);
-}
-
-static inline __attribute__ ((deprecated))
-int Jim_GetOpt_Enum(struct jim_getopt_info *goi, const char *const *lookup,
int *puthere)
-{
- return jim_getopt_enum(goi, lookup, puthere);
-}
-
-static inline __attribute__ ((deprecated))
-int Jim_GetOpt_Nvp(struct jim_getopt_info *goi, const struct jim_nvp *lookup,
struct jim_nvp **puthere)
-{
- return jim_getopt_nvp(goi, lookup, puthere);
-}
-
-static inline __attribute__ ((deprecated))
-void Jim_GetOpt_NvpUnknown(struct jim_getopt_info *goi, const struct jim_nvp
*lookup, int hadprefix)
-{
- jim_getopt_nvp_unknown(goi, lookup, hadprefix);
-}
-
-static inline __attribute__ ((deprecated))
-int Jim_GetOpt_Obj(struct jim_getopt_info *goi, Jim_Obj **puthere)
-{
- return jim_getopt_obj(goi, puthere);
-}
-
-static inline __attribute__ ((deprecated))
-int Jim_GetOpt_Setup(struct jim_getopt_info *goi, Jim_Interp *interp, int
argc, Jim_Obj *const *argv)
-{
- return jim_getopt_setup(goi, interp, argc, argv);
-}
-
-static inline __attribute__ ((deprecated))
-int Jim_GetOpt_String(struct jim_getopt_info *goi, const char **puthere, int
*len)
-{
- return jim_getopt_string(goi, puthere, len);
-}
-
-static inline __attribute__ ((deprecated))
-int Jim_GetOpt_Wide(struct jim_getopt_info *goi, jim_wide *puthere)
-{
- return jim_getopt_wide(goi, puthere);
-}
-
-static inline __attribute__ ((deprecated))
-int Jim_Nvp_name2value(Jim_Interp *interp, const struct jim_nvp *nvp_table,
const char *name, struct jim_nvp **result)
-{
- return jim_nvp_name2value(interp, nvp_table, name, result);
-}
-
-static inline __attribute__ ((deprecated))
-int Jim_Nvp_name2value_nocase(Jim_Interp *interp, const struct jim_nvp
*nvp_table, const char *name,
- struct jim_nvp **result)
-{
- return jim_nvp_name2value_nocase(interp, nvp_table, name, result);
-}
-
-static inline __attribute__ ((deprecated))
-struct jim_nvp *Jim_Nvp_name2value_nocase_simple(const struct jim_nvp
*nvp_table, const char *name)
-{
- return jim_nvp_name2value_nocase_simple(nvp_table, name);
-}
-
-static inline __attribute__ ((deprecated))
-int Jim_Nvp_name2value_obj(Jim_Interp *interp, const struct jim_nvp
*nvp_table, Jim_Obj *name_obj,
- struct jim_nvp **result)
-{
- return jim_nvp_name2value_obj(interp, nvp_table, name_obj, result);
-}
-
-static inline __attribute__ ((deprecated))
-int Jim_Nvp_name2value_obj_nocase(Jim_Interp *interp, const struct jim_nvp
*nvp_table, Jim_Obj *name_obj,
- struct jim_nvp **result)
-{
- return jim_nvp_name2value_obj_nocase(interp, nvp_table, name_obj,
result);
-}
-
-static inline __attribute__ ((deprecated))
-struct jim_nvp *Jim_Nvp_name2value_simple(const struct jim_nvp *nvp_table,
const char *name)
-{
- return jim_nvp_name2value_simple(nvp_table, name);
-}
-
-static inline __attribute__ ((deprecated))
-int Jim_Nvp_value2name(Jim_Interp *interp, const struct jim_nvp *nvp_table,
int value, struct jim_nvp **result)
-{
- return jim_nvp_value2name(interp, nvp_table, value, result);
-}
-
-static inline __attribute__ ((deprecated))
-int Jim_Nvp_value2name_obj(Jim_Interp *interp, const struct jim_nvp
*nvp_table, Jim_Obj *value_obj,
- struct jim_nvp **result)
-{
- return jim_nvp_value2name_obj(interp, nvp_table, value_obj, result);
-}
-
-static inline __attribute__ ((deprecated))
-struct jim_nvp *Jim_Nvp_value2name_simple(const struct jim_nvp *nvp_table, int
v)
-{
- return jim_nvp_value2name_simple(nvp_table, v);
-}
-
-static inline __attribute__ ((deprecated))
-void Jim_SetResult_NvpUnknown(Jim_Interp *interp, Jim_Obj *param_name, Jim_Obj
*param_value,
- const struct jim_nvp *nvp_table)
-{
- jim_set_result_nvp_unknown(interp, param_name, param_value, nvp_table);
-}
-
-typedef struct jim_getopt_info Jim_GetOptInfo __attribute__ ((deprecated));
-typedef struct jim_nvp Jim_Nvp __attribute__ ((deprecated));
-
#endif /* OPENOCD_HELPER_JIM_NVP_H */
--
