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
Next Next commit
Remove strlen in calls like String::concat(s, strlen(s)) 
Instead of calling strlen in a dozen places, instead just call
String::concat(s), which will then call strlen. This shrinks the code
size of these calls significantly, the StringAppendOperator example on
the Arduino Uno shrinks by 72 bytes. This change does incur a slight
runtime cost, because there is one extra function call.
  • Loading branch information
@matthijskooijman
matthijskooijman committed Jan 25, 2021
commit 184dd3e812fe16c66c5bf3a78626c1a47bb900e8
16 changes: 8 additions & 8 deletions api/String.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -307,49 +307,49 @@ unsigned char String::concat(unsigned char num)
{
char buf[1 + 3 * sizeof(unsigned char)];
itoa(num, buf, 10);
return concat(buf, strlen(buf));
return concat(buf);
}

unsigned char String::concat(int num)
{
char buf[2 + 3 * sizeof(int)];
itoa(num, buf, 10);
return concat(buf, strlen(buf));
return concat(buf);
}

unsigned char String::concat(unsigned int num)
{
char buf[1 + 3 * sizeof(unsigned int)];
utoa(num, buf, 10);
return concat(buf, strlen(buf));
return concat(buf);
}

unsigned char String::concat(long num)
{
char buf[2 + 3 * sizeof(long)];
ltoa(num, buf, 10);
return concat(buf, strlen(buf));
return concat(buf);
}

unsigned char String::concat(unsigned long num)
{
char buf[1 + 3 * sizeof(unsigned long)];
ultoa(num, buf, 10);
return concat(buf, strlen(buf));
return concat(buf);
}

unsigned char String::concat(float num)
{
char buf[20];
char* string = dtostrf(num, 4, 2, buf);
return concat(string, strlen(string));
return concat(string);
}

unsigned char String::concat(double num)
{
char buf[20];
char* string = dtostrf(num, 4, 2, buf);
return concat(string, strlen(string));
return concat(string);
}

unsigned char String::concat(const __FlashStringHelper * str)
Expand Down Expand Up @@ -378,7 +378,7 @@ StringSumHelper & operator + (const StringSumHelper &lhs, const String &rhs)
StringSumHelper & operator + (const StringSumHelper &lhs, const char *cstr)
{
StringSumHelper &a = const_cast<StringSumHelper&>(lhs);
if (!cstr || !a.concat(cstr, strlen(cstr))) a.invalidate();
if (!cstr || !a.concat(cstr)) a.invalidate();
return a;
}

Expand Down