X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Fflash%2Fcommon.c;h=b781cc1ae370c01f43a4f591adbbc41d35a62cc1;hb=f97a1594119f90f63526e1fa8a95dbcba0acd192;hp=17bc81c2a76c0756ed7cced3e9ae2758a18a4847;hpb=c79cca04bed78839a18e73f3996805eb8001a812;p=openocd.git diff --git a/src/flash/common.c b/src/flash/common.c index 17bc81c2a7..b781cc1ae3 100644 --- a/src/flash/common.c +++ b/src/flash/common.c @@ -16,6 +16,7 @@ * Free Software Foundation, Inc., * * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ + #ifdef HAVE_CONFIG_H #include "config.h" #endif @@ -25,24 +26,24 @@ unsigned get_flash_name_index(const char *name) { - const char *index = strrchr(name, '.'); - if (NULL == index) + const char *name_index = strrchr(name, '.'); + if (NULL == name_index) return 0; - if (index[1] < '0' || index[1] > '9') + 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'; }