projects
/
fw
/
openocd
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
jtag/tcl: fix memory leak in error return
[fw/openocd]
/
src
/
flash
/
common.c
diff --git
a/src/flash/common.c
b/src/flash/common.c
index 072e6912fd45079dff8ca4d76270fd9993233991..3e2551192f379efe6431dfb377275c8020fc930e 100644
(file)
--- a/
src/flash/common.c
+++ b/
src/flash/common.c
@@
-12,37
+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 = strrchr(name, '.');
- if (NULL == index)
+ const char *
name_
index = strrchr(name, '.');
+ if (NULL ==
name_
index)
return 0;
return 0;
- if (
index[1] < '0' ||
index[1] > '9')
+ if (
name_index[1] < '0' || name_
index[1] > '9')
return ~0U;
unsigned requested;
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);
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;
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';
}