replace buffer2array() with cstrtok() from mpd-ke

This modifies the string in place, and does not allocate any memory from
the heap.  This is considerably smaller than the function it replaces,
and will be instrumental in getting the commands/conf malloc reductions
done.

git-svn-id: https://svn.musicpd.org/mpd/trunk@4481 09075e82-0dd4-0310-85a5-a0d7c8717e4f

1 files changed, 7 insertions, 3 deletions

diff --git a/src/buffer2array.h b/src/buffer2array.h
index fa6882fd9..cecd3b6d3 100644
--- a/src/buffer2array.h
+++ b/src/buffer2array.h
@@ -21,8 +21,12 @@
 
 #include "../config.h"
 
-int buffer2array(char *buffer, char ***array);
-
-void freeArgArray(char **array, int argArrayLength);
+/* tokenizes up to max elements in buffer (a null-terminated string) and
+ * stores the result in array (which must be capable of holding up to
+ * max elements).  Tokenization is based on C string quoting rules.
+ * The arguments buffer and array are modified.
+ * Returns the number of elements tokenized.
+ */
+int cstrtok(char *buffer, char *array[], const int max);
 
 #endif