mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Change taglist_get_tagstring to support 'unlimited' tag list size

Browse source 
Previous taglist_get_tagstring signature/implementation did not allow
handling of cases where inputted buffer could not contain all tags.
New implementation allocates buffer based on pre-computed size allowing to
insert all tags in the returned string.

Added get_taglist_string in qthelper to handle conversion to QString
Added TestTagList with tests for taglist_get_tagstring

Signed-off-by: Jeremie Guichard <djebrest@gmail.com>
This commit is contained in:
Jeremie Guichard 2018-04-09 10:09:34 +02:00 • committed by Dirk Hohndel
parent f1830cd44e
commit 7753352e62
10 changed files with 140 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

33
core/dive.c
View file

@ -12,6 +12,7 @@
#include "divelist.h"
#include "qthelper.h"
#include "metadata.h"
#include "membuffer.h"
/* one could argue about the best place to have this variable -
* it's used in the UI, but it seems to make the most sense to have it
@ -3020,30 +3021,28 @@ void taglist_cleanup(struct tag_entry **tag_list)
}
}
int taglist_get_tagstring(struct tag_entry *tag_list, char *buffer, int len)
char *taglist_get_tagstring(struct tag_entry *tag_list)
{
int i = 0;
struct tag_entry *tmp;
tmp = tag_list;
memset(buffer, 0, len);
bool first_tag = true;
struct membuffer b = { 0 };
struct tag_entry *tmp = tag_list;
while (tmp != NULL) {
int newlength = strlen(tmp->tag->name);
if (i > 0)
newlength += 2;
if ((i + newlength) < len) {
if (i > 0) {
strcpy(buffer + i, ", ");
strcpy(buffer + i + 2, tmp->tag->name);
if (!empty_string(tmp->tag->name)) {
if (first_tag) {
put_format(&b, "%s", tmp->tag->name);
first_tag = false;
} else {
strcpy(buffer, tmp->tag->name);
put_format(&b, ", %s", tmp->tag->name);
}
} else {
return i;
}
i += newlength;
tmp = tmp->next;
}
return i;
/* Ensures we do return null terminated empty string for:
* - empty tag list
* - tag list with empty tag only
*/
mb_cstring(&b);
return detach_buffer(&b);
}
static inline void taglist_free_divetag(struct divetag *tag)