The patch titled
Subject: lib/string_helpers: drop indentation level in string_escape_mem()
has been removed from the -mm tree. Its filename was
lib-string_helpers-drop-indentation-level-in-string_escape_mem.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: Andy Shevchenko <andriy.shevchenko@xxxxxxxxxxxxxxx>
Subject: lib/string_helpers: drop indentation level in string_escape_mem()
The only one conditional is left on the upper level, move the rest to the
same level and drop indentation level. No functional changes.
Link: https://lkml.kernel.org/r/20210504180819.73127-4-andriy.shevchenko@xxxxxxxxxxxxxxx
Signed-off-by: Andy Shevchenko <andriy.shevchenko@xxxxxxxxxxxxxxx>
Cc: Alexander Viro <viro@xxxxxxxxxxxxxxxxxx>
Cc: Chuck Lever <chuck.lever@xxxxxxxxxx>
Cc: "J. Bruce Fields" <bfields@xxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
lib/string_helpers.c | 46 ++++++++++++++++++++---------------------
1 file changed, 23 insertions(+), 23 deletions(-)
--- a/lib/string_helpers.c~lib-string_helpers-drop-indentation-level-in-string_escape_mem
+++ a/lib/string_helpers.c
@@ -515,29 +515,29 @@ int string_escape_mem(const char *src, s
* In these cases we just pass through a character to the
* output buffer.
*/
- if (is_dict && !strchr(only, c)) {
- /* do nothing */
- } else {
- if (isprint(c) &&
- flags & ESCAPE_NP && escape_passthrough(c, &p, end))
- continue;
-
- if (flags & ESCAPE_SPACE && escape_space(c, &p, end))
- continue;
-
- if (flags & ESCAPE_SPECIAL && escape_special(c, &p, end))
- continue;
-
- if (flags & ESCAPE_NULL && escape_null(c, &p, end))
- continue;
-
- /* ESCAPE_OCTAL and ESCAPE_HEX always go last */
- if (flags & ESCAPE_OCTAL && escape_octal(c, &p, end))
- continue;
-
- if (flags & ESCAPE_HEX && escape_hex(c, &p, end))
- continue;
- }
+ if (is_dict && !strchr(only, c) &&
+ escape_passthrough(c, &p, end))
+ continue;
+
+ if (isprint(c) &&
+ flags & ESCAPE_NP && escape_passthrough(c, &p, end))
+ continue;
+
+ if (flags & ESCAPE_SPACE && escape_space(c, &p, end))
+ continue;
+
+ if (flags & ESCAPE_SPECIAL && escape_special(c, &p, end))
+ continue;
+
+ if (flags & ESCAPE_NULL && escape_null(c, &p, end))
+ continue;
+
+ /* ESCAPE_OCTAL and ESCAPE_HEX always go last */
+ if (flags & ESCAPE_OCTAL && escape_octal(c, &p, end))
+ continue;
+
+ if (flags & ESCAPE_HEX && escape_hex(c, &p, end))
+ continue;
escape_passthrough(c, &p, end);
}
_
Patches currently in -mm which might be from andriy.shevchenko@xxxxxxxxxxxxxxx are
