pei/scrcpy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Generalize string trunctation util function

Browse Source 
Add an additional argument to let the client pass the possible end
chars.
This commit is contained in:
Romain Vimont
2021-11-17 21:38:59 +01:00
parent f2781a8b6d
commit 9619ade706
4 changed files with 26 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/util/str.c
View File

@@ -293,9 +293,9 @@ error:
}
size_t
sc_str_truncate_first_line(char *data, size_t len) {
sc_str_truncate(char *data, size_t len, const char *endchars) {
data[len - 1] = '\0';
char *eol = strpbrk(data, "\r\n");
char *eol = strpbrk(data, endchars);
if (eol) {
*eol = '\0';
len = eol - data;

4
app/src/util/str.h
View File

@@ -104,7 +104,7 @@ char *
sc_str_wrap_lines(const char *input, unsigned columns, unsigned indent);
/**
* Truncate the data after the first line
* Truncate the data after any of the characters from `endchars`
*
* An '\0' is always written at the end of the data, even if no newline
* character is encountered.
@@ -112,6 +112,6 @@ sc_str_wrap_lines(const char *input, unsigned columns, unsigned indent);
* Return the size of the resulting line.
*/
size_t
sc_str_truncate_first_line(char *data, size_t len);
sc_str_truncate(char *data, size_t len, const char *endchars);
#endif