diff options
author | Luiz Augusto von Dentz <luiz.von.dentz@intel.com> | 2022-01-06 12:50:33 -0800 |
---|---|---|
committer | Luiz Augusto von Dentz <luiz.von.dentz@intel.com> | 2022-01-06 12:58:39 -0800 |
commit | cfab569484b18407fc117bb96634525cc76ea1f5 (patch) | |
tree | 754ec37148cc95958f1657e25768ad69565ebf23 /unit | |
parent | 9f09e69ecb077082301dafb745856e1f3731aaa7 (diff) | |
download | bluez-cfab569484b18407fc117bb96634525cc76ea1f5.tar.gz |
build: Replace use of g_memdup with util_memdup
This replaces the uses of g_memdup with util_memdup since the former has
been deprecated:
warning: ‘g_memdup’ is deprecated: Use 'g_memdup2' instead
[-Wdeprecated-declarations]
g_memdup2 requires bumping glib version which would likely have its
own problems thus why util_memdup was introduced.
Diffstat (limited to 'unit')
-rw-r--r-- | unit/test-avctp.c | 4 | ||||
-rw-r--r-- | unit/test-avdtp.c | 6 | ||||
-rw-r--r-- | unit/test-avrcp.c | 10 | ||||
-rw-r--r-- | unit/test-gatt.c | 4 | ||||
-rw-r--r-- | unit/test-hfp.c | 11 | ||||
-rw-r--r-- | unit/test-hog.c | 26 | ||||
-rw-r--r-- | unit/test-sdp.c | 10 | ||||
-rw-r--r-- | unit/test-uhid.c | 2 |
8 files changed, 38 insertions, 35 deletions
diff --git a/unit/test-avctp.c b/unit/test-avctp.c index fa7db59c8..25fd3abc2 100644 --- a/unit/test-avctp.c +++ b/unit/test-avctp.c @@ -53,7 +53,7 @@ struct context { #define raw_pdu(args...) \ { \ .valid = true, \ - .data = g_memdup(data(args), sizeof(data(args))), \ + .data = util_memdup(data(args), sizeof(data(args))), \ .size = sizeof(data(args)), \ } @@ -64,7 +64,7 @@ struct context { }; \ static struct test_data data; \ data.test_name = g_strdup(name); \ - data.pdu_list = g_memdup(pdus, sizeof(pdus)); \ + data.pdu_list = util_memdup(pdus, sizeof(pdus)); \ tester_add(name, &data, NULL, function, NULL); \ } while (0) diff --git a/unit/test-avdtp.c b/unit/test-avdtp.c index 4e8a68c6b..2e49def43 100644 --- a/unit/test-avdtp.c +++ b/unit/test-avdtp.c @@ -48,7 +48,7 @@ struct test_data { #define raw_pdu(args...) \ { \ .valid = true, \ - .data = g_memdup(data(args), sizeof(data(args))), \ + .data = util_memdup(data(args), sizeof(data(args))), \ .size = sizeof(data(args)), \ } @@ -56,7 +56,7 @@ struct test_data { { \ .valid = true, \ .fragmented = true, \ - .data = g_memdup(data(args), sizeof(data(args))), \ + .data = util_memdup(data(args), sizeof(data(args))), \ .size = sizeof(data(args)), \ } @@ -67,7 +67,7 @@ struct test_data { }; \ static struct test_data data; \ data.test_name = g_strdup(name); \ - data.pdu_list = g_memdup(pdus, sizeof(pdus)); \ + data.pdu_list = util_memdup(pdus, sizeof(pdus)); \ tester_add(name, &data, NULL, function, NULL); \ } while (0) diff --git a/unit/test-avrcp.c b/unit/test-avrcp.c index 34a70377d..b637a8a1b 100644 --- a/unit/test-avrcp.c +++ b/unit/test-avrcp.c @@ -61,7 +61,7 @@ struct context { #define raw_pdu(args...) \ { \ .valid = true, \ - .data = g_memdup(data(args), sizeof(data(args))), \ + .data = util_memdup(data(args), sizeof(data(args))), \ .size = sizeof(data(args)), \ } @@ -69,7 +69,7 @@ struct context { { \ .valid = true, \ .browse = true, \ - .data = g_memdup(data(args), sizeof(data(args))), \ + .data = util_memdup(data(args), sizeof(data(args))), \ .size = sizeof(data(args)), \ } @@ -77,7 +77,7 @@ struct context { { \ .valid = true, \ .fragmented = true, \ - .data = g_memdup(data(args), sizeof(data(args))), \ + .data = util_memdup(data(args), sizeof(data(args))), \ .size = sizeof(data(args)), \ } @@ -85,7 +85,7 @@ struct context { { \ .valid = true, \ .continuing = true, \ - .data = g_memdup(data(args), sizeof(data(args))), \ + .data = util_memdup(data(args), sizeof(data(args))), \ .size = sizeof(data(args)), \ } @@ -96,7 +96,7 @@ struct context { }; \ static struct test_data data; \ data.test_name = g_strdup(name); \ - data.pdu_list = g_memdup(pdus, sizeof(pdus)); \ + data.pdu_list = util_memdup(pdus, sizeof(pdus)); \ tester_add(name, &data, NULL, function, NULL); \ } while (0) diff --git a/unit/test-gatt.c b/unit/test-gatt.c index 6a47268e6..f92d860c4 100644 --- a/unit/test-gatt.c +++ b/unit/test-gatt.c @@ -73,7 +73,7 @@ struct context { #define raw_pdu(args...) \ { \ .valid = true, \ - .data = g_memdup(data(args), sizeof(data(args))), \ + .data = util_memdup(data(args), sizeof(data(args))), \ .size = sizeof(data(args)), \ } @@ -94,7 +94,7 @@ struct context { data.uuid = bt_uuid; \ data.step = test_step; \ data.source_db = db; \ - data.pdu_list = g_memdup(pdus, sizeof(pdus)); \ + data.pdu_list = util_memdup(pdus, sizeof(pdus)); \ tester_add(name, &data, NULL, function, NULL); \ } while (0) diff --git a/unit/test-hfp.c b/unit/test-hfp.c index f504724d7..b4af99d53 100644 --- a/unit/test-hfp.c +++ b/unit/test-hfp.c @@ -17,6 +17,7 @@ #include <glib.h> #include "src/shared/hfp.h" #include "src/shared/tester.h" +#include "src/shared/util.h" struct context { guint watch_id; @@ -50,7 +51,7 @@ struct test_data { #define raw_pdu(args...) \ { \ .valid = true, \ - .data = g_memdup(data(args), sizeof(data(args))), \ + .data = util_memdup(data(args), sizeof(data(args))), \ .size = sizeof(data(args)), \ } @@ -62,7 +63,7 @@ struct test_data { #define type_pdu(cmd_type, args...) \ { \ .valid = true, \ - .data = g_memdup(data(args), sizeof(data(args))), \ + .data = util_memdup(data(args), sizeof(data(args))), \ .size = sizeof(data(args)), \ .type = cmd_type, \ } @@ -70,7 +71,7 @@ struct test_data { #define frg_pdu(args...) \ { \ .valid = true, \ - .data = g_memdup(data(args), sizeof(data(args))), \ + .data = util_memdup(data(args), sizeof(data(args))), \ .size = sizeof(data(args)), \ .fragmented = true, \ } @@ -82,7 +83,7 @@ struct test_data { }; \ static struct test_data data; \ data.test_name = g_strdup(name); \ - data.pdu_list = g_memdup(pdus, sizeof(pdus)); \ + data.pdu_list = util_memdup(pdus, sizeof(pdus)); \ data.result_func = result_function; \ tester_add(name, &data, NULL, function, NULL); \ data.test_handler = test_handler; \ @@ -96,7 +97,7 @@ struct test_data { }; \ static struct test_data data; \ data.test_name = g_strdup(name); \ - data.pdu_list = g_memdup(pdus, sizeof(pdus)); \ + data.pdu_list = util_memdup(pdus, sizeof(pdus)); \ data.hf_result_func = result_func; \ data.response_func = response_function; \ tester_add(name, &data, NULL, function, NULL); \ diff --git a/unit/test-hog.c b/unit/test-hog.c index 116a5cb07..067497de4 100644 --- a/unit/test-hog.c +++ b/unit/test-hog.c @@ -59,24 +59,24 @@ struct context { #define raw_pdu(args...) \ { \ .valid = true, \ - .data = g_memdup(data(args), sizeof(data(args))), \ + .data = util_memdup(data(args), sizeof(data(args))), \ .size = sizeof(data(args)), \ } -#define false_pdu() \ -{ \ - .valid = false, \ +#define false_pdu() \ +{ \ + .valid = false, \ } -#define define_test(name, function, args...) \ - do { \ - const struct test_pdu pdus[] = { \ - args, { } \ - }; \ - static struct test_data data; \ - data.test_name = g_strdup(name); \ - data.pdu_list = g_memdup(pdus, sizeof(pdus)); \ - tester_add(name, &data, NULL, function, NULL); \ +#define define_test(name, function, args...) \ + do { \ + const struct test_pdu pdus[] = { \ + args, { } \ + }; \ + static struct test_data data; \ + data.test_name = g_strdup(name); \ + data.pdu_list = util_memdup(pdus, sizeof(pdus));\ + tester_add(name, &data, NULL, function, NULL); \ } while (0) static gboolean context_quit(gpointer user_data) diff --git a/unit/test-sdp.c b/unit/test-sdp.c index 8f95fcb71..5c04a71eb 100644 --- a/unit/test-sdp.c +++ b/unit/test-sdp.c @@ -47,14 +47,16 @@ struct test_data { #define raw_pdu(args...) \ { \ .valid = true, \ - .raw_data = g_memdup(raw_data(args), sizeof(raw_data(args))), \ + .raw_data = util_memdup(raw_data(args), \ + sizeof(raw_data(args))), \ .raw_size = sizeof(raw_data(args)), \ } #define raw_pdu_cont(cont, args...) \ { \ .valid = true, \ - .raw_data = g_memdup(raw_data(args), sizeof(raw_data(args))), \ + .raw_data = util_memdup(raw_data(args), \ + sizeof(raw_data(args))), \ .raw_size = sizeof(raw_data(args)), \ .cont_len = cont, \ } @@ -66,7 +68,7 @@ struct test_data { }; \ static struct test_data data; \ data.mtu = _mtu; \ - data.pdu_list = g_memdup(pdus, sizeof(pdus)); \ + data.pdu_list = util_memdup(pdus, sizeof(pdus)); \ tester_add(name, &data, NULL, test_sdp, NULL); \ } while (0) @@ -92,7 +94,7 @@ struct test_data_de { #define define_test_de_attr(name, input, exp) \ do { \ static struct test_data_de data; \ - data.input_data = g_memdup(input, sizeof(input)); \ + data.input_data = util_memdup(input, sizeof(input)); \ data.input_size = sizeof(input); \ data.expected = exp; \ tester_add("/sdp/DE/ATTR/" name, &data, NULL, \ diff --git a/unit/test-uhid.c b/unit/test-uhid.c index 001d39a3d..8a8eef855 100644 --- a/unit/test-uhid.c +++ b/unit/test-uhid.c @@ -61,7 +61,7 @@ struct context { }; \ static struct test_data data; \ data.test_name = g_strdup(name); \ - data.pdu_list = g_memdup(pdus, sizeof(pdus)); \ + data.pdu_list = util_memdup(pdus, sizeof(pdus)); \ tester_add(name, &data, NULL, function, NULL); \ } while (0) |