projects
/
platform
/
upstream
/
neard.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
ff7d492
)
ndef: Use uri_prefixes to avoid a shadowed variable
author
Marcel Holtmann
<marcel@holtmann.org>
Sun, 15 Jul 2012 22:13:45 +0000
(19:13 -0300)
committer
Marcel Holtmann
<marcel@holtmann.org>
Sun, 15 Jul 2012 22:13:45 +0000
(19:13 -0300)
src/ndef.c
patch
|
blob
|
history
diff --git
a/src/ndef.c
b/src/ndef.c
index
412e5ad
..
48b298d
100644
(file)
--- a/
src/ndef.c
+++ b/
src/ndef.c
@@
-255,7
+255,7
@@
static void append_text_record(struct near_ndef_text_record *text,
}
-static const char *uri_prefix[NFC_MAX_URI_ID + 1] = {
+static const char *uri_prefix
es
[NFC_MAX_URI_ID + 1] = {
"",
"http://www.",
"https://www.",
@@
-299,7
+299,7
@@
const char *__near_ndef_get_uri_prefix(uint8_t id)
if (id > NFC_MAX_URI_ID)
return NULL;
- return uri_prefix[id];
+ return uri_prefix
es
[id];
}
static void append_uri_record(struct near_ndef_uri_record *uri,
@@
-318,7
+318,7
@@
static void append_uri_record(struct near_ndef_uri_record *uri,
return;
}
- prefix = uri_prefix[uri->identifier];
+ prefix = uri_prefix
es
[uri->identifier];
DBG("URI prefix %s", prefix);