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

lib/string_helpers: switch to use BIT() macro 

Patch series "lib/string_helpers: get rid of ugly *_escape_mem_ascii()", v3.

Get rid of ugly *_escape_mem_ascii() API since it's not flexible and has
the only single user.  Provide better approach based on usage of the
string_escape_mem() with appropriate flags.

Test cases has been expanded accordingly to cover new functionality.

This patch (of 15):

Switch to use BIT() macro for flag definitions.  No changes implied.

Link: https://lkml.kernel.org/r/20210504180819.73127-1-andriy.shevchenko@linux.intel.com
Link: https://lkml.kernel.org/r/20210504180819.73127-2-andriy.shevchenko@linux.intel.com


Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Cc: "J. Bruce Fields" <bfields@fieldses.org>
Cc: Chuck Lever <chuck.lever@oracle.com>
Cc: Alexander Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 92aeda50

include/linux/string_helpers.h

+11 −10
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
#ifndef _LINUX_STRING_HELPERS_H_

#define _LINUX_STRING_HELPERS_H_



#include <linux/bits.h>

#include <linux/ctype.h>

#include <linux/types.h>
@@ -18,10 +19,10 @@ enum string_size_units { 
void string_get_size(u64 size, u64 blk_size, enum string_size_units units,

		     char *buf, int len);



#define UNESCAPE_SPACE		0x01

#define UNESCAPE_OCTAL		0x02

#define UNESCAPE_HEX		0x04

#define UNESCAPE_SPECIAL	0x08

#define UNESCAPE_SPACE		BIT(0)

#define UNESCAPE_OCTAL		BIT(1)

#define UNESCAPE_HEX		BIT(2)

#define UNESCAPE_SPECIAL	BIT(3)

#define UNESCAPE_ANY		\

	(UNESCAPE_SPACE | UNESCAPE_OCTAL | UNESCAPE_HEX | UNESCAPE_SPECIAL)
@@ -42,15 +43,15 @@ static inline int string_unescape_any_inplace(char *buf) 
	return string_unescape_any(buf, buf, 0);

}



#define ESCAPE_SPACE		0x01

#define ESCAPE_SPECIAL		0x02

#define ESCAPE_NULL		0x04

#define ESCAPE_OCTAL		0x08

#define ESCAPE_SPACE		BIT(0)

#define ESCAPE_SPECIAL		BIT(1)

#define ESCAPE_NULL		BIT(2)

#define ESCAPE_OCTAL		BIT(3)

#define ESCAPE_ANY		\

	(ESCAPE_SPACE | ESCAPE_OCTAL | ESCAPE_SPECIAL | ESCAPE_NULL)

#define ESCAPE_NP		0x10

#define ESCAPE_NP		BIT(4)

#define ESCAPE_ANY_NP		(ESCAPE_ANY | ESCAPE_NP)

#define ESCAPE_HEX		0x20

#define ESCAPE_HEX		BIT(5)



int string_escape_mem(const char *src, size_t isz, char *dst, size_t osz,

		unsigned int flags, const char *only);