Refactor strings.c to remove calls to STRLEN() #18617
Closed
+22
−29
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
There was a problem hiding this comment.
Pull Request Overview
This PR refactors several functions in strings.c to eliminate redundant calls to STRLEN(), improving code efficiency and readability by:
- Computing string lengths once and reusing the values
- Returning computed lengths from functions to avoid recalculation
- Using more appropriate string functions that accept explicit lengths
Key Changes
- Modified
copy_first_char_to_tv()to return the computed string length instead of a status code, eliminating redundantSTRLEN()calls instring_filter_map()andstring_reduce() - Hoisted
STRLEN(needle)out of loops instring_count()to avoid repeated calculations - Replaced
vim_strsave()withvim_strnsave()where length is already known
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
zeertzjq
reviewed
Oct 27, 2025
chrisbra
reviewed
Oct 27, 2025
src/strings.c
Outdated
| if (p == NULL || needle == NULL || *needle == NUL) | ||
| return 0; | ||
|
|
||
| needlelen = STRLEN(needle); |
There was a problem hiding this comment.
Suggested change
| needlelen = STRLEN(needle); | |
| size_t needlelen = STRLEN(needle); |
and remove the definition in line 883 then.
zeertzjq
added a commit
to zeertzjq/neovim
that referenced
this pull request
Oct 30, 2025
Problem: string handling in strings.c can be improved
Solution: Refactor strings.c and remove calls to STRLEN()
(John Marriott)
This change does:
- In vim_strsave_shellescape() a small cosmetic change.
- In string_count() move the call to STRLEN() outside the while loop.
- In blob_from_string() refactor to remove call to STRLEN().
- In string_from_blob() call vim_strnsave() instead of vim_strsave().
- In vim_snprintf_safelen() call vim_vsnprintf_typval() directly instead
of vim_vsnprintf() which then calls vim_vsnprintf_typval().
- In copy_first_char_to_tv() change to return -1 on failure or the length
of resulting v_string. Change string_filter_map() and string_reduce() to
use the return value of copy_first_char_to_tv().
closes: vim/vim#18617
vim/vim@110656b
Co-authored-by: John Marriott <basilisk@internode.on.net>
zeertzjq
added a commit
to zeertzjq/neovim
that referenced
this pull request
Oct 30, 2025
Problem: string handling in strings.c can be improved
Solution: Refactor strings.c and remove calls to STRLEN()
(John Marriott)
This change does:
- In vim_strsave_shellescape() a small cosmetic change.
- In string_count() move the call to STRLEN() outside the while loop.
- In blob_from_string() refactor to remove call to STRLEN().
- In string_from_blob() call vim_strnsave() instead of vim_strsave().
- In vim_snprintf_safelen() call vim_vsnprintf_typval() directly instead
of vim_vsnprintf() which then calls vim_vsnprintf_typval().
- In copy_first_char_to_tv() change to return -1 on failure or the length
of resulting v_string. Change string_filter_map() and string_reduce() to
use the return value of copy_first_char_to_tv().
closes: vim/vim#18617
vim/vim@110656b
Co-authored-by: John Marriott <basilisk@internode.on.net>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR does some same refactoring of functions in strings.c to remove calls to
STRLEN().Specifically:
In
vim_strsave_shellescape()a small cosmetic change.In
string_count()move the call toSTRLEN()outside thewhileloop.In
copy_first_char_to_tv()change to return-1on failure or the length of resultingv_string. Changestring_filter_map()andstring_reduce()to use the return value ofcopy_first_char_to_tv().In
blob_from_string()refactor to remove call toSTRLEN().In
string_from_blob()callvim_strnsave()instead ofvim_strsave().In
vim_snprintf_safelen()callvim_vsnprintf_typval()directly instead ofvim_vsnprintf()which then callsvim_vsnprintf_typval().Cheers
John