Skip to content

Strings without null-termination #97

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 9 commits into from
Jan 25, 2021
Merged

Strings without null-termination #97

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
184dd3e
Remove strlen in calls like String::concat(s, strlen(s))
matthijskooijman Mar 16, 2014
59dd995
Make string concat, copy and move work on non-terminated strings
matthijskooijman Mar 16, 2014
81a2d51
Simplify String::concat(char)
matthijskooijman Mar 16, 2014
3b88aca
Make String::concat(const char *, unsigned int) public
matthijskooijman Mar 16, 2014
8431488
Add String(char *, unsigned) constructor
matthijskooijman Mar 16, 2014
dd236bf
Don't mess with the original in String::substring
matthijskooijman Mar 16, 2014
eaab14d
Add String::concat(const uint8_t *, unsigned int) version
matthijskooijman Mar 17, 2014
0d83f1a
Add String(const uint8_t *, unsigned int) constructor
matthijskooijman Aug 4, 2015
d6fd84f
fixup! Make string concat, copy and move work on non-terminated strings
matthijskooijman Dec 31, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Don't mess with the original in String::substring 
Before, substring would (temporarily) add a \0 in the original string at
the end of the substring, so the substring could be copied into a new
String object. However, now that the String::copy() method can work with
non-nul-terminated strings (by passing an explicit length), this trick
is not needed and we can just call the copy method instead.
  • Loading branch information
@matthijskooijman
matthijskooijman committed Jan 25, 2021
commit dd236bfd2c62ed083aaa1b1229d71e85fd92f7a9
5 changes: 1 addition & 4 deletions api/String.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -632,10 +632,7 @@ String String::substring(unsigned int left, unsigned int right) const
String out;
if (left >= len) return out;
if (right > len) right = len;
char temp = buffer[right]; // save the replaced character
buffer[right] = '\0';
out = buffer + left; // pointer arithmetic
buffer[right] = temp; //restore character
out.copy(buffer + left, right - left);
return out;
}

Expand Down