From: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
To: linux-nfc@lists.01.org
Subject: [neard][PATCH v2 63/73] unit: remove duplicated definitions in test-ndef-parse
Date: Mon, 19 Jul 2021 13:08:09 +0200 [thread overview]
Message-ID: <20210719110819.27340-64-krzysztof.kozlowski@canonical.com> (raw)
In-Reply-To: <20210719110819.27340-1-krzysztof.kozlowski@canonical.com>
[-- Attachment #1: Type: text/plain, Size: 3664 bytes --]
The unit/test-ndef-parse.c duplicated several definitions which is
error-prone.
Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
---
unit/test-ndef-parse.c | 109 +----------------------------------------
1 file changed, 1 insertion(+), 108 deletions(-)
diff --git a/unit/test-ndef-parse.c b/unit/test-ndef-parse.c
index de3cac81b90d..53a5b584437a 100644
--- a/unit/test-ndef-parse.c
+++ b/unit/test-ndef-parse.c
@@ -32,114 +32,7 @@
#include <near/ndef.h>
#include <src/near.h>
-
-enum record_type {
- RECORD_TYPE_WKT_SMART_POSTER = 0x01,
- RECORD_TYPE_WKT_URI = 0x02,
- RECORD_TYPE_WKT_TEXT = 0x03,
- RECORD_TYPE_WKT_SIZE = 0x04,
- RECORD_TYPE_WKT_TYPE = 0x05,
- RECORD_TYPE_WKT_ACTION = 0x06,
- RECORD_TYPE_WKT_HANDOVER_REQUEST = 0x07,
- RECORD_TYPE_WKT_HANDOVER_SELECT = 0x08,
- RECORD_TYPE_WKT_HANDOVER_CARRIER = 0x09,
- RECORD_TYPE_WKT_ALTERNATIVE_CARRIER = 0x0a,
- RECORD_TYPE_WKT_COLLISION_RESOLUTION = 0x0b,
- RECORD_TYPE_WKT_ERROR = 0x0c,
- RECORD_TYPE_MIME_TYPE = 0x0d,
- RECORD_TYPE_EXT_AAR = 0x0e,
- RECORD_TYPE_UNKNOWN = 0xfe,
- RECORD_TYPE_ERROR = 0xff
-};
-
-struct near_ndef_record_header {
- uint8_t mb;
- uint8_t me;
- uint8_t cf;
- uint8_t sr;
- uint8_t il;
- uint8_t tnf;
- uint8_t il_length;
- uint8_t *il_field;
- uint32_t payload_len;
- uint32_t offset;
- uint8_t type_len;
- enum record_type rec_type;
- char *type_name;
- uint32_t header_len;
-};
-
-struct near_ndef_text_payload {
- char *encoding;
- char *language_code;
- char *data;
-};
-
-struct near_ndef_uri_payload {
- uint8_t identifier;
-
- uint32_t field_length;
- uint8_t *field;
-};
-
-struct near_ndef_sp_payload {
- struct near_ndef_uri_payload *uri;
-
- uint8_t number_of_title_records;
- struct near_ndef_text_payload **title_records;
-
- uint32_t size; /* from Size record*/
- char *type; /* from Type record*/
- char *action;
-};
-
-struct near_ndef_aar_payload {
- char *package;
-};
-
-struct near_ndef_record {
- char *path;
-
- struct near_ndef_record_header *header;
-
- /* specific payloads */
- struct near_ndef_text_payload *text;
- struct near_ndef_uri_payload *uri;
- struct near_ndef_sp_payload *sp;
- struct near_ndef_mime_payload *mime;
- struct near_ndef_ho_payload *ho; /* handover payload */
- struct near_ndef_aar_payload *aar;
-
- char *type;
-
- uint8_t *data;
- size_t data_len;
-};
-
-struct near_ndef_ho_payload {
- uint8_t version; /* version id */
- uint16_t collision_record; /* collision record */
-
- uint8_t number_of_ac_payloads; /* At least 1 ac is needed */
- struct near_ndef_ac_payload **ac_payloads;
-
- /* Optional records */
- uint16_t *err_record; /* not NULL if present */
-
- uint8_t number_of_cfg_payloads; /* extra NDEF records */
- struct near_ndef_mime_payload **cfg_payloads;
-};
-
-struct near_ndef_ac_payload {
- enum carrier_power_state cps; /* carrier power state */
-
- uint8_t cdr_len; /* carrier data reference length: 0x01 */
- uint8_t *cdr; /* carrier data reference */
- uint8_t adata_refcount; /* auxiliary data reference count */
-
- /* !: if adata_refcount == 0, then there's no data reference */
- uint16_t **adata; /* auxiliary data reference */
-};
+#include <src/ndef-private.h>
/* http://www.intel.com URI NDEF */
static uint8_t test_uri[] = {0xd1, 0x1, 0xa, 0x55, 0x1, 0x69, 0x6e, 0x74,
--
2.27.0
next prev parent reply other threads:[~2021-07-19 11:08 UTC|newest]
Thread overview: 80+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-19 11:07 [neard][PATCH v2 00/73] combined fixes - warnings, memory leaks, memory corruption Krzysztof Kozlowski
2021-07-19 11:07 ` [neard][PATCH v2 01/73] Drop empty NEWS Krzysztof Kozlowski
2021-07-19 11:07 ` [neard][PATCH v2 02/73] nfctool: fix adapter_get_devices() cast-function-type Krzysztof Kozlowski
2021-07-19 11:07 ` [neard][PATCH v2 03/73] nfctool: fix adapter_print_target() cast-function-type Krzysztof Kozlowski
2021-07-19 11:07 ` [neard][PATCH v2 04/73] nfctool: fix adapter_print_info() cast-function-type Krzysztof Kozlowski
2021-07-19 11:07 ` [neard][PATCH v2 05/73] nfctool: fix adapter_compare_idx() cast-function-type Krzysztof Kozlowski
2021-07-19 11:07 ` [neard][PATCH v2 06/73] nfctool: fix nfctool_send_dep_link_up() cast-function-type Krzysztof Kozlowski
2021-07-19 11:07 ` [neard][PATCH v2 07/73] nfctool: fix nfctool_print_and_remove_snl() cast-function-type Krzysztof Kozlowski
2021-07-19 11:07 ` [neard][PATCH v2 08/73] nfctool: use proper format for integers (-Wformat) Krzysztof Kozlowski
2021-07-19 11:07 ` [neard][PATCH v2 09/73] nfctool: pass the format as string literal Krzysztof Kozlowski
2021-07-19 11:07 ` [neard][PATCH v2 10/73] dbus: fix -Wformat in near_dbus_encode_string() Krzysztof Kozlowski
2021-07-19 11:07 ` [neard][PATCH v2 11/73] unit: pass real UTF-8 for testing text NDEF Krzysztof Kozlowski
2021-07-19 11:07 ` [neard][PATCH v2 12/73] ndef: check UTF-16 text payload length Krzysztof Kozlowski
2021-07-19 11:07 ` [neard][PATCH v2 13/73] ndef: silence clang -Wcast-align warning Krzysztof Kozlowski
2021-07-19 11:07 ` [neard][PATCH v2 14/73] ndef: use NDEF_TEXT_RECORD_UTF16_STATUS define Krzysztof Kozlowski
2021-07-19 11:07 ` [neard][PATCH v2 15/73] ndef: use proper format for integers (-Wformat) Krzysztof Kozlowski
2021-07-19 11:07 ` [neard][PATCH v2 16/73] ndef: make freeing near_ndef_message reusable Krzysztof Kozlowski
2021-07-19 11:07 ` [neard][PATCH v2 17/73] se: fix multiple apdu definitions Krzysztof Kozlowski
2021-07-19 11:07 ` [neard][PATCH v2 18/73] se: silence clang -Wcast-align warning Krzysztof Kozlowski
2021-07-19 11:07 ` [neard][PATCH v2 19/73] se: use proper format for integers (-Wformat) Krzysztof Kozlowski
2021-07-19 11:07 ` [neard][PATCH v2 20/73] adapter: adjust indentation of continued arguments Krzysztof Kozlowski
2021-07-19 11:07 ` [neard][PATCH v2 21/73] adapter: use proper format for integers (-Wformat) Krzysztof Kozlowski
2021-07-19 11:07 ` [neard][PATCH v2 22/73] gdbus: do not shadow global 'pending' variable (-Wshadow) Krzysztof Kozlowski
2021-07-19 11:07 ` [neard][PATCH v2 23/73] nciattach: fix poll.h include location Krzysztof Kozlowski
2021-07-19 11:07 ` [neard][PATCH v2 24/73] nciattach: do not shadow other local 'opt' variable (-Wshadow) Krzysztof Kozlowski
2021-07-19 11:07 ` [neard][PATCH v2 25/73] bluetooth: use proper format for integers (-Wformat) Krzysztof Kozlowski
2021-07-19 11:07 ` [neard][PATCH v2 26/73] nfctype2: " Krzysztof Kozlowski
2021-07-19 11:07 ` [neard][PATCH v2 27/73] nfctype3: " Krzysztof Kozlowski
2021-07-19 11:07 ` [neard][PATCH v2 28/73] nfctype5: " Krzysztof Kozlowski
2021-07-19 11:07 ` [neard][PATCH v2 29/73] nfctype5: fix returning uninitialized stack value in t5_tag_is_ti_pro() Krzysztof Kozlowski
2021-07-19 11:07 ` [neard][PATCH v2 30/73] mifare: use proper format for integers (-Wformat) Krzysztof Kozlowski
2021-07-19 11:07 ` [neard][PATCH v2 31/73] mifare: use unsigned int to suppress compiler -Wstrict-overflow Krzysztof Kozlowski
2021-07-19 11:07 ` [neard][PATCH v2 32/73] p2p: use proper format for integers (-Wformat) Krzysztof Kozlowski
2021-07-19 11:07 ` [neard][PATCH v2 33/73] npp: " Krzysztof Kozlowski
2021-07-19 11:07 ` [neard][PATCH v2 34/73] device: " Krzysztof Kozlowski
2021-07-19 11:07 ` [neard][PATCH v2 35/73] manager: " Krzysztof Kozlowski
2021-07-19 11:07 ` [neard][PATCH v2 36/73] netlink: " Krzysztof Kozlowski
2021-07-19 11:07 ` [neard][PATCH v2 37/73] gdbus: annotate printf-like functions as accepting format Krzysztof Kozlowski
2021-07-19 11:07 ` [neard][PATCH v2 38/73] snep-send: fix near_ndef_message memory leak Krzysztof Kozlowski
2021-07-19 11:07 ` [neard][PATCH v2 39/73] tag: use proper format for integers (-Wformat) Krzysztof Kozlowski
2021-07-19 11:07 ` [neard][PATCH v2 40/73] tag: do not open-code freeing ndef message Krzysztof Kozlowski
2021-07-19 11:07 ` [neard][PATCH v2 41/73] snep: " Krzysztof Kozlowski
2021-07-19 11:07 ` [neard][PATCH v2 42/73] snep: remove useless NULL-ify of local pointer variable Krzysztof Kozlowski
2021-07-19 11:07 ` [neard][PATCH v2 43/73] snep: fix double free of GSList Krzysztof Kozlowski
2021-07-19 11:07 ` [neard][PATCH v2 44/73] snep: fix fragmented response memory leaks Krzysztof Kozlowski
2021-07-19 11:07 ` [neard][PATCH v2 45/73] unit: use g_assert_cmpstr() Krzysztof Kozlowski
2021-07-19 11:07 ` [neard][PATCH v2 46/73] unit: use g_assert_cmpint() and g_assert_cmpuint() Krzysztof Kozlowski
2021-07-19 11:07 ` [neard][PATCH v2 47/73] unit: fix recv() and send() return types Krzysztof Kozlowski
2021-07-19 11:07 ` [neard][PATCH v2 48/73] unit: use g_assert_null() Krzysztof Kozlowski
2021-07-19 11:07 ` [neard][PATCH v2 49/73] unit: use g_assert_cmpmem() Krzysztof Kozlowski
2021-07-19 11:07 ` [neard][PATCH v2 50/73] unit: use proper pointer to uint8_t in test_snep_read_recv_fragments() Krzysztof Kozlowski
2021-07-19 11:07 ` [neard][PATCH v2 51/73] unit: do not shadow global 'text' variable (-Wshadow) Krzysztof Kozlowski
2021-07-19 11:07 ` [neard][PATCH v2 52/73] unit: do not shadow global 'uri' " Krzysztof Kozlowski
2021-07-19 11:07 ` [neard][PATCH v2 53/73] unit: use proper format for integers (-Wformat) Krzysztof Kozlowski
2021-07-19 11:08 ` [neard][PATCH v2 54/73] unit: fix memory leaks in test-ndef-parse Krzysztof Kozlowski
2021-07-19 11:08 ` [neard][PATCH v2 55/73] unit: do not open-code freeing ndef message Krzysztof Kozlowski
2021-07-19 11:08 ` [neard][PATCH v2 56/73] unit: fix memory leaks in test-ndef-build Krzysztof Kozlowski
2021-07-19 11:08 ` [neard][PATCH v2 57/73] unit: fix memory leaks in test-snep-read error paths Krzysztof Kozlowski
2021-07-19 11:08 ` [neard][PATCH v2 58/73] unit: fix record memory leak in test-snep-read Krzysztof Kozlowski
2021-07-19 11:08 ` [neard][PATCH v2 59/73] unit: fix records GList " Krzysztof Kozlowski
2021-07-19 11:08 ` [neard][PATCH v2 60/73] unit: do not pass NULL to memcpy() Krzysztof Kozlowski
2021-07-19 11:08 ` [neard][PATCH v2 61/73] unit: do not search for headers locally where they do not exist Krzysztof Kozlowski
2021-07-19 11:08 ` [neard][PATCH v2 62/73] unit: remove duplicated invalid definitions in test-snep-read Krzysztof Kozlowski
2021-07-19 11:08 ` Krzysztof Kozlowski [this message]
2021-07-19 11:08 ` [neard][PATCH v2 64/73] unit: add few asserts " Krzysztof Kozlowski
2021-07-19 11:08 ` [neard][PATCH v2 65/73] HACKING: refine required packages Krzysztof Kozlowski
2021-07-19 11:08 ` [neard][PATCH v2 66/73] build: fix setting CFLAGS on dash shell (Alpine Linux) Krzysztof Kozlowski
2021-07-19 11:08 ` [neard][PATCH v2 67/73] build: add more compiler warnings Krzysztof Kozlowski
2021-07-19 11:08 ` [neard][PATCH v2 68/73] build: enable -Wshadow and -Wformat-signedness " Krzysztof Kozlowski
2021-07-19 11:08 ` [neard][PATCH v2 69/73] build: enable -Wformat=2 warnings Krzysztof Kozlowski
2021-07-19 11:08 ` [neard][PATCH v2 70/73] build: enable -Wunsafe-loop-optimizations and -Wstrict-overflow=2 warnings Krzysztof Kozlowski
2021-07-19 11:08 ` [neard][PATCH v2 71/73] build: fix missing usage of PIE check result Krzysztof Kozlowski
2021-07-19 11:08 ` [neard][PATCH v2 72/73] build: add support for GCC sanitizers (asan, lsan and ubsan) Krzysztof Kozlowski
2021-07-19 11:08 ` [neard][PATCH v2 73/73] AUTHORS: Mention Krzysztof Kozlowski's contributions Krzysztof Kozlowski
2021-07-19 11:21 ` [neard][PATCH v2 00/73] combined fixes - warnings, memory leaks, memory corruption Krzysztof Kozlowski
2021-07-19 16:32 ` Mark Greer
2021-08-01 23:11 ` Mark Greer
2021-08-02 7:51 ` Krzysztof Kozlowski
2021-08-04 7:56 ` Krzysztof Kozlowski
2021-08-05 16:14 ` Mark Greer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210719110819.27340-64-krzysztof.kozlowski@canonical.com \
--to=krzysztof.kozlowski@canonical.com \
--cc=linux-nfc@lists.01.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).