diff --git a/qdf/inc/qdf_str.h b/qdf/inc/qdf_str.h index 59861b35ed..5b94c10f2b 100644 --- a/qdf/inc/qdf_str.h +++ b/qdf/inc/qdf_str.h @@ -57,7 +57,7 @@ QDF_STATUS qdf_str_dup(char **dest, const char *src); * * Return: A pointer to the first non-space character in @str */ -static inline char *qdf_str_left_trim(char *str) +static inline const char *qdf_str_left_trim(const char *str) { return __qdf_str_left_trim(str); } diff --git a/qdf/inc/qdf_types.h b/qdf/inc/qdf_types.h index 09b32a50e0..2ef36a3564 100644 --- a/qdf/inc/qdf_types.h +++ b/qdf/inc/qdf_types.h @@ -678,7 +678,7 @@ typedef enum { * * Return: QDF_STATUS */ -QDF_STATUS qdf_bool_parse(char *bool_str, bool *out_bool); +QDF_STATUS qdf_bool_parse(const char *bool_str, bool *out_bool); /** * qdf_int32_parse() - parse the given string as a 32-bit signed integer @@ -691,7 +691,7 @@ QDF_STATUS qdf_bool_parse(char *bool_str, bool *out_bool); * * Return: QDF_STATUS */ -QDF_STATUS qdf_int32_parse(char *int_str, int32_t *out_int); +QDF_STATUS qdf_int32_parse(const char *int_str, int32_t *out_int); /** * qdf_uint32_parse() - parse the given string as a 32-bit unsigned integer @@ -704,7 +704,7 @@ QDF_STATUS qdf_int32_parse(char *int_str, int32_t *out_int); * * Return: QDF_STATUS */ -QDF_STATUS qdf_uint32_parse(char *int_str, uint32_t *out_int); +QDF_STATUS qdf_uint32_parse(const char *int_str, uint32_t *out_int); /** * qdf_int64_parse() - parse the given string as a 64-bit signed integer @@ -717,7 +717,7 @@ QDF_STATUS qdf_uint32_parse(char *int_str, uint32_t *out_int); * * Return: QDF_STATUS */ -QDF_STATUS qdf_int64_parse(char *int_str, int64_t *out_int); +QDF_STATUS qdf_int64_parse(const char *int_str, int64_t *out_int); /** * qdf_uint64_parse() - parse the given string as a 64-bit unsigned integer @@ -730,7 +730,7 @@ QDF_STATUS qdf_int64_parse(char *int_str, int64_t *out_int); * * Return: QDF_STATUS */ -QDF_STATUS qdf_uint64_parse(char *int_str, uint64_t *out_int); +QDF_STATUS qdf_uint64_parse(const char *int_str, uint64_t *out_int); #define QDF_MAC_ADDR_SIZE 6 #define QDF_MAC_ADDR_STR "%02x:%02x:%02x:%02x:%02x:%02x" @@ -765,7 +765,7 @@ struct qdf_mac_addr { * * Return: QDF_STATUS */ -QDF_STATUS qdf_mac_parse(char *mac_str, struct qdf_mac_addr *out_addr); +QDF_STATUS qdf_mac_parse(const char *mac_str, struct qdf_mac_addr *out_addr); #define QDF_IPV4_ADDR_SIZE 4 #define QDF_IPV4_ADDR_STR "%d.%d.%d.%d" @@ -798,7 +798,7 @@ struct qdf_ipv4_addr { * * Return: QDF_STATUS */ -QDF_STATUS qdf_ipv4_parse(char *ipv4_str, struct qdf_ipv4_addr *out_addr); +QDF_STATUS qdf_ipv4_parse(const char *ipv4_str, struct qdf_ipv4_addr *out_addr); #define QDF_IPV6_ADDR_SIZE 16 #define QDF_IPV6_ADDR_HEXTET_COUNT 8 @@ -841,7 +841,7 @@ struct qdf_ipv6_addr { * * Return: QDF_STATUS */ -QDF_STATUS qdf_ipv6_parse(char *ipv6_str, struct qdf_ipv6_addr *out_addr); +QDF_STATUS qdf_ipv6_parse(const char *ipv6_str, struct qdf_ipv6_addr *out_addr); #define QDF_MAX_NUM_CHAN (128) diff --git a/qdf/libc/inc/i_qdf_str.h b/qdf/libc/inc/i_qdf_str.h index 69a140ac06..4e8956c587 100644 --- a/qdf/libc/inc/i_qdf_str.h +++ b/qdf/libc/inc/i_qdf_str.h @@ -25,7 +25,7 @@ #define __I_QDF_STR_H #define __qdf_is_space(c) isspace(c) -char *__qdf_str_left_trim(char *str); +const char *__qdf_str_left_trim(const char *str); char *__qdf_str_trim(char *str); #define __qdf_str_nlen(str, limit) strnlen(str, limit) diff --git a/qdf/libc/inc/qdf_str.c b/qdf/libc/inc/qdf_str.c index 851e9ab6e0..f44a74a943 100644 --- a/qdf/libc/inc/qdf_str.c +++ b/qdf/libc/inc/qdf_str.c @@ -18,7 +18,7 @@ #include "i_qdf_str.h" -char *__qdf_str_left_trim(char *str) +const char *__qdf_str_left_trim(const char *str) { while (qdf_str_is_space(str)) str++; @@ -28,7 +28,7 @@ char *__qdf_str_left_trim(char *str) char *__qdf_str_trim(char *str) { - char *trimmed = qdf_str_left_trim(str); + char *trimmed = (char *)qdf_str_left_trim(str); qdf_str_right_trim(str); diff --git a/qdf/src/qdf_types.c b/qdf/src/qdf_types.c index 46b76d7db3..5886aa5082 100644 --- a/qdf/src/qdf_types.c +++ b/qdf/src/qdf_types.c @@ -23,7 +23,7 @@ #include "qdf_trace.h" #include "qdf_types.h" -static QDF_STATUS qdf_consume_char(char **str, char c) +static QDF_STATUS qdf_consume_char(const char **str, char c) { if ((*str)[0] != c) return QDF_STATUS_E_FAILURE; @@ -33,7 +33,7 @@ static QDF_STATUS qdf_consume_char(char **str, char c) return QDF_STATUS_SUCCESS; } -static QDF_STATUS qdf_consume_dec(char **str, uint8_t *out_digit) +static QDF_STATUS qdf_consume_dec(const char **str, uint8_t *out_digit) { uint8_t c = (*str)[0]; @@ -47,7 +47,7 @@ static QDF_STATUS qdf_consume_dec(char **str, uint8_t *out_digit) return QDF_STATUS_SUCCESS; } -static QDF_STATUS qdf_consume_hex(char **str, uint8_t *out_nibble) +static QDF_STATUS qdf_consume_hex(const char **str, uint8_t *out_nibble) { uint8_t c = (*str)[0]; @@ -65,7 +65,7 @@ static QDF_STATUS qdf_consume_hex(char **str, uint8_t *out_nibble) return QDF_STATUS_SUCCESS; } -static QDF_STATUS qdf_consume_octet_dec(char **str, uint8_t *out_octet) +static QDF_STATUS qdf_consume_octet_dec(const char **str, uint8_t *out_octet) { uint8_t len = 0; uint16_t octet = 0; @@ -96,7 +96,7 @@ static QDF_STATUS qdf_consume_octet_dec(char **str, uint8_t *out_octet) return QDF_STATUS_SUCCESS; } -static QDF_STATUS qdf_consume_hex_pair(char **str, uint8_t *out_byte) +static QDF_STATUS qdf_consume_hex_pair(const char **str, uint8_t *out_byte) { QDF_STATUS status; uint8_t hi, low; @@ -116,7 +116,7 @@ static QDF_STATUS qdf_consume_hex_pair(char **str, uint8_t *out_byte) return QDF_STATUS_SUCCESS; } -static QDF_STATUS qdf_consume_hextet(char **str, uint16_t *out_hextet) +static QDF_STATUS qdf_consume_hextet(const char **str, uint16_t *out_hextet) { uint8_t len = 0; uint16_t hextet = 0; @@ -144,7 +144,7 @@ static QDF_STATUS qdf_consume_hextet(char **str, uint16_t *out_hextet) return QDF_STATUS_SUCCESS; } -static QDF_STATUS qdf_consume_radix(char **str, uint8_t *out_radix) +static QDF_STATUS qdf_consume_radix(const char **str, uint8_t *out_radix) { if ((*str)[0] == '0') { switch ((*str)[1]) { @@ -177,7 +177,7 @@ static QDF_STATUS qdf_consume_radix(char **str, uint8_t *out_radix) } static QDF_STATUS -qdf_int_parse(char *int_str, uint64_t *out_int, bool *out_negate) +qdf_int_parse(const char *int_str, uint64_t *out_int, bool *out_negate) { QDF_STATUS status; bool negate = false; @@ -227,7 +227,7 @@ qdf_int_parse(char *int_str, uint64_t *out_int, bool *out_negate) return QDF_STATUS_SUCCESS; } -QDF_STATUS qdf_int32_parse(char *int_str, int32_t *out_int) +QDF_STATUS qdf_int32_parse(const char *int_str, int32_t *out_int) { QDF_STATUS status; int64_t value; @@ -245,7 +245,7 @@ QDF_STATUS qdf_int32_parse(char *int_str, int32_t *out_int) } qdf_export_symbol(qdf_int32_parse); -QDF_STATUS qdf_uint32_parse(char *int_str, uint32_t *out_int) +QDF_STATUS qdf_uint32_parse(const char *int_str, uint32_t *out_int) { QDF_STATUS status; uint64_t value; @@ -263,7 +263,7 @@ QDF_STATUS qdf_uint32_parse(char *int_str, uint32_t *out_int) } qdf_export_symbol(qdf_uint32_parse); -QDF_STATUS qdf_int64_parse(char *int_str, int64_t *out_int) +QDF_STATUS qdf_int64_parse(const char *int_str, int64_t *out_int) { QDF_STATUS status; bool negate; @@ -290,7 +290,7 @@ QDF_STATUS qdf_int64_parse(char *int_str, int64_t *out_int) } qdf_export_symbol(qdf_int64_parse); -QDF_STATUS qdf_uint64_parse(char *int_str, uint64_t *out_int) +QDF_STATUS qdf_uint64_parse(const char *int_str, uint64_t *out_int) { QDF_STATUS status; bool negate; @@ -309,7 +309,7 @@ QDF_STATUS qdf_uint64_parse(char *int_str, uint64_t *out_int) } qdf_export_symbol(qdf_uint64_parse); -QDF_STATUS qdf_bool_parse(char *bool_str, bool *out_bool) +QDF_STATUS qdf_bool_parse(const char *bool_str, bool *out_bool) { bool value; @@ -349,7 +349,7 @@ QDF_STATUS qdf_bool_parse(char *bool_str, bool *out_bool) } qdf_export_symbol(qdf_bool_parse); -QDF_STATUS qdf_mac_parse(char *mac_str, struct qdf_mac_addr *out_addr) +QDF_STATUS qdf_mac_parse(const char *mac_str, struct qdf_mac_addr *out_addr) { QDF_STATUS status; struct qdf_mac_addr addr; @@ -398,7 +398,7 @@ QDF_STATUS qdf_mac_parse(char *mac_str, struct qdf_mac_addr *out_addr) } qdf_export_symbol(qdf_mac_parse); -QDF_STATUS qdf_ipv4_parse(char *ipv4_str, struct qdf_ipv4_addr *out_addr) +QDF_STATUS qdf_ipv4_parse(const char *ipv4_str, struct qdf_ipv4_addr *out_addr) { QDF_STATUS status; struct qdf_ipv4_addr addr; @@ -441,7 +441,7 @@ QDF_STATUS qdf_ipv4_parse(char *ipv4_str, struct qdf_ipv4_addr *out_addr) } qdf_export_symbol(qdf_ipv4_parse); -QDF_STATUS qdf_ipv6_parse(char *ipv6_str, struct qdf_ipv6_addr *out_addr) +QDF_STATUS qdf_ipv6_parse(const char *ipv6_str, struct qdf_ipv6_addr *out_addr) { QDF_STATUS status; struct qdf_ipv6_addr addr;