From 35974730bf21ece053d72b7bf97d4d032fe4072d Mon Sep 17 00:00:00 2001 From: Juri Glass Date: Thu, 16 Jun 2011 16:44:29 +0200 Subject: [PATCH] renamed mc_sml_set_type_and_length to sml_buf_set_type_and_length --- sml/include/sml/sml_shared.h | 2 +- sml/src/sml_boolean.c | 2 +- sml/src/sml_close_request.c | 2 +- sml/src/sml_get_list_request.c | 2 +- sml/src/sml_get_proc_parameter_request.c | 2 +- sml/src/sml_get_profile_pack_request.c | 2 +- sml/src/sml_list.c | 2 +- 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_set_proc_parameter_request.c | 2 +- sml/src/sml_shared.c | 2 +- sml/src/sml_tree.c | 6 +++--- 14 files changed, 17 insertions(+), 17 deletions(-) diff --git a/sml/include/sml/sml_shared.h b/sml/include/sml/sml_shared.h index 7ded4ad..9a887e5 100644 --- a/sml/include/sml/sml_shared.h +++ b/sml/include/sml/sml_shared.h @@ -82,7 +82,7 @@ void sml_buffer_free(sml_buffer *buf); // the value field. int sml_buf_get_next_length(sml_buffer *buf); -void mc_sml_set_type_and_length(sml_buffer *buf, unsigned int type, unsigned int l); +void sml_buf_set_type_and_length(sml_buffer *buf, unsigned int type, unsigned int l); // Checks if a error is occured. int mc_sml_buf_has_errors(sml_buffer *buf); diff --git a/sml/src/sml_boolean.c b/sml/src/sml_boolean.c index 61455bc..43e41a6 100644 --- a/sml/src/sml_boolean.c +++ b/sml/src/sml_boolean.c @@ -26,7 +26,7 @@ sml_boolean sml_boolean_parse(sml_buffer *buf) { } void sml_boolean_write(sml_boolean boolean, sml_buffer *buf) { - mc_sml_set_type_and_length(buf, SML_TYPE_BOOLEAN, 1); + sml_buf_set_type_and_length(buf, SML_TYPE_BOOLEAN, 1); if (boolean == SML_BOOLEAN_FALSE) { buf->buffer[buf->cursor] = SML_BOOLEAN_FALSE; } diff --git a/sml/src/sml_close_request.c b/sml/src/sml_close_request.c index 649bf6b..6403212 100644 --- a/sml/src/sml_close_request.c +++ b/sml/src/sml_close_request.c @@ -28,7 +28,7 @@ sml_close_request *sml_close_request_init() { } void sml_close_request_write(sml_close_request *msg, sml_buffer *buf) { - mc_sml_set_type_and_length(buf, SML_TYPE_LIST, 1); + sml_buf_set_type_and_length(buf, SML_TYPE_LIST, 1); if (msg->global_signature != NULL){ sml_octet_string_write(msg->global_signature,buf); diff --git a/sml/src/sml_get_list_request.c b/sml/src/sml_get_list_request.c index ea7ccf0..91cabe0 100644 --- a/sml/src/sml_get_list_request.c +++ b/sml/src/sml_get_list_request.c @@ -28,7 +28,7 @@ sml_get_list_request* sml_get_list_request_init(){ } void sml_get_list_request_write(sml_get_list_request *msg, sml_buffer *buf) { - mc_sml_set_type_and_length(buf, SML_TYPE_LIST, 5); + sml_buf_set_type_and_length(buf, SML_TYPE_LIST, 5); sml_octet_string_write(msg->client_id, buf); diff --git a/sml/src/sml_get_proc_parameter_request.c b/sml/src/sml_get_proc_parameter_request.c index e575763..62792db 100644 --- a/sml/src/sml_get_proc_parameter_request.c +++ b/sml/src/sml_get_proc_parameter_request.c @@ -29,7 +29,7 @@ sml_get_proc_parameter_request *sml_get_proc_parameter_request_init() { } void sml_get_proc_parameter_request_write(sml_get_proc_parameter_request *msg, sml_buffer *buf) { - mc_sml_set_type_and_length(buf, SML_TYPE_LIST, 5); + sml_buf_set_type_and_length(buf, SML_TYPE_LIST, 5); // optional server_id if (msg->server_id != NULL){ diff --git a/sml/src/sml_get_profile_pack_request.c b/sml/src/sml_get_profile_pack_request.c index e942a62..e01a968 100644 --- a/sml/src/sml_get_profile_pack_request.c +++ b/sml/src/sml_get_profile_pack_request.c @@ -33,7 +33,7 @@ sml_get_profile_pack_request *sml_get_profile_pack_request_init(){ } void sml_get_profile_pack_request_write(sml_get_profile_pack_request *msg, sml_buffer *buf) { - mc_sml_set_type_and_length(buf, SML_TYPE_LIST, 9); + sml_buf_set_type_and_length(buf, SML_TYPE_LIST, 9); // server_id if (msg->server_id != NULL) { diff --git a/sml/src/sml_list.c b/sml/src/sml_list.c index 0618efd..c4c064c 100644 --- a/sml/src/sml_list.c +++ b/sml/src/sml_list.c @@ -100,7 +100,7 @@ error: } void sml_list_write(sml_list *list, sml_buffer *buf){ - mc_sml_set_type_and_length(buf, SML_TYPE_LIST, 1); + sml_buf_set_type_and_length(buf, SML_TYPE_LIST, 1); mc_sml_optional_write(buf); // } diff --git a/sml/src/sml_message.c b/sml/src/sml_message.c index 00ede7e..75fc088 100644 --- a/sml/src/sml_message.c +++ b/sml/src/sml_message.c @@ -99,7 +99,7 @@ void sml_message_free(sml_message *msg) { void sml_message_write(sml_message *msg, sml_buffer *buf) { int msg_start = buf->cursor; - mc_sml_set_type_and_length(buf, SML_TYPE_LIST, 6); + sml_buf_set_type_and_length(buf, SML_TYPE_LIST, 6); sml_octet_string_write(msg->transaction_id, buf); sml_number_write(SML_TYPE_UNSIGNED, SML_TYPE_NUMBER_8, (u64) msg->group_id, buf); sml_number_write(SML_TYPE_UNSIGNED, SML_TYPE_NUMBER_8, (u64) msg->abort_on_error, buf); @@ -176,7 +176,7 @@ sml_message_body *sml_message_body_init(u16 tag, void *data) { } void sml_message_body_write(sml_message_body *message_body, sml_buffer *buf) { - mc_sml_set_type_and_length(buf, SML_TYPE_LIST, 2); + sml_buf_set_type_and_length(buf, SML_TYPE_LIST, 2); sml_number_write(SML_TYPE_UNSIGNED, SML_TYPE_NUMBER_16, (u64) message_body->tag, buf); switch (message_body->tag) { diff --git a/sml/src/sml_number.c b/sml/src/sml_number.c index 8433d35..4bd36ad 100644 --- a/sml/src/sml_number.c +++ b/sml/src/sml_number.c @@ -48,7 +48,7 @@ u64 mc_sml_parse_number(sml_buffer *buf, unsigned char type, int max_size) { } void sml_number_write(unsigned char type, int size, u64 value, sml_buffer *buf) { - mc_sml_set_type_and_length(buf, type, size); + sml_buf_set_type_and_length(buf, type, size); int i; u64 mask = 0xFF; mask <<= (8 * (size - 1)); diff --git a/sml/src/sml_octet_string.c b/sml/src/sml_octet_string.c index a2fac9b..185d6a6 100644 --- a/sml/src/sml_octet_string.c +++ b/sml/src/sml_octet_string.c @@ -99,7 +99,7 @@ octet_string *sml_octet_string_parse(sml_buffer *buf) { } void sml_octet_string_write(octet_string *str, sml_buffer *buf) { - mc_sml_set_type_and_length(buf, SML_TYPE_OCTET_STRING, (unsigned int) str->len); + sml_buf_set_type_and_length(buf, SML_TYPE_OCTET_STRING, (unsigned int) str->len); memcpy(mc_sml_buf_get_current_buf(buf), str->str, str->len); buf->cursor += str->len; } diff --git a/sml/src/sml_open_request.c b/sml/src/sml_open_request.c index e22c42d..2f72cd0 100644 --- a/sml/src/sml_open_request.c +++ b/sml/src/sml_open_request.c @@ -56,7 +56,7 @@ sml_open_request *sml_open_request_init() { } */ void sml_open_request_write(sml_open_request *msg, sml_buffer *buf) { - mc_sml_set_type_and_length(buf, SML_TYPE_LIST, 7); + sml_buf_set_type_and_length(buf, SML_TYPE_LIST, 7); mc_sml_optional_write(buf); sml_octet_string_write(msg->client_id, buf); diff --git a/sml/src/sml_set_proc_parameter_request.c b/sml/src/sml_set_proc_parameter_request.c index 819de40..f1c1c02 100644 --- a/sml/src/sml_set_proc_parameter_request.c +++ b/sml/src/sml_set_proc_parameter_request.c @@ -28,7 +28,7 @@ sml_set_proc_parameter_request *sml_set_proc_parameter_request_init() { } void sml_set_proc_parameter_request_write(sml_set_proc_parameter_request *msg, sml_buffer *buf) { - mc_sml_set_type_and_length(buf, SML_TYPE_LIST, 5); + sml_buf_set_type_and_length(buf, SML_TYPE_LIST, 5); mc_sml_optional_write(buf); mc_sml_optional_write(buf); mc_sml_optional_write(buf); diff --git a/sml/src/sml_shared.c b/sml/src/sml_shared.c index a962edb..bf33c3e 100644 --- a/sml/src/sml_shared.c +++ b/sml/src/sml_shared.c @@ -43,7 +43,7 @@ int sml_buf_get_next_length(sml_buffer *buf) { return length + list; } -void mc_sml_set_type_and_length(sml_buffer *buf, unsigned int type, unsigned int l) { +void sml_buf_set_type_and_length(sml_buffer *buf, unsigned int type, unsigned int l) { // set the type buf->buffer[buf->cursor] |= type; diff --git a/sml/src/sml_tree.c b/sml/src/sml_tree.c index 30e62ea..28e1511 100644 --- a/sml/src/sml_tree.c +++ b/sml/src/sml_tree.c @@ -36,7 +36,7 @@ void sml_tree_path_add_path_entry(sml_tree_path *tree_path, octet_string *entry) void sml_tree_path_write(sml_tree_path *tree_path, sml_buffer *buf) { int i; if (tree_path->path_entries && tree_path->path_entries_len > 0) { - mc_sml_set_type_and_length(buf, SML_TYPE_LIST, tree_path->path_entries_len); + sml_buf_set_type_and_length(buf, SML_TYPE_LIST, tree_path->path_entries_len); for (i = 0; i < tree_path->path_entries_len; i++) { sml_octet_string_write(tree_path->path_entries[i], buf); } @@ -65,7 +65,7 @@ void sml_tree_free(sml_tree *tree){ } void sml_tree_write(sml_tree *tree, sml_buffer *buf) { - mc_sml_set_type_and_length(buf, SML_TYPE_LIST, 3); + sml_buf_set_type_and_length(buf, SML_TYPE_LIST, 3); sml_octet_string_write(tree->parameter_name, buf); // TODO sml_proc_par_value_write(tree->parameter_value, buf); @@ -103,7 +103,7 @@ sml_proc_par_value *sml_proc_par_value_init(u8 tag, void *data) { } void sml_proc_par_value_write(sml_proc_par_value *value, sml_buffer *buf) { - mc_sml_set_type_and_length(buf, SML_TYPE_LIST, 2); + sml_buf_set_type_and_length(buf, SML_TYPE_LIST, 2); sml_number_write(SML_TYPE_UNSIGNED, SML_TYPE_NUMBER_8, (u64) value->tag, buf); switch (value->tag) {