From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
To: "J. Bruce Fields" <bfields@redhat.com>,
Andy Shevchenko <andriy.shevchenko@linux.intel.com>,
linux-kernel@vger.kernel.org, linux-nfs@vger.kernel.org,
linux-fsdevel@vger.kernel.org
Cc: "J. Bruce Fields" <bfields@fieldses.org>,
Chuck Lever <chuck.lever@oracle.com>,
Alexander Viro <viro@zeniv.linux.org.uk>,
Andy Shevchenko <andy@kernel.org>,
Andrew Morton <akpm@linux-foundation.org>
Subject: [PATCH v3 01/15] lib/string_helpers: Switch to use BIT() macro
Date: Tue, 4 May 2021 21:08:05 +0300 [thread overview]
Message-ID: <20210504180819.73127-2-andriy.shevchenko@linux.intel.com> (raw)
In-Reply-To: <20210504180819.73127-1-andriy.shevchenko@linux.intel.com>
Switch to use BIT() macro for flag definitions. No changes implied.
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
include/linux/string_helpers.h | 21 +++++++++++----------
1 file changed, 11 insertions(+), 10 deletions(-)
diff --git a/include/linux/string_helpers.h b/include/linux/string_helpers.h
index fa06dcdc481e..bf01e24edd89 100644
--- a/include/linux/string_helpers.h
+++ b/include/linux/string_helpers.h
@@ -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);
--
2.30.2
next prev parent reply other threads:[~2021-05-04 18:08 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-04 18:08 [PATCH v3 00/15] lib/string_helpers: get rid of ugly *_escape_mem_ascii() Andy Shevchenko
2021-05-04 18:08 ` Andy Shevchenko [this message]
2021-05-04 18:08 ` [PATCH v3 02/15] lib/string_helpers: Move ESCAPE_NP check inside 'else' branch in a loop Andy Shevchenko
2021-05-04 18:08 ` [PATCH v3 03/15] lib/string_helpers: Drop indentation level in string_escape_mem() Andy Shevchenko
2021-05-04 18:08 ` [PATCH v3 04/15] lib/string_helpers: Introduce ESCAPE_NA for escaping non-ASCII Andy Shevchenko
2021-05-04 18:08 ` [PATCH v3 05/15] lib/string_helpers: Introduce ESCAPE_NAP to escape non-ASCII and non-printable Andy Shevchenko
2021-05-04 18:08 ` [PATCH v3 06/15] lib/string_helpers: Allow to append additional characters to be escaped Andy Shevchenko
2021-05-04 18:08 ` [PATCH v3 07/15] lib/test-string_helpers: Print flags in hexadecimal format Andy Shevchenko
2021-05-04 18:08 ` [PATCH v3 08/15] lib/test-string_helpers: Get rid of trailing comma in terminators Andy Shevchenko
2021-05-04 18:08 ` [PATCH v3 09/15] lib/test-string_helpers: Add test cases for new features Andy Shevchenko
2021-05-04 18:08 ` [PATCH v3 10/15] MAINTAINERS: Add myself as designated reviewer for generic string library Andy Shevchenko
2021-05-12 6:20 ` Joe Perches
2021-05-04 18:08 ` [PATCH v3 11/15] seq_file: Introduce seq_escape_mem() Andy Shevchenko
2021-05-04 18:08 ` [PATCH v3 12/15] seq_file: Add seq_escape_str() as replica of string_escape_str() Andy Shevchenko
2021-05-04 18:08 ` [PATCH v3 13/15] seq_file: Convert seq_escape() to use seq_escape_str() Andy Shevchenko
2021-05-04 18:08 ` [PATCH v3 14/15] nfsd: Avoid non-flexible API in seq_quote_mem() Andy Shevchenko
2021-05-04 18:08 ` [PATCH v3 15/15] seq_file: Drop unused *_escape_mem_ascii() Andy Shevchenko
2021-05-11 18:57 ` [PATCH v3 00/15] lib/string_helpers: get rid of ugly *_escape_mem_ascii() J. Bruce Fields
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210504180819.73127-2-andriy.shevchenko@linux.intel.com \
--to=andriy.shevchenko@linux.intel.com \
--cc=akpm@linux-foundation.org \
--cc=andy@kernel.org \
--cc=bfields@fieldses.org \
--cc=bfields@redhat.com \
--cc=chuck.lever@oracle.com \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-nfs@vger.kernel.org \
--cc=viro@zeniv.linux.org.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.