projects
/
fw
/
openocd
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
flash/stm32l4x: STM32L5 support programming when TZEN=1 and RDP=0xAA
[fw/openocd]
/
src
/
flash
/
common.c
diff --git
a/src/flash/common.c
b/src/flash/common.c
index 253ed9d875b4dfda15bd1df21a2da2b60782b41b..0e7fe13ab1657149d5ad3879689c18c013768098 100644
(file)
--- a/
src/flash/common.c
+++ b/
src/flash/common.c
@@
-12,35
+12,36
@@
* GNU General Public License for more details. *
* *
* You should have received a copy of the GNU General Public License *
* GNU General Public License for more details. *
* *
* You should have received a copy of the GNU General Public License *
- * along with this program; if not, write to the *
- * Free Software Foundation, Inc., *
- * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
+ * along with this program. If not, see <http://www.gnu.org/licenses/>. *
***************************************************************************/
***************************************************************************/
+
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include "common.h"
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include "common.h"
-#include
"log.h"
+#include
<helper/log.h>
unsigned get_flash_name_index(const char *name)
{
unsigned get_flash_name_index(const char *name)
{
- const char *
index = st
rchr(name, '.');
- if (
NULL ==
index)
+ const char *
name_index = str
rchr(name, '.');
+ if (
!name_
index)
return 0;
return 0;
+ if (name_index[1] < '0' || name_index[1] > '9')
+ return ~0U;
unsigned requested;
unsigned requested;
- int retval = parse_uint(index + 1, &requested);
- /
/ detect parsing error by forcing past end of bank list
- return (
ERROR_OK == retval
) ? requested : ~0U;
+ int retval = parse_uint(
name_
index + 1, &requested);
+ /
* detect parsing error by forcing past end of bank list */
+ return (
retval == ERROR_OK
) ? requested : ~0U;
}
bool flash_driver_name_matches(const char *name, const char *expected)
{
unsigned blen = strlen(name);
}
bool flash_driver_name_matches(const char *name, const char *expected)
{
unsigned blen = strlen(name);
- /
/ only match up to the length of the driver name...
+ /
* only match up to the length of the driver name... */
if (strncmp(name, expected, blen) != 0)
return false;
if (strncmp(name, expected, blen) != 0)
return false;
- /
/ ...then check that name terminates at this spot.
+ /
* ...then check that name terminates at this spot. */
return expected[blen] == '.' || expected[blen] == '\0';
}
return expected[blen] == '.' || expected[blen] == '\0';
}