Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d295634e authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Linus Torvalds
Browse files

lib / string_helpers: move documentation to c-file 



The introduced function string_escape_mem() is a kind of opposite to
string_unescape.  We have several users of such functionality each of
them created custom implementation.  The series contains clean up of
test suite, adding new call, and switching few users to use it via %*pE
specifier.

Test suite covers all of existing and most of potential use cases.

This patch (of 11):

The documentation of API belongs to c-file.  This patch moves it
accordingly.

There is no functional change.

Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Cc: "John W . Linville" <linville@tuxdriver.com>
Cc: Johannes Berg <johannes@sipsolutions.net>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Joe Perches <joe@perches.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 3db2e9cd

include/linux/string_helpers.h

+0 −34
Original line number Diff line number Diff line
@@ -20,40 +20,6 @@ int string_get_size(u64 size, enum string_size_units units, 
#define UNESCAPE_ANY		\

	(UNESCAPE_SPACE | UNESCAPE_OCTAL | UNESCAPE_HEX | UNESCAPE_SPECIAL)



/**

 * string_unescape - unquote characters in the given string

 * @src:	source buffer (escaped)

 * @dst:	destination buffer (unescaped)

 * @size:	size of the destination buffer (0 to unlimit)

 * @flags:	combination of the flags (bitwise OR):

 *	%UNESCAPE_SPACE:

 *		'\f' - form feed

 *		'\n' - new line

 *		'\r' - carriage return

 *		'\t' - horizontal tab

 *		'\v' - vertical tab

 *	%UNESCAPE_OCTAL:

 *		'\NNN' - byte with octal value NNN (1 to 3 digits)

 *	%UNESCAPE_HEX:

 *		'\xHH' - byte with hexadecimal value HH (1 to 2 digits)

 *	%UNESCAPE_SPECIAL:

 *		'\"' - double quote

 *		'\\' - backslash

 *		'\a' - alert (BEL)

 *		'\e' - escape

 *	%UNESCAPE_ANY:

 *		all previous together

 *

 * Returns amount of characters processed to the destination buffer excluding

 * trailing '\0'.

 *

 * Because the size of the output will be the same as or less than the size of

 * the input, the transformation may be performed in place.

 *

 * Caller must provide valid source and destination pointers. Be aware that

 * destination buffer will always be NULL-terminated. Source string must be

 * NULL-terminated as well.

 */

int string_unescape(char *src, char *dst, size_t size, unsigned int flags);



static inline int string_unescape_inplace(char *buf, unsigned int flags)

lib/string_helpers.c

+38 −0
Original line number Diff line number Diff line
@@ -168,6 +168,44 @@ static bool unescape_special(char **src, char **dst) 
	return true;

}



/**

 * string_unescape - unquote characters in the given string

 * @src:	source buffer (escaped)

 * @dst:	destination buffer (unescaped)

 * @size:	size of the destination buffer (0 to unlimit)

 * @flags:	combination of the flags (bitwise OR):

 *	%UNESCAPE_SPACE:

 *		'\f' - form feed

 *		'\n' - new line

 *		'\r' - carriage return

 *		'\t' - horizontal tab

 *		'\v' - vertical tab

 *	%UNESCAPE_OCTAL:

 *		'\NNN' - byte with octal value NNN (1 to 3 digits)

 *	%UNESCAPE_HEX:

 *		'\xHH' - byte with hexadecimal value HH (1 to 2 digits)

 *	%UNESCAPE_SPECIAL:

 *		'\"' - double quote

 *		'\\' - backslash

 *		'\a' - alert (BEL)

 *		'\e' - escape

 *	%UNESCAPE_ANY:

 *		all previous together

 *

 * Description:

 * The function unquotes characters in the given string.

 *

 * Because the size of the output will be the same as or less than the size of

 * the input, the transformation may be performed in place.

 *

 * Caller must provide valid source and destination pointers. Be aware that

 * destination buffer will always be NULL-terminated. Source string must be

 * NULL-terminated as well.

 *

 * Return:

 * The amount of the characters processed to the destination buffer excluding

 * trailing '\0' is returned.

 */

int string_unescape(char *src, char *dst, size_t size, unsigned int flags)

{

	char *out = dst;