Skip to content

lib/string_helpers: get rid of ugly *_escape_mem_ascii()

Andy Shevchenko linux-fsdevel linux-nfs lkml 3 versions – Applied

Status from this message: [merged] seq_file-drop-unused-_escape_mem_ascii.patch removed from -mm tree

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v3 Latest15 patches 2 repliesApplied 15/15
  2. v214 patches 2 repliesSuperseded
  3. v112 patches 5 repliesSuperseded

Changes in v3 from the cover letter

- dropped moving seq_escape() to the header due to a lot of complaints from the (very) old code
- added seq_escape_str() inliner
- converted seq_escape() to use seq_escape_str() instead of seq_escape_mem()

Patches in v3 All 15 applied

#Subject and filesSizeRepliesApplied
1/15lib/string_helpers: Switch to use BIT() macroinclude/linux/string_helpers.h+11 -100 repliesApplied
2/15lib/string_helpers: Move ESCAPE_NP check inside 'else' branch in a looplib/string_helpers.c+10 -70 repliesApplied
3/15lib/string_helpers: Drop indentation level in string_escape_mem()lib/string_helpers.c+18 -180 repliesApplied
4/15lib/string_helpers: Introduce ESCAPE_NA for escaping non-ASCIIinclude/linux/string_helpers.h lib/string_helpers.c+18 -40 repliesApplied
5/15lib/string_helpers: Introduce ESCAPE_NAP to escape non-ASCII and non-printableinclude/linux/string_helpers.h lib/string_helpers.c+17 -40 repliesApplied
6/15lib/string_helpers: Allow to append additional characters to be escapedinclude/linux/string_helpers.h lib/string_helpers.c+16 -40 repliesApplied
7/15lib/test-string_helpers: Print flags in hexadecimal formatlib/test-string_helpers.c+2 -20 repliesApplied
8/15lib/test-string_helpers: Get rid of trailing comma in terminatorslib/test-string_helpers.c+6 -60 repliesApplied
9/15lib/test-string_helpers: Add test cases for new featuresinclude/linux/string_helpers.h lib/test-string_helpers.c+137 -80 repliesApplied
10/15MAINTAINERS: Add myself as designated reviewer for generic string libraryMAINTAINERS+8 -01 replyApplied
11/15seq_file: Introduce seq_escape_mem()fs/seq_file.c include/linux/seq_file.h+27 -00 repliesApplied
12/15seq_file: Add seq_escape_str() as replica of string_escape_str()include/linux/seq_file.h+7 -00 repliesApplied
13/15seq_file: Convert seq_escape() to use seq_escape_str()fs/seq_file.c+1 -60 repliesApplied
14/15nfsd: Avoid non-flexible API in seq_quote_mem()fs/nfsd/nfs4state.c+1 -10 repliesApplied
15/15seq_file: Drop unused *_escape_mem_ascii()fs/seq_file.c include/linux/seq_file.h include/linux/string_helpers.h +1 more+0 -340 repliesApplied

Reviews trailers per patch

No Reviewed-by, Acked-by or Tested-by trailers for v3 yet.

Read the v3 thread

Cover letter [PATCH v3 00/15] lib/string_helpers: get rid of ugly *_escape_mem_ascii()

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 is assumed to go either thru VFS or Andrew's tree. I don't expect too many changes in string_helpers.

Changelog v3:
- dropped moving seq_escape() to the header due to a lot of complaints from the (very) old code
- added seq_escape_str() inliner
- converted seq_escape() to use seq_escape_str() instead of seq_escape_mem()

Changelog v2:
- introduced seq_escape_mem() instead of poking seq_get_buf() (Al)
- to keep balance of seq_get_buf() usage, convert seq_escape() to use above
- added missed ESCAPE_APPEND flag in NFSv4 patch
- moved indentation patch closer to the beginning of the series
- reshuffled series to be in two groups: generic library extension followed by seq_file updates

Andy Shevchenko (15):
lib/string_helpers: Switch to use BIT() macro lib/string_helpers: Move ESCAPE_NP check inside 'else' branch in a
loop
lib/string_helpers: Drop indentation level in string_escape_mem() lib/string_helpers: Introduce ESCAPE_NA for escaping non-ASCII lib/string_helpers: Introduce ESCAPE_NAP to escape non-ASCII and
non-printable
lib/string_helpers: Allow to append additional characters to be
escaped
lib/test-string_helpers: Print flags in hexadecimal format lib/test-string_helpers: Get rid of trailing comma in terminators lib/test-string_helpers: Add test cases for new features
MAINTAINERS: Add myself as designated reviewer for generic string
library
seq_file: Introduce seq_escape_mem()
seq_file: Add seq_escape_str() as replica of string_escape_str()
seq_file: Convert seq_escape() to use seq_escape_str()
nfsd: Avoid non-flexible API in seq_quote_mem()
seq_file: Drop unused *_escape_mem_ascii()

 MAINTAINERS                    |   8 ++
 fs/nfsd/nfs4state.c            |   2 +-
 fs/seq_file.c                  |  43 +++++----
 include/linux/seq_file.h       |  10 ++-
 include/linux/string_helpers.h |  31 ++++---
 lib/string_helpers.c           | 102 ++++++++++++---------
 lib/test-string_helpers.c      | 157 +++++++++++++++++++++++++++++----
 7 files changed, 264 insertions(+), 89 deletions(-)
Signature · 1 line
2.30.2