X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Fflash%2Fcommon.c;h=3e2551192f379efe6431dfb377275c8020fc930e;hb=b2dbaf9e1569ddc75f461b0b378f6614ecb7a45d;hp=253ed9d875b4dfda15bd1df21a2da2b60782b41b;hpb=870b8c04557f0b7441cc502debaf537984d77e2a;p=openocd.git
diff --git a/src/flash/common.c b/src/flash/common.c
index 253ed9d875..3e2551192f 100644
--- 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 *
- * 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 . *
***************************************************************************/
+
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include "common.h"
-#include "log.h"
+#include
unsigned get_flash_name_index(const char *name)
{
- const char *index = strchr(name, '.');
- if (NULL == index)
+ const char *name_index = strrchr(name, '.');
+ if (NULL == name_index)
return 0;
+ if (name_index[1] < '0' || name_index[1] > '9')
+ return ~0U;
unsigned requested;
- int retval = parse_uint(index + 1, &requested);
- // detect parsing error by forcing past end of bank list
+ int retval = parse_uint(name_index + 1, &requested);
+ /* detect parsing error by forcing past end of bank list */
return (ERROR_OK == retval) ? requested : ~0U;
}
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;
- // ...then check that name terminates at this spot.
+ /* ...then check that name terminates at this spot. */
return expected[blen] == '.' || expected[blen] == '\0';
}