Merge branch 'master' into cc/help

[git.git] / quote.h

diff --git a/quote.h b/quote.h
index 2769f71c931aafde664c82ca10d805a5d3f6451a..ab7596f57b7f23899ef1bbb8d0c7ba6ec5baf12f 100644 (file)
--- a/quote.h
+++ b/quote.h
@@ -29,13 +29,9 @@
  */
 
 extern void sq_quote_print(FILE *stream, const char *src);
-extern char *sq_quote_argv(const char** argv, int count);
 
-/*
- * Append a string to a string buffer, with or without shell quoting.
- * Return true if the buffer overflowed.
- */
-extern int add_to_string(char **ptrp, int *sizep, const char *str, int quote);
+extern void sq_quote_buf(struct strbuf *, const char *src);
+extern void sq_quote_argv(struct strbuf *, const char **argv, size_t maxlen);
 
 /* This unwraps what sq_quote() produces in place, but returns
  * NULL if the input does not look like what sq_quote would have