NDEF: Mark input data const when it is not modified

Signed-hostap: Jouni Malinen <j@w1.fi>

diff --git a/src/wps/ndef.c b/src/wps/ndef.c
index 43412f7192f48366ef576daa96e2ba79ce1c0580..7630ecbc6053b37b0b506c56b3322ff32099aed5 100644 (file)
--- a/src/wps/ndef.c
+++ b/src/wps/ndef.c
@@ -20,9 +20,9 @@
 #define FLAG_TNF_RFC2046 (0x02)
 
 struct ndef_record {
-       u8 *type;
-       u8 *id;
-       u8 *payload;
+       const u8 *type;
+       const u8 *id;
+       const u8 *payload;
        u8 type_length;
        u8 id_length;
        u32 payload_length;
@@ -31,9 +31,10 @@ struct ndef_record {
 
 static char wifi_handover_type[] = "application/vnd.wfa.wsc";
 
-static int ndef_parse_record(u8 *data, u32 size, struct ndef_record *record)
+static int ndef_parse_record(const u8 *data, u32 size,
+                            struct ndef_record *record)
 {
-       u8 *pos = data + 1;
+       const u8 *pos = data + 1;
 
        if (size < 2)
                return -1;
@@ -72,12 +73,12 @@ static int ndef_parse_record(u8 *data, u32 size, struct ndef_record *record)
 }
 
 
-static struct wpabuf * ndef_parse_records(struct wpabuf *buf,
+static struct wpabuf * ndef_parse_records(const struct wpabuf *buf,
                                          int (*filter)(struct ndef_record *))
 {
        struct ndef_record record;
        int len = wpabuf_len(buf);
-       u8 *data = wpabuf_mhead(buf);
+       const u8 *data = wpabuf_head(buf);
 
        while (len > 0) {
                if (ndef_parse_record(data, len, &record) < 0) {
@@ -155,13 +156,13 @@ static int wifi_filter(struct ndef_record *record)
 }
 
 
-struct wpabuf * ndef_parse_wifi(struct wpabuf *buf)
+struct wpabuf * ndef_parse_wifi(const struct wpabuf *buf)
 {
        return ndef_parse_records(buf, wifi_filter);
 }
 
 
-struct wpabuf * ndef_build_wifi(struct wpabuf *buf)
+struct wpabuf * ndef_build_wifi(const struct wpabuf *buf)
 {
        return ndef_build_record(FLAG_MESSAGE_BEGIN | FLAG_MESSAGE_END |
                                 FLAG_TNF_RFC2046, wifi_handover_type,

diff --git a/src/wps/wps.h b/src/wps/wps.h
index 7944f75c48b1514549400677f440e93b6eb7a33b..b49bb9128efc849d9e8c6d226ec828ac230dc50d 100644 (file)
--- a/src/wps/wps.h
+++ b/src/wps/wps.h
@@ -834,8 +834,8 @@ void uuid_gen_mac_addr(const u8 *mac_addr, u8 *uuid);
 u16 wps_config_methods_str2bin(const char *str);
 
 /* ndef.c */
-struct wpabuf * ndef_parse_wifi(struct wpabuf *buf);
-struct wpabuf * ndef_build_wifi(struct wpabuf *buf);
+struct wpabuf * ndef_parse_wifi(const struct wpabuf *buf);
+struct wpabuf * ndef_build_wifi(const struct wpabuf *buf);
 
 #ifdef CONFIG_WPS_STRICT
 int wps_validate_beacon(const struct wpabuf *wps_ie);