From bc8f6e81a4d737625e05e5e268d0d682489873d5 Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Wed, 28 Jan 2015 20:31:28 +0100 Subject: move data_to_string_alloc to GNUnet --- src/util/json.c | 3 ++- src/util/util.c | 30 ------------------------------ 2 files changed, 2 insertions(+), 31 deletions(-) (limited to 'src/util') diff --git a/src/util/json.c b/src/util/json.c index 120e1be5c..fecf0c5af 100644 --- a/src/util/json.c +++ b/src/util/json.c @@ -133,7 +133,8 @@ TALER_JSON_from_data (const void *data, size_t size) { char *buf; json_t *json; - buf = TALER_data_to_string_alloc (data, size); + + buf = GNUNET_STRINGS_data_to_string_alloc (data, size); json = json_string (buf); GNUNET_free (buf); return json; diff --git a/src/util/util.c b/src/util/util.c index de085d088..b09f4dbdd 100644 --- a/src/util/util.c +++ b/src/util/util.c @@ -28,36 +28,6 @@ #include #include -/** - * Return the base32crockford encoding of the given buffer. - * - * The returned string will be freshly allocated, and must be free'd - * with GNUNET_free(). - * - * @param buffer with data - * @param size size of the buffer - * @return freshly allocated, null-terminated string - */ -char * -TALER_data_to_string_alloc (const void *buf, size_t size) -{ - char *str_buf; - size_t len = size * 8; - char *end; - - if (len % 5 > 0) - len += 5 - len % 5; - len /= 5; - str_buf = GNUNET_malloc (len + 1); - end = GNUNET_STRINGS_data_to_string (buf, size, str_buf, len); - if (NULL == end) - { - GNUNET_free (str_buf); - return NULL; - } - *end = '\0'; - return str_buf; -} /** -- cgit v1.2.3