diff options
author | Tim Newsome <tim@sifive.com> | 2023-12-22 09:08:06 -0800 |
---|---|---|
committer | Tim Newsome <tim@sifive.com> | 2023-12-22 09:08:06 -0800 |
commit | e4a0658dffafb4b26249ec4bef1faefdf0cd22f2 (patch) | |
tree | 85b702f223d6af9049374f4f413bd5fe86abb36d /src/helper | |
parent | 62758f20871f2de7df4a62aff7e987acb92b4d58 (diff) | |
parent | 16e9b9c44fa62ea6eec99d1fb7bc43a8f1cc2f7e (diff) | |
download | riscv-openocd-e4a0658dffafb4b26249ec4bef1faefdf0cd22f2.zip riscv-openocd-e4a0658dffafb4b26249ec4bef1faefdf0cd22f2.tar.gz riscv-openocd-e4a0658dffafb4b26249ec4bef1faefdf0cd22f2.tar.bz2 |
Merge commit '16e9b9c44fa62ea6eec99d1fb7bc43a8f1cc2f7e' into from_upstream
Conflicts:
configure.ac
tcl/target/gd32vf103.cfg
Change-Id: I72bbb973249b7bbfa720696fa2c76a87a41a2e9c
Diffstat (limited to 'src/helper')
-rw-r--r-- | src/helper/nvp.c | 2 | ||||
-rw-r--r-- | src/helper/nvp.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/helper/nvp.c b/src/helper/nvp.c index 7a8abc2..a938716 100644 --- a/src/helper/nvp.c +++ b/src/helper/nvp.c @@ -14,7 +14,7 @@ * Copyright 2009 David Brownell * Copyright (c) 2005-2011 Jim Tcl Project. All rights reserved. * - * This file is extracted from jim_nvp.c, originally part of jim TCL code. + * This file is extracted from jim-nvp.c, originally part of jim TCL code. */ #ifdef HAVE_CONFIG_H diff --git a/src/helper/nvp.h b/src/helper/nvp.h index 14bd9b0..1f4e3d1 100644 --- a/src/helper/nvp.h +++ b/src/helper/nvp.h @@ -14,7 +14,7 @@ * Copyright 2009 David Brownell * Copyright (c) 2005-2011 Jim Tcl Project. All rights reserved. * - * This file is extracted from jim_nvp.h, originally part of jim TCL code. + * This file is extracted from jim-nvp.h, originally part of jim TCL code. */ #ifndef OPENOCD_HELPER_NVP_H @@ -51,7 +51,7 @@ * returns &yn[0]; * result = nvp_name2value(yn, "no"); * returns &yn[1]; - * result = jim_nvp_name2value(yn, "Blah"); + * result = nvp_name2value(yn, "Blah"); * returns &yn[4]; * \endcode * |