FlapJackApps/subsurface
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove 'string marker after running out of strings' warning

Browse Source 
This warning is unnecessarily scary - we had a problem with parsing
multiple strings on the same line, but it should be all solved, and
while it does mean that people may have old incorrect git save files
with empty strings, scaring users about it isn't going to help.

And with the warning removed, we can just remove the whole test for an
empty string, because the normal code sequence handles that case just
fine.

Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Linus Torvalds 2020-04-03 14:47:09 -07:00
parent 9815024199
commit fe36b175cf
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/load-git.c
View File

@ -348,10 +348,6 @@ static char *pop_cstring(struct membuffer *str, const char *err)
report_error("git-load: string marker without any strings ('%s')", err); report_error("git-load: string marker without any strings ('%s')", err);
return strdup(""); return strdup("");
} }
if (!str->len) {
report_error("git-load: string marker after running out of strings ('%s')", err);
return strdup("");
}
len = strlen(mb_cstring(str)) + 1; len = strlen(mb_cstring(str)) + 1;
return remove_from_front(str, len); return remove_from_front(str, len);
} }