ndef: Use uri_prefixes to avoid a shadowed variable
authorMarcel Holtmann <marcel@holtmann.org>
Sun, 15 Jul 2012 22:13:45 +0000 (19:13 -0300)
committerMarcel Holtmann <marcel@holtmann.org>
Sun, 15 Jul 2012 22:13:45 +0000 (19:13 -0300)
src/ndef.c

index 412e5ad..48b298d 100644 (file)
@@ -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_prefixes[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_prefixes[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_prefixes[uri->identifier];
 
        DBG("URI prefix %s", prefix);