diff options
Diffstat (limited to 'include/linux/string_helpers.h')
| -rw-r--r-- | include/linux/string_helpers.h | 10 | 
1 files changed, 5 insertions, 5 deletions
diff --git a/include/linux/string_helpers.h b/include/linux/string_helpers.h index 657571817260..71f711db4500 100644 --- a/include/linux/string_helpers.h +++ b/include/linux/string_helpers.h @@ -10,7 +10,7 @@ enum string_size_units {  	STRING_UNITS_2,		/* use binary powers of 2^10 */  }; -void string_get_size(u64 size, enum string_size_units units, +void string_get_size(u64 size, u64 blk_size, enum string_size_units units,  		     char *buf, int len);  #define UNESCAPE_SPACE		0x01 @@ -47,22 +47,22 @@ static inline int string_unescape_any_inplace(char *buf)  #define ESCAPE_ANY_NP		(ESCAPE_ANY | ESCAPE_NP)  #define ESCAPE_HEX		0x20 -int string_escape_mem(const char *src, size_t isz, char **dst, size_t osz, +int string_escape_mem(const char *src, size_t isz, char *dst, size_t osz,  		unsigned int flags, const char *esc);  static inline int string_escape_mem_any_np(const char *src, size_t isz, -		char **dst, size_t osz, const char *esc) +		char *dst, size_t osz, const char *esc)  {  	return string_escape_mem(src, isz, dst, osz, ESCAPE_ANY_NP, esc);  } -static inline int string_escape_str(const char *src, char **dst, size_t sz, +static inline int string_escape_str(const char *src, char *dst, size_t sz,  		unsigned int flags, const char *esc)  {  	return string_escape_mem(src, strlen(src), dst, sz, flags, esc);  } -static inline int string_escape_str_any_np(const char *src, char **dst, +static inline int string_escape_str_any_np(const char *src, char *dst,  		size_t sz, const char *esc)  {  	return string_escape_str(src, dst, sz, ESCAPE_ANY_NP, esc);  |