linux-nfc.lists.01.org archive mirror
 help / color / mirror / Atom feed
From: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
To: linux-nfc@lists.01.org
Cc: Jakub Kicinski <kuba@kernel.org>,
	"David S . Miller" <davem@davemloft.net>,
	Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
Subject: [linux-nfc] [neard][PATCH 15/34] unit: do not shadow global 'uri' variable (-Wshadow)
Date: Sun, 11 Jul 2021 22:23:32 +0200	[thread overview]
Message-ID: <20210711202351.18363-3-krzysztof.kozlowski@canonical.com> (raw)
In-Reply-To: <20210711202102.18094-1-krzysztof.kozlowski@canonical.com>

Fix -Wshadow warnings like:

    unit/test-ndef-parse.c: In function ‘test_ndef_single_sp’:
    unit/test-ndef-parse.c:291:32: error: declaration of ‘uri’ shadows a global declaration [-Werror=shadow]
      291 |  struct near_ndef_uri_payload *uri;
          |                                ^~~
    unit/test-ndef-parse.c:145:16: note: shadowed declaration is here
      145 | static uint8_t uri[] = {0xd1, 0x1, 0xa, 0x55, 0x1, 0x69, 0x6e, 0x74,
          |                ^~~

Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
---
 unit/test-ndef-parse.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/unit/test-ndef-parse.c b/unit/test-ndef-parse.c
index afcede57b0d8..cdeb1a1a24df 100644
--- a/unit/test-ndef-parse.c
+++ b/unit/test-ndef-parse.c
@@ -142,7 +142,7 @@ struct near_ndef_ac_payload {
 };
 
 /* http://www.intel.com URI NDEF */
-static uint8_t uri[] = {0xd1, 0x1, 0xa, 0x55, 0x1, 0x69, 0x6e, 0x74,
+static uint8_t test_uri[] = {0xd1, 0x1, 0xa, 0x55, 0x1, 0x69, 0x6e, 0x74,
 			0x65, 0x6c, 0x2e, 0x63, 0x6f, 0x6d};
 
 /* 'hello żółw' - UTF-8 - en-US Text NDEF */
@@ -210,7 +210,7 @@ static void test_ndef_uri(void)
 	GList *records;
 	struct near_ndef_record *record;
 
-	records = near_ndef_parse_msg(uri, sizeof(uri), NULL);
+	records = near_ndef_parse_msg(test_uri, sizeof(test_uri), NULL);
 
 	g_assert(records);
 	g_assert_cmpuint(g_list_length(records), ==, 1);
-- 
2.27.0
_______________________________________________
Linux-nfc mailing list -- linux-nfc@lists.01.org
To unsubscribe send an email to linux-nfc-leave@lists.01.org
%(web_page_url)slistinfo%(cgiext)s/%(_internal_name)s

  parent reply	other threads:[~2021-07-11 20:24 UTC|newest]

Thread overview: 35+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-07-11 20:20 [linux-nfc] [neard][PATCH 00/34] fixes and improvements for neard (continued) Krzysztof Kozlowski
2021-07-11 20:20 ` [linux-nfc] [neard][PATCH 01/34] Drop empty NEWS Krzysztof Kozlowski
2021-07-11 20:20 ` [linux-nfc] [neard][PATCH 02/34] ci: add building without maintainer options Krzysztof Kozlowski
2021-07-11 20:20 ` [linux-nfc] [neard][PATCH 03/34] ci: be verbose when building Krzysztof Kozlowski
2021-07-11 20:20 ` [linux-nfc] [neard][PATCH 04/34] ci: add more build configurations (Fedora, Alpine, Debian, cross-compile, i386) Krzysztof Kozlowski
2021-07-11 20:20 ` [linux-nfc] [neard][PATCH 05/34] ci: run unit tests Krzysztof Kozlowski
2021-07-11 20:20 ` [linux-nfc] [neard][PATCH 06/34] adapter: adjust indentation of continued arguments Krzysztof Kozlowski
2021-07-11 20:20 ` [linux-nfc] [neard][PATCH 07/34] ci: display printenv Krzysztof Kozlowski
2021-07-11 20:20 ` [linux-nfc] [neard][PATCH 08/34] HACKING: refine required packages Krzysztof Kozlowski
2021-07-11 20:20 ` [linux-nfc] [neard][PATCH 09/34] nciattach: fix poll.h include location Krzysztof Kozlowski
2021-07-11 20:20 ` [linux-nfc] [neard][PATCH 10/34] unit: use proper pointer to uint8_t in test_snep_read_recv_fragments() Krzysztof Kozlowski
2021-07-11 20:20 ` [linux-nfc] [neard][PATCH 11/34] build: fix setting CFLAGS on dash shell (Alpine Linux) Krzysztof Kozlowski
2021-07-11 20:20 ` [linux-nfc] [neard][PATCH 12/34] build: add more compiler warnings Krzysztof Kozlowski
2021-07-11 20:23 ` [linux-nfc] [neard][PATCH 13/34] gdbus: do not shadow global 'pending' variable (-Wshadow) Krzysztof Kozlowski
2021-07-11 20:23 ` [linux-nfc] [neard][PATCH 14/34] nciattach: do not shadow other local 'opt' " Krzysztof Kozlowski
2021-07-11 20:23 ` Krzysztof Kozlowski [this message]
2021-07-11 20:23 ` [linux-nfc] [neard][PATCH 16/34] nfctool: use proper format for integers (-Wformat) Krzysztof Kozlowski
2021-07-11 20:23 ` [linux-nfc] [neard][PATCH 17/34] bluetooth: " Krzysztof Kozlowski
2021-07-11 20:23 ` [linux-nfc] [neard][PATCH 18/34] ndef: " Krzysztof Kozlowski
2021-07-11 20:23 ` [linux-nfc] [neard][PATCH 19/34] nfctype2: " Krzysztof Kozlowski
2021-07-11 20:23 ` [linux-nfc] [neard][PATCH 20/34] nfctype3: " Krzysztof Kozlowski
2021-07-11 20:23 ` [linux-nfc] [neard][PATCH 21/34] nfctype5: " Krzysztof Kozlowski
2021-07-11 20:23 ` [linux-nfc] [neard][PATCH 22/34] mifare: " Krzysztof Kozlowski
2021-07-11 20:23 ` [linux-nfc] [neard][PATCH 23/34] p2p: " Krzysztof Kozlowski
2021-07-11 20:23 ` [linux-nfc] [neard][PATCH 24/34] npp: " Krzysztof Kozlowski
2021-07-11 20:23 ` [linux-nfc] [neard][PATCH 25/34] adapter: " Krzysztof Kozlowski
2021-07-11 20:23 ` [linux-nfc] [neard][PATCH 26/34] device: " Krzysztof Kozlowski
2021-07-11 20:23 ` [linux-nfc] [neard][PATCH 27/34] manager: " Krzysztof Kozlowski
2021-07-11 20:23 ` [linux-nfc] [neard][PATCH 28/34] tag: " Krzysztof Kozlowski
2021-07-11 20:23 ` [linux-nfc] [neard][PATCH 29/34] netlink: " Krzysztof Kozlowski
2021-07-11 20:23 ` [linux-nfc] [neard][PATCH 30/34] se: " Krzysztof Kozlowski
2021-07-11 20:23 ` [linux-nfc] [neard][PATCH 31/34] ndef: " Krzysztof Kozlowski
2021-07-11 20:23 ` [linux-nfc] [neard][PATCH 32/34] unit: " Krzysztof Kozlowski
2021-07-11 20:23 ` [linux-nfc] [neard][PATCH 33/34] build: enable -Wshadow and -Wformat-signedness compiler warnings Krzysztof Kozlowski
2021-07-11 20:23 ` [linux-nfc] [neard][PATCH 34/34] AUTHORS: Mention Krzysztof Kozlowski's contributions Krzysztof Kozlowski

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=20210711202351.18363-3-krzysztof.kozlowski@canonical.com \
    --to=krzysztof.kozlowski@canonical.com \
    --cc=davem@davemloft.net \
    --cc=kuba@kernel.org \
    --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).