michaelh/zephyr
1
0
Fork 0
Code Releases Activity

misc: Replace assert include and calls by sys/__assert.h equivalent

Browse source 
Replace all calls to the assert macro that comes from libc by calls to
__ASSERT_NO_MSG(). This is usefull as the former might be different
depending on the libc used and the later can be customized to reduce
flash footprint.

Signed-off-by: Xavier Chapron <xavier.chapron@stimio.fr>
This commit is contained in:
Xavier Chapron 2020-09-22 14:42:43 +02:00 • committed by Carles Cufí
commit 824f423e54
35 changed files with 83 additions and 93 deletions
Download patch file Download diff file Expand all files Collapse all files

52
subsys/net/lib/http/http_parser.c
View file

@ -22,7 +22,7 @@
* IN THE SOFTWARE.
*/
#include <net/http_parser.h>
#include <assert.h>
#include <sys/__assert.h>
#include <stddef.h>
#include <ctype.h>
#include <stdlib.h>
@ -204,7 +204,7 @@ static inline
int cb_notify(struct http_parser *parser, enum state *current_state, http_cb cb,
int cb_error, size_t *parsed, size_t already_parsed)
{
assert(HTTP_PARSER_ERRNO(parser) == HPE_OK);
__ASSERT_NO_MSG(HTTP_PARSER_ERRNO(parser) == HPE_OK);
if (cb == NULL) {
return 0;
@ -231,7 +231,7 @@ int cb_data(struct http_parser *parser, http_data_cb cb, int cb_error,
{
int rc;
assert(HTTP_PARSER_ERRNO(parser) == HPE_OK);
__ASSERT_NO_MSG(HTTP_PARSER_ERRNO(parser) == HPE_OK);
if (*mark == NULL) {
return 0;
}
@ -468,7 +468,7 @@ int parser_header_state(struct http_parser *parser, char ch, char c)
break;
default:
assert(0 && "Unknown header_state");
__ASSERT_NO_MSG(0 && "Unknown header_state");
break;
}
return 0;
@ -510,7 +510,7 @@ int header_states(struct http_parser *parser, const char *data, size_t len,
case h_connection:
case h_transfer_encoding:
assert(0 && "Shouldn't get here.");
__ASSERT_NO_MSG(0 && "Shouldn't get here.");
break;
case h_content_length: {
@ -1948,7 +1948,7 @@ reexecute:
uint64_t to_read = MIN(parser->content_length,
(uint64_t) ((data + len) - p));
assert(parser->content_length != 0U
__ASSERT_NO_MSG(parser->content_length != 0U
&& parser->content_length != ULLONG_MAX);
/* The difference between advancing content_length and
@ -2026,8 +2026,8 @@ reexecute:
break;
case s_chunk_size_start: {
assert(parser->nread == 1U);
assert(parser->flags & F_CHUNKED);
__ASSERT_NO_MSG(parser->nread == 1U);
__ASSERT_NO_MSG(parser->flags & F_CHUNKED);
unhex_val = unhex[(unsigned char)ch];
if (UNLIKELY(unhex_val == -1)) {
@ -2043,7 +2043,7 @@ reexecute:
case s_chunk_size: {
uint64_t t;
assert(parser->flags & F_CHUNKED);
__ASSERT_NO_MSG(parser->flags & F_CHUNKED);
if (ch == CR) {
UPDATE_STATE(s_chunk_size_almost_done);
@ -2081,7 +2081,7 @@ reexecute:
}
case s_chunk_parameters: {
assert(parser->flags & F_CHUNKED);
__ASSERT_NO_MSG(parser->flags & F_CHUNKED);
/* just ignore this shit. TODO check for overflow */
if (ch == CR) {
UPDATE_STATE(s_chunk_size_almost_done);
@ -2091,7 +2091,7 @@ reexecute:
}
case s_chunk_size_almost_done: {
assert(parser->flags & F_CHUNKED);
__ASSERT_NO_MSG(parser->flags & F_CHUNKED);
rc = strict_check(parser, ch != LF);
if (rc != 0) {
@ -2121,9 +2121,9 @@ reexecute:
uint64_t to_read = MIN(parser->content_length,
(uint64_t) ((data + len) - p));
assert(parser->flags & F_CHUNKED);
assert(parser->content_length != 0U
&& parser->content_length != ULLONG_MAX);
__ASSERT_NO_MSG(parser->flags & F_CHUNKED);
__ASSERT_NO_MSG(parser->content_length != 0U
&& parser->content_length != ULLONG_MAX);
/* See the explanation in s_body_identity for why the
* content
@ -2141,8 +2141,8 @@ reexecute:
}
case s_chunk_data_almost_done:
assert(parser->flags & F_CHUNKED);
assert(parser->content_length == 0U);
__ASSERT_NO_MSG(parser->flags & F_CHUNKED);
__ASSERT_NO_MSG(parser->content_length == 0U);
rc = strict_check(parser, ch != CR);
if (rc != 0) {
goto error;
@ -2158,7 +2158,7 @@ reexecute:
break;
case s_chunk_data_done:
assert(parser->flags & F_CHUNKED);
__ASSERT_NO_MSG(parser->flags & F_CHUNKED);
rc = strict_check(parser, ch != LF);
if (rc != 0) {
goto error;
@ -2176,7 +2176,7 @@ reexecute:
break;
default:
assert(0 && "unhandled state");
__ASSERT_NO_MSG(0 && "unhandled state");
SET_ERRNO(HPE_INVALID_INTERNAL_STATE);
goto error;
}
@ -2195,11 +2195,11 @@ reexecute:
* value that's in-bounds).
*/
assert(((header_field_mark ? 1 : 0) +
(header_value_mark ? 1 : 0) +
(url_mark ? 1 : 0) +
(body_mark ? 1 : 0) +
(status_mark ? 1 : 0)) <= 1);
__ASSERT_NO_MSG(((header_field_mark ? 1 : 0) +
(header_value_mark ? 1 : 0) +
(url_mark ? 1 : 0) +
(body_mark ? 1 : 0) +
(status_mark ? 1 : 0)) <= 1);
rc = cb_data(parser, settings->on_header_field, HPE_CB_header_field,
&p_state, parsed, p - data, &header_field_mark,
@ -2323,14 +2323,14 @@ void http_parser_settings_init(struct http_parser_settings *settings)
const char *http_errno_name(enum http_errno err)
{
assert(((size_t) err) < ARRAY_SIZE(http_strerror_tab));
__ASSERT_NO_MSG(((size_t) err) < ARRAY_SIZE(http_strerror_tab));
return http_strerror_tab[err].name;
}
const char *http_errno_description(enum http_errno err)
{
assert(((size_t) err) < ARRAY_SIZE(http_strerror_tab));
__ASSERT_NO_MSG(((size_t) err) < ARRAY_SIZE(http_strerror_tab));
return http_strerror_tab[err].description;
}
@ -2347,7 +2347,7 @@ void http_parser_pause(struct http_parser *parser, int paused)
HTTP_PARSER_ERRNO(parser) == HPE_PAUSED) {
SET_ERRNO((paused) ? HPE_PAUSED : HPE_OK);
} else {
assert(0 && "Attempting to pause parser in error state");
__ASSERT_NO_MSG(0 && "Attempting to pause parser in error state");
}
}

6
subsys/net/lib/http/http_parser_url.c
View file

@ -21,7 +21,7 @@
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
* IN THE SOFTWARE.
*/
#include <assert.h>
#include <sys/__assert.h>
#include <stddef.h>
#include <ctype.h>
#include <stdlib.h>
@ -385,7 +385,7 @@ int http_parse_host(const char *buf, struct http_parser_url *u,
const char *p;
buflen = u->field_data[UF_HOST].off + u->field_data[UF_HOST].len;
assert(u->field_set & (1 << UF_HOST));
__ASSERT_NO_MSG(u->field_set & (1 << UF_HOST));
u->field_data[UF_HOST].len = 0U;
@ -521,7 +521,7 @@ http_parser_parse_url(const char *buf, size_t buflen, int is_connect,
break;
default:
assert(!"Unexpected state");
__ASSERT_NO_MSG(!"Unexpected state");
return 1;
}