mirror of
https://github.com/subsurface/subsurface.git
synced 2025-02-19 22:16:15 +00:00
Don't expose 'detach_buffer()' to membuffer users
The native buffer of a membuffer is not NUL-terminated, so when you want to detach it and use it as a C string, you had to first do 'mb_cstring()' that adds the proper termination/ This was all documented in the header files, and all but two users did it correctly. But there were those two users, and the exported interface was unnecessarily hard to use. We do want the "just detach the raw buffer" internally in the membuffer code, but let's not make the exported interface be that hard to use. So this switches the exported interface to be 'detach_cstring()', which does that 'mb_cstring()' for you, and avoids the possibility that you'd use a non-terminated memory buffer as a C string. The old 'detach_buffer()' is now purely the internal membuffer implementation, and not used by others. Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
parent
d401271dab
commit
a9b1fbdcc5
7 changed files with 20 additions and 22 deletions
|
@ -89,7 +89,7 @@ char *get_planner_disclaimer_formatted()
|
|||
const char *deco = decoMode() == VPMB ? translate("gettextFromC", "VPM-B")
|
||||
: translate("gettextFromC", "BUHLMANN");
|
||||
put_format(&buf, get_planner_disclaimer(), deco);
|
||||
return detach_buffer(&buf);
|
||||
return detach_cstring(&buf);
|
||||
}
|
||||
|
||||
void add_plan_to_notes(struct diveplan *diveplan, struct dive *dive, bool show_disclaimer, int error)
|
||||
|
@ -618,9 +618,8 @@ void add_plan_to_notes(struct diveplan *diveplan, struct dive *dive, bool show_d
|
|||
if (o2warning_exist)
|
||||
put_string(&buf, "</div>\n");
|
||||
finished:
|
||||
mb_cstring(&buf);
|
||||
free(dive->notes);
|
||||
dive->notes = detach_buffer(&buf);
|
||||
dive->notes = detach_cstring(&buf);
|
||||
#ifdef DEBUG_PLANNER_NOTES
|
||||
printf("<!DOCTYPE html>\n<html>\n\t<head><title>plannernotes</title><meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\"/></head>\n\t<body>\n%s\t</body>\n</html>\n", dive->notes);
|
||||
#endif
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue