Split utils header into string functions and everything else

split out the string handling API from the rest of the utils header
and fix up all the fallout.

1 files changed, 0 insertions, 85 deletions

diff --git a/utils/utils.h b/utils/utils.h
index a4362069f..d4bad9d0c 100644
--- a/utils/utils.h
+++ b/utils/utils.h
@@ -28,10 +28,6 @@
 
 #include <inttypes.h>
 #include <stdbool.h>
-#include <stdlib.h>
-#include <stdarg.h>
-
-#include "utils/errors.h"
 
 /** Rectangle coordinates */
 struct rect {
@@ -115,91 +111,10 @@ struct dirent;
 
 
 /**
- * Replace consecutive whitespace with a single space.
- *
- * @todo determine if squash_whitespace utf-8 safe and that it needs to be
- *
- * \param  s  source string
- * \return  heap allocated result, or NULL on memory exhaustion
- */
-char * squash_whitespace(const char * s);
-
-/**
- * Converts NUL terminated UTF-8 encoded string s containing zero or more
- * spaces (char 32) or TABs (char 9) to non-breaking spaces
- * (0xC2 + 0xA0 in UTF-8 encoding).
- *
- * Caller needs to free() result.  Returns NULL in case of error.  No
- * checking is done on validness of the UTF-8 input string.
- */
-char *cnv_space2nbsp(const char *s);
-
-/**
  * Check if a directory exists.
  */
 bool is_dir(const char *path);
 
-/**
- * Create a human redable representation of a size in bytes.
- *
- * Does a simple conversion which assumes the user speaks English.
- * The buffer returned is one of three static ones so may change each
- * time this call is made.  Don't store the buffer for later use.
- * It's done this way for convenience and to fight possible memory
- * leaks, it is not necessarily pretty.
- *
- * @todo This implementation is strange doe sit need
- * reconsidering?
- *
- * @param bytesize The size in bytes.
- * @return A human readable string representing the size.
- */
-char *human_friendly_bytesize(unsigned long bytesize);
-
-
-/**
- * Generate a string from one or more component elemnts separated with
- * a single value.
- *
- * This is similar in intent to the perl join function creating a
- * single delimited string from an array of several.
- *
- * @note If a string is allocated it must be freed by the caller.
- *
- * @param[in,out] str pointer to string pointer if this is NULL enough
- *                    storage will be allocated for the complete path.
- * @param[in,out] size The size of the space available if \a str not
- *                     NULL on input and if not NULL set to the total
- *                     output length on output.
- * @param[in] sep The character to separete the elemnts with.
- * @param[in] nelm The number of elements up to a maximum of 16.
- * @param[in] ap The elements of the path as string pointers.
- * @return NSERROR_OK and the complete path is written to str or error
- *         code on faliure.
- */
-nserror vsnstrjoin(char **str, size_t *size, char sep, size_t nelm, va_list ap);
-
-/**
- * Generate a string from one or more component elemnts separated with
- * a single value.
- *
- * This is similar in intent to the perl join function creating a
- * single delimited string from an array of several.
- *
- * @note If a string is allocated it must be freed by the caller.
- *
- * @param[in,out] str pointer to string pointer if this is NULL enough
- *                    storage will be allocated for the complete path.
- * @param[in,out] size The size of the space available if \a str not
- *                     NULL on input and if not NULL set to the total
- *                     output length on output.
- * @param[in] sep The character to separete the elemnts with.
- * @param[in] nelm The number of elements up to a maximum of 16.
- * @param[in] ... The elements of the path as string pointers.
- * @return NSERROR_OK and the complete path is written to str or error
- *         code on faliure.
- */
-nserror snstrjoin(char **str, size_t *size, char sep, size_t nelm, ...);
 
 /* Platform specific functions */
 void warn_user(const char *warning, const char *detail);