Skip to content

Use g_strv_builder_add() instead of g_strv_builder_take() #991

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
whot merged 1 commit into from
Jun 2, 2026
+17 −14
Merged

Use g_strv_builder_add() instead of g_strv_builder_take() #991

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion libwacom/libwacom-database.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -427,7 +427,8 @@ stylus_ids_as_hex(GArray *array)

for (guint i = 0; i < array->len; i++) {
id = &g_array_index(array, WacomStylusId, i);
g_strv_builder_take(builder, g_strdup_printf("0x%08x", id->tool_id));
g_autofree char *hex = g_strdup_printf("0x%08x", id->tool_id);
g_strv_builder_add(builder, hex);
}

return g_strv_builder_end(builder);
Expand Down
8 changes: 4 additions & 4 deletions libwacom/libwacom.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -934,15 +934,15 @@ print_styli_for_device(int fd,
styli = libwacom_get_styli(device, &nstyli);
for (int i = 0; i < nstyli; i++) {
const WacomStylus *stylus = styli[i];
char *s;
g_autofree char *s = NULL;

if (stylus->id.vid != WACOM_VENDOR_ID)
s = g_strdup_printf("0x%04x:%#x",
stylus->id.vid,
stylus->id.tool_id);
else
s = g_strdup_printf("%#x", stylus->id.tool_id);
g_strv_builder_take(builder, s);
g_strv_builder_add(builder, s);
}

strv = g_strv_builder_end(builder);
Expand Down Expand Up @@ -1046,14 +1046,14 @@ print_button_evdev_codes(int fd,
for (char b = 'A'; b < 'A' + nbuttons; b++) {
unsigned int code = libwacom_get_button_evdev_code(device, b);
const char *name = libevdev_event_code_get_name(EV_KEY, code);
char *s;
g_autofree char *s = NULL;

if (name)
s = g_strdup(name);
else
s = g_strdup_printf("0x%x", code);

g_strv_builder_take(builder, s);
g_strv_builder_add(builder, s);
}

strv = g_strv_builder_end(builder);
Expand Down
20 changes: 11 additions & 9 deletions tools/debug-device.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -428,8 +428,9 @@ handle_device(WacomDeviceDatabase *db,
g_auto(GStrv) strv = NULL;
g_autofree char *str = NULL;
for (int i = 0; i < nstyli; i++) {
char *s = g_strdup_printf("0x%06x", styli[i]);
g_strv_builder_take(builder, s);
g_autofree char *s =
g_strdup_printf("0x%06x", styli[i]);
g_strv_builder_add(builder, s);
}
strv = g_strv_builder_end(builder);
str = g_strjoinv(", ", strv);
Expand All @@ -447,11 +448,11 @@ handle_device(WacomDeviceDatabase *db,
g_autofree char *str = NULL;
for (int i = 0; i < nstyli; i++) {
const WacomStylus *s = styli[i];
char *entry = g_strdup_printf(
g_autofree char *entry = g_strdup_printf(
"[0x%04x, 0x%06x]",
libwacom_stylus_get_vendor_id(s),
libwacom_stylus_get_id(s));
g_strv_builder_take(builder, entry);
g_strv_builder_add(builder, entry);
}
strv = g_strv_builder_end(builder);
str = g_strjoinv(", ", strv);
Expand Down Expand Up @@ -518,9 +519,10 @@ handle_device(WacomDeviceDatabase *db,
#pragma GCC diagnostic pop

for (int i = 0; i < npaired; i++) {
char *s = g_strdup_printf("0x%06x",
paired[i]);
g_strv_builder_take(builder, s);
g_autofree char *s =
g_strdup_printf("0x%06x",
paired[i]);
g_strv_builder_add(builder, s);
}
strv = g_strv_builder_end(builder);
str = g_strjoinv(", ", strv);
Expand All @@ -544,12 +546,12 @@ handle_device(WacomDeviceDatabase *db,

for (int i = 0; i < npaired; i++) {
const WacomStylus *p = paired[i];
char *entry = g_strdup_printf(
g_autofree char *entry = g_strdup_printf(
"[0x%04x, 0x%06x]",
libwacom_stylus_get_vendor_id(
p),
libwacom_stylus_get_id(p));
g_strv_builder_take(builder, entry);
g_strv_builder_add(builder, entry);
}
strv = g_strv_builder_end(builder);
str = g_strjoinv(", ", strv);
Expand Down
Loading