openocd: src/flash: replace the GPL-2.0-or-later license tag

[fw/openocd] / src / flash / common.c

diff --git a/src/flash/common.c b/src/flash/common.c
index 17bc81c2a76c0756ed7cced3e9ae2758a18a4847..dfd6aca80cb5e67cdabe5f651623ef047518127d 100644 (file)
--- a/src/flash/common.c
+++ b/src/flash/common.c
@@ -1,21 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+
 /***************************************************************************
  *   Copyright (C) 2009 by Zachary T Welch <zw@superlucidity.net>          *
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- *   This program is distributed in the hope that it will be useful,       *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
- *   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.             *
  ***************************************************************************/
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
@@ -25,24 +13,24 @@
 
 unsigned get_flash_name_index(const char *name)
 {
-       const char *index = strrchr(name, '.');
-       if (NULL == index)
+       const char *name_index = strrchr(name, '.');
+       if (!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
-       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);
-       // 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';
 }