From 92820c83b8f4674188209b8c154edc3c1f68cbce Mon Sep 17 00:00:00 2001 From: Juri Glass Date: Thu, 16 Jun 2011 16:47:44 +0200 Subject: [PATCH] renamed mc_sml_buf_get_current_type to sml_buf_get_next_type --- sml/include/sml/sml_shared.h | 2 +- sml/src/sml_attention_response.c | 2 +- sml/src/sml_close_request.c | 2 +- sml/src/sml_close_response.c | 2 +- sml/src/sml_get_list_request.c | 2 +- sml/src/sml_get_list_response.c | 2 +- sml/src/sml_get_profile_pack_request.c | 2 +- sml/src/sml_list.c | 4 ++-- sml/src/sml_message.c | 4 ++-- sml/src/sml_number.c | 2 +- sml/src/sml_octet_string.c | 2 +- sml/src/sml_open_request.c | 2 +- sml/src/sml_open_response.c | 2 +- sml/src/sml_shared.c | 2 +- sml/src/sml_status.c | 2 +- sml/src/sml_time.c | 2 +- sml/src/sml_value.c | 2 +- 17 files changed, 19 insertions(+), 19 deletions(-) diff --git a/sml/include/sml/sml_shared.h b/sml/include/sml/sml_shared.h index dbec18e..e650e81 100644 --- a/sml/include/sml/sml_shared.h +++ b/sml/include/sml/sml_shared.h @@ -88,7 +88,7 @@ void sml_buf_set_type_and_length(sml_buffer *buf, unsigned int type, unsigned in int sml_buf_has_errors(sml_buffer *buf); // Returns the type field of the current byte. -int mc_sml_buf_get_current_type(sml_buffer *buf); +int sml_buf_get_next_type(sml_buffer *buf); // Returns the current byte. unsigned char mc_sml_buf_get_current_byte(sml_buffer *buf); diff --git a/sml/src/sml_attention_response.c b/sml/src/sml_attention_response.c index 0a9618f..f7d65c3 100644 --- a/sml/src/sml_attention_response.c +++ b/sml/src/sml_attention_response.c @@ -24,7 +24,7 @@ sml_attention_response *sml_attention_response_parse(sml_buffer *buf){ sml_attention_response *msg = (sml_attention_response *) malloc(sizeof(sml_attention_response)); memset(msg, 0, sizeof(sml_attention_response)); - if (mc_sml_buf_get_current_type(buf) != SML_TYPE_LIST) { + if (sml_buf_get_next_type(buf) != SML_TYPE_LIST) { buf->error = 1; goto error; } diff --git a/sml/src/sml_close_request.c b/sml/src/sml_close_request.c index 45f3fd7..ecdbf77 100644 --- a/sml/src/sml_close_request.c +++ b/sml/src/sml_close_request.c @@ -39,7 +39,7 @@ sml_close_request * sml_close_request_parse(sml_buffer *buf) { sml_close_request *msg = (sml_close_request *) malloc(sizeof(sml_close_request)); memset(msg, 0, sizeof(sml_close_request)); - if (mc_sml_buf_get_current_type(buf) != SML_TYPE_LIST) { + if (sml_buf_get_next_type(buf) != SML_TYPE_LIST) { buf->error = 1; goto error; } diff --git a/sml/src/sml_close_response.c b/sml/src/sml_close_response.c index aaf264e..67e8169 100644 --- a/sml/src/sml_close_response.c +++ b/sml/src/sml_close_response.c @@ -25,7 +25,7 @@ sml_close_response *sml_close_response_parse(sml_buffer *buf) { sml_close_response *msg = (sml_close_response *) malloc(sizeof(sml_close_response)); memset(msg, 0, sizeof(sml_close_response)); - if (mc_sml_buf_get_current_type(buf) != SML_TYPE_LIST) { + if (sml_buf_get_next_type(buf) != SML_TYPE_LIST) { buf->error = 1; goto error; } diff --git a/sml/src/sml_get_list_request.c b/sml/src/sml_get_list_request.c index 179567f..58aa5f7 100644 --- a/sml/src/sml_get_list_request.c +++ b/sml/src/sml_get_list_request.c @@ -60,7 +60,7 @@ sml_get_list_request *sml_get_list_request_parse(sml_buffer *buf) { sml_get_list_request *msg = (sml_get_list_request *) malloc(sizeof(sml_get_list_request)); memset(msg, 0, sizeof(sml_get_list_request)); - if (mc_sml_buf_get_current_type(buf) != SML_TYPE_LIST) { + if (sml_buf_get_next_type(buf) != SML_TYPE_LIST) { buf->error = 1; goto error; } diff --git a/sml/src/sml_get_list_response.c b/sml/src/sml_get_list_response.c index 579af64..32e54e9 100644 --- a/sml/src/sml_get_list_response.c +++ b/sml/src/sml_get_list_response.c @@ -26,7 +26,7 @@ sml_get_list_response *sml_get_list_response_parse(sml_buffer *buf) { sml_get_list_response *msg = (sml_get_list_response *) malloc(sizeof(sml_get_list_response)); memset(msg, 0, sizeof(sml_get_list_response)); - if (mc_sml_buf_get_current_type(buf) != SML_TYPE_LIST) { + if (sml_buf_get_next_type(buf) != SML_TYPE_LIST) { buf->error = 1; goto error; } diff --git a/sml/src/sml_get_profile_pack_request.c b/sml/src/sml_get_profile_pack_request.c index b892f7f..b5cbc05 100644 --- a/sml/src/sml_get_profile_pack_request.c +++ b/sml/src/sml_get_profile_pack_request.c @@ -76,7 +76,7 @@ sml_get_profile_pack_request *sml_get_profile_pack_request_parse(sml_buffer *buf sml_get_profile_pack_request *msg = (sml_get_profile_pack_request *) malloc(sizeof(sml_get_profile_pack_request)); memset(msg, 0, sizeof(sml_get_profile_pack_request)); - if (mc_sml_buf_get_current_type(buf) != SML_TYPE_LIST) { + if (sml_buf_get_next_type(buf) != SML_TYPE_LIST) { buf->error = 1; goto error; } diff --git a/sml/src/sml_list.c b/sml/src/sml_list.c index b7c11e5..003e344 100644 --- a/sml/src/sml_list.c +++ b/sml/src/sml_list.c @@ -37,7 +37,7 @@ sml_list *sml_list_init(){ sml_list *sml_list_parse(sml_buffer *buf) { int elems, i; - if (mc_sml_buf_get_current_type(buf) != SML_TYPE_LIST) { + if (sml_buf_get_next_type(buf) != SML_TYPE_LIST) { buf->error = 1; return 0; } @@ -49,7 +49,7 @@ sml_list *sml_list_parse(sml_buffer *buf) { for (i = 0; i < elems; i++) { - if (mc_sml_buf_get_current_type(buf) != SML_TYPE_LIST) { + if (sml_buf_get_next_type(buf) != SML_TYPE_LIST) { buf->error = 1; goto error; } diff --git a/sml/src/sml_message.c b/sml/src/sml_message.c index a84b18a..8833c0f 100644 --- a/sml/src/sml_message.c +++ b/sml/src/sml_message.c @@ -42,7 +42,7 @@ sml_message *sml_message_parse(sml_buffer *buf) { sml_message *msg = (sml_message *) malloc(sizeof(sml_message)); memset(msg, 0, sizeof(sml_message)); - if (mc_sml_buf_get_current_type(buf) != SML_TYPE_LIST) { + if (sml_buf_get_next_type(buf) != SML_TYPE_LIST) { buf->error = 1; goto error; } @@ -120,7 +120,7 @@ sml_message_body *sml_message_body_parse(sml_buffer *buf) { sml_message_body *msg_body = (sml_message_body *) malloc(sizeof(sml_message_body)); memset(msg_body, 0, sizeof(sml_message_body)); - if (mc_sml_buf_get_current_type(buf) != SML_TYPE_LIST) { + if (sml_buf_get_next_type(buf) != SML_TYPE_LIST) { buf->error = 1; goto error; } diff --git a/sml/src/sml_number.c b/sml/src/sml_number.c index 4bd36ad..bd20da6 100644 --- a/sml/src/sml_number.c +++ b/sml/src/sml_number.c @@ -25,7 +25,7 @@ u64 mc_sml_parse_number(sml_buffer *buf, unsigned char type, int max_size) { int l, i; u64 n = 0; - if (mc_sml_buf_get_current_type(buf) != type) { + if (sml_buf_get_next_type(buf) != type) { buf->error = 1; return 0; } diff --git a/sml/src/sml_octet_string.c b/sml/src/sml_octet_string.c index 185d6a6..ba513e2 100644 --- a/sml/src/sml_octet_string.c +++ b/sml/src/sml_octet_string.c @@ -82,7 +82,7 @@ void sml_octet_string_free(octet_string *str) { octet_string *sml_octet_string_parse(sml_buffer *buf) { int l; - if (mc_sml_buf_get_current_type(buf) != SML_TYPE_OCTET_STRING) { + if (sml_buf_get_next_type(buf) != SML_TYPE_OCTET_STRING) { buf->error = 1; return 0; } diff --git a/sml/src/sml_open_request.c b/sml/src/sml_open_request.c index 048c661..a89b7a8 100644 --- a/sml/src/sml_open_request.c +++ b/sml/src/sml_open_request.c @@ -72,7 +72,7 @@ sml_open_request *sml_open_request_parse(sml_buffer *buf) { sml_open_request *msg = (sml_open_request *) malloc(sizeof(sml_open_request)); memset(msg, 0, sizeof(sml_open_request)); - if (mc_sml_buf_get_current_type(buf) != SML_TYPE_LIST) { + if (sml_buf_get_next_type(buf) != SML_TYPE_LIST) { buf->error = 1; goto error; } diff --git a/sml/src/sml_open_response.c b/sml/src/sml_open_response.c index c862cec..be3d869 100644 --- a/sml/src/sml_open_response.c +++ b/sml/src/sml_open_response.c @@ -25,7 +25,7 @@ sml_open_response *sml_open_response_parse(sml_buffer *buf) { sml_open_response *msg = (sml_open_response *) malloc(sizeof(sml_open_response)); memset(msg, 0, sizeof(sml_open_response)); - if (mc_sml_buf_get_current_type(buf) != SML_TYPE_LIST) { + if (sml_buf_get_next_type(buf) != SML_TYPE_LIST) { buf->error = 1; goto error; } diff --git a/sml/src/sml_shared.c b/sml/src/sml_shared.c index 6288572..cc569d5 100644 --- a/sml/src/sml_shared.c +++ b/sml/src/sml_shared.c @@ -81,7 +81,7 @@ int sml_buf_has_errors(sml_buffer *buf) { return buf->error != 0; } -int mc_sml_buf_get_current_type(sml_buffer *buf) { +int sml_buf_get_next_type(sml_buffer *buf) { return (buf->buffer[buf->cursor] & SML_TYPE_FIELD); } diff --git a/sml/src/sml_status.c b/sml/src/sml_status.c index 64b9ede..379d68c 100644 --- a/sml/src/sml_status.c +++ b/sml/src/sml_status.c @@ -21,7 +21,7 @@ #include sml_status *sml_status_parse(sml_buffer *buf) { - int type = mc_sml_buf_get_current_type(buf); + int type = sml_buf_get_next_type(buf); unsigned char byte = mc_sml_buf_get_current_byte(buf); sml_status *state = (sml_status *) malloc(sizeof(sml_status)); diff --git a/sml/src/sml_time.c b/sml/src/sml_time.c index c104dbe..e931797 100644 --- a/sml/src/sml_time.c +++ b/sml/src/sml_time.c @@ -25,7 +25,7 @@ sml_time *sml_time_parse(sml_buffer *buf) { sml_time *tme = (sml_time *) malloc(sizeof(sml_time)); - if (mc_sml_buf_get_current_type(buf) != SML_TYPE_LIST) { + if (sml_buf_get_next_type(buf) != SML_TYPE_LIST) { buf->error = 1; goto error; } diff --git a/sml/src/sml_value.c b/sml/src/sml_value.c index c8357fa..b24016d 100644 --- a/sml/src/sml_value.c +++ b/sml/src/sml_value.c @@ -22,7 +22,7 @@ #include sml_value *sml_value_parse(sml_buffer *buf) { - int type = mc_sml_buf_get_current_type(buf); + int type = sml_buf_get_next_type(buf); unsigned char byte = mc_sml_buf_get_current_byte(buf); sml_value *value = (sml_value *) malloc(sizeof(sml_value));