X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Fhelper%2Fbinarybuffer.c;h=5f38b43ae1957f8142d6a41f3cfbce9face47c52;hb=HEAD;hp=76f657f8df8eb9b88758ff80b29b6370ee092e12;hpb=69ff7354d9c9accf09374772310098f1f00e8ccb;p=openocd.git

diff --git a/src/helper/binarybuffer.c b/src/helper/binarybuffer.c
index 76f657f8df..5f38b43ae1 100644
--- a/src/helper/binarybuffer.c
+++ b/src/helper/binarybuffer.c
@@ -1,28 +1,18 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+
 /***************************************************************************
  *   Copyright (C) 2004, 2005 by Dominic Rath                              *
  *   Dominic.Rath@gmx.de                                                   *
  *                                                                         *
  *   Copyright (C) 2007,2008 Øyvind Harboe                                 *
  *   oyvind.harboe@zylin.com                                               *
- *                                                                         *
- *   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, see <http://www.gnu.org/licenses/>. *
  ***************************************************************************/
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
+#include "helper/replacements.h"
 #include "log.h"
 #include "binarybuffer.h"
 
@@ -52,7 +42,7 @@ static const char hex_digits[] = {
 
 void *buf_cpy(const void *from, void *_to, unsigned size)
 {
-	if (NULL == from || NULL == _to)
+	if (!from || !_to)
 		return NULL;
 
 	/* copy entire buffer */
@@ -199,45 +189,20 @@ static int ceil_f_to_u32(float x)
 	return y;
 }
 
-char *buf_to_str(const void *_buf, unsigned buf_len, unsigned radix)
+char *buf_to_hex_str(const void *_buf, unsigned buf_len)
 {
-	float factor;
-	switch (radix) {
-		case 16:
-			factor = 2.0;	/* log(256) / log(16) = 2.0 */
-			break;
-		case 10:
-			factor = 2.40824;	/* log(256) / log(10) = 2.40824 */
-			break;
-		case 8:
-			factor = 2.66667;	/* log(256) / log(8) = 2.66667 */
-			break;
-		default:
-			return NULL;
-	}
-
-	unsigned str_len = ceil_f_to_u32(DIV_ROUND_UP(buf_len, 8) * factor);
-	char *str = calloc(str_len + 1, 1);
+	unsigned len_bytes = DIV_ROUND_UP(buf_len, 8);
+	char *str = calloc(len_bytes * 2 + 1, 1);
 
 	const uint8_t *buf = _buf;
-	int b256_len = DIV_ROUND_UP(buf_len, 8);
-	for (int i = b256_len - 1; i >= 0; i--) {
-		uint32_t tmp = buf[i];
-		if (((unsigned)i == (buf_len / 8)) && (buf_len % 8))
+	for (unsigned i = 0; i < len_bytes; i++) {
+		uint8_t tmp = buf[len_bytes - i - 1];
+		if ((i == 0) && (buf_len % 8))
 			tmp &= (0xff >> (8 - (buf_len % 8)));
-
-		/* base-256 digits */
-		for (unsigned j = str_len; j > 0; j--) {
-			tmp += (uint32_t)str[j-1] * 256;
-			str[j-1] = (uint8_t)(tmp % radix);
-			tmp /= radix;
-		}
+		str[2 * i] = hex_digits[tmp >> 4];
+		str[2 * i + 1] = hex_digits[tmp & 0xf];
 	}
 
-	const char * const DIGITS = "0123456789ABCDEF";
-	for (unsigned j = 0; j < str_len; j++)
-		str[j] = DIGITS[(int)str[j]];
-
 	return str;
 }
 
@@ -246,7 +211,7 @@ static void str_radix_guess(const char **_str, unsigned *_str_len,
 	unsigned *_radix)
 {
 	unsigned radix = *_radix;
-	if (0 != radix)
+	if (radix != 0)
 		return;
 	const char *str = *_str;
 	unsigned str_len = *_str_len;