From f6a9c978ba7f683dc71e032bf73e9a130492b46a Mon Sep 17 00:00:00 2001 From: Juri Glass Date: Thu, 16 Jun 2011 16:52:41 +0200 Subject: [PATCH] renamed mc_sml_optional_write to sml_buf_optional_write --- sml/include/sml/sml_shared.h | 2 +- sml/src/sml_close_request.c | 2 +- sml/src/sml_get_list_request.c | 8 ++++---- sml/src/sml_get_proc_parameter_request.c | 6 +++--- sml/src/sml_get_profile_pack_request.c | 16 ++++++++-------- sml/src/sml_list.c | 2 +- sml/src/sml_open_request.c | 4 ++-- sml/src/sml_set_proc_parameter_request.c | 6 +++--- sml/src/sml_shared.c | 2 +- sml/src/sml_time.c | 2 +- sml/src/sml_tree.c | 4 ++-- 11 files changed, 27 insertions(+), 27 deletions(-) diff --git a/sml/include/sml/sml_shared.h b/sml/include/sml/sml_shared.h index fbd8cc7..02e762b 100644 --- a/sml/include/sml/sml_shared.h +++ b/sml/include/sml/sml_shared.h @@ -96,7 +96,7 @@ unsigned char sml_buf_get_current_byte(sml_buffer *buf); // Returns a pointer to the current buffer position. unsigned char *sml_buf_get_current_buf(sml_buffer *buf); -void mc_sml_optional_write(sml_buffer *buf); +void sml_buf_optional_write(sml_buffer *buf); // Sets the number of bytes read (moves the cursor forward) void mc_sml_buf_update_read_bytes(sml_buffer *buf, int bytes); diff --git a/sml/src/sml_close_request.c b/sml/src/sml_close_request.c index ecdbf77..66bee57 100644 --- a/sml/src/sml_close_request.c +++ b/sml/src/sml_close_request.c @@ -32,7 +32,7 @@ void sml_close_request_write(sml_close_request *msg, sml_buffer *buf) { if (msg->global_signature != NULL){ sml_octet_string_write(msg->global_signature,buf); - } else mc_sml_optional_write(buf); + } else sml_buf_optional_write(buf); } sml_close_request * sml_close_request_parse(sml_buffer *buf) { diff --git a/sml/src/sml_get_list_request.c b/sml/src/sml_get_list_request.c index 58aa5f7..37aca53 100644 --- a/sml/src/sml_get_list_request.c +++ b/sml/src/sml_get_list_request.c @@ -35,22 +35,22 @@ void sml_get_list_request_write(sml_get_list_request *msg, sml_buffer *buf) { // optional server_id if (msg->server_id != NULL){ sml_octet_string_write(msg->server_id, buf); - } else mc_sml_optional_write(buf); + } else sml_buf_optional_write(buf); // optional username if (msg->username != NULL){ sml_octet_string_write(msg->username, buf); - } else mc_sml_optional_write(buf); + } else sml_buf_optional_write(buf); // optional password if (msg->password != NULL){ sml_octet_string_write(msg->password, buf); - } else mc_sml_optional_write(buf); + } else sml_buf_optional_write(buf); // optional list_name if (msg->list_name != NULL){ sml_octet_string_write(msg->list_name,buf); - } else mc_sml_optional_write(buf); + } else sml_buf_optional_write(buf); } diff --git a/sml/src/sml_get_proc_parameter_request.c b/sml/src/sml_get_proc_parameter_request.c index 62792db..8309816 100644 --- a/sml/src/sml_get_proc_parameter_request.c +++ b/sml/src/sml_get_proc_parameter_request.c @@ -34,17 +34,17 @@ void sml_get_proc_parameter_request_write(sml_get_proc_parameter_request *msg, s // optional server_id if (msg->server_id != NULL){ sml_octet_string_write(msg->server_id, buf); - } else mc_sml_optional_write(buf); + } else sml_buf_optional_write(buf); // optional username if (msg->username != NULL) { sml_octet_string_write(msg->username, buf); - } else mc_sml_optional_write(buf); + } else sml_buf_optional_write(buf); // optional password if (msg->password != NULL){ sml_octet_string_write(msg->password, buf); - } else mc_sml_optional_write(buf); + } else sml_buf_optional_write(buf); sml_tree_path_write(msg->parameter_tree_path, buf); diff --git a/sml/src/sml_get_profile_pack_request.c b/sml/src/sml_get_profile_pack_request.c index b5cbc05..f442739 100644 --- a/sml/src/sml_get_profile_pack_request.c +++ b/sml/src/sml_get_profile_pack_request.c @@ -38,35 +38,35 @@ void sml_get_profile_pack_request_write(sml_get_profile_pack_request *msg, sml_b // server_id if (msg->server_id != NULL) { sml_octet_string_write(msg->server_id,buf); - } else mc_sml_optional_write(buf); + } else sml_buf_optional_write(buf); // username if (msg->username != NULL) { sml_octet_string_write(msg->username,buf); - } else mc_sml_optional_write(buf); + } else sml_buf_optional_write(buf); // password if (msg->password != NULL) { sml_octet_string_write(msg->password,buf); - } else mc_sml_optional_write(buf); + } else sml_buf_optional_write(buf); // with_rawdata if (msg->with_rawdata != NULL) { printf("TODO: %s - comparision is not valid", __FUNCTION__); sml_boolean_write(msg->with_rawdata,buf); - } else mc_sml_optional_write(buf); // with_rawdata + } else sml_buf_optional_write(buf); // with_rawdata // begin_time if (msg->begin_time != NULL){ sml_time_write(msg->begin_time, buf); - } else mc_sml_optional_write(buf); // begin_time - mc_sml_optional_write(buf); // end_time + } else sml_buf_optional_write(buf); // begin_time + sml_buf_optional_write(buf); // end_time // parameter_tree_path is not optional sml_tree_path_write(msg->parameter_tree_path, buf); - mc_sml_optional_write(buf); // object_list - mc_sml_optional_write(buf); // das_details + sml_buf_optional_write(buf); // object_list + sml_buf_optional_write(buf); // das_details printf("request_write"); } diff --git a/sml/src/sml_list.c b/sml/src/sml_list.c index 003e344..f39f093 100644 --- a/sml/src/sml_list.c +++ b/sml/src/sml_list.c @@ -101,7 +101,7 @@ error: void sml_list_write(sml_list *list, sml_buffer *buf){ sml_buf_set_type_and_length(buf, SML_TYPE_LIST, 1); - mc_sml_optional_write(buf); + sml_buf_optional_write(buf); // } diff --git a/sml/src/sml_open_request.c b/sml/src/sml_open_request.c index a89b7a8..a538506 100644 --- a/sml/src/sml_open_request.c +++ b/sml/src/sml_open_request.c @@ -58,13 +58,13 @@ sml_open_request *sml_open_request_init() { void sml_open_request_write(sml_open_request *msg, sml_buffer *buf) { sml_buf_set_type_and_length(buf, SML_TYPE_LIST, 7); - mc_sml_optional_write(buf); + sml_buf_optional_write(buf); sml_octet_string_write(msg->client_id, buf); sml_octet_string_write(msg->req_file_id, buf); sml_octet_string_write(msg->server_id, buf); sml_octet_string_write(msg->username,buf); sml_octet_string_write(msg->password,buf); - mc_sml_optional_write(buf); + sml_buf_optional_write(buf); } diff --git a/sml/src/sml_set_proc_parameter_request.c b/sml/src/sml_set_proc_parameter_request.c index f1c1c02..b9e4a5e 100644 --- a/sml/src/sml_set_proc_parameter_request.c +++ b/sml/src/sml_set_proc_parameter_request.c @@ -29,9 +29,9 @@ 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) { 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); + sml_buf_optional_write(buf); + sml_buf_optional_write(buf); + sml_buf_optional_write(buf); sml_tree_path_write(msg->parameter_tree_path, buf); sml_tree_write(msg->parameter_tree, buf); } diff --git a/sml/src/sml_shared.c b/sml/src/sml_shared.c index ab70654..425cec0 100644 --- a/sml/src/sml_shared.c +++ b/sml/src/sml_shared.c @@ -106,7 +106,7 @@ sml_buffer *sml_buffer_init(size_t length) { return buf; } -void mc_sml_optional_write(sml_buffer *buf) { +void sml_buf_optional_write(sml_buffer *buf) { buf->buffer[buf->cursor] = SML_OPTIONAL_SKIPPED; buf->cursor++; } diff --git a/sml/src/sml_time.c b/sml/src/sml_time.c index e931797..7a934ac 100644 --- a/sml/src/sml_time.c +++ b/sml/src/sml_time.c @@ -50,7 +50,7 @@ error: void sml_time_write(sml_time *time, sml_buffer *buf){ printf("NYI: %s (writing optional flag instead)\n", __FUNCTION__); - mc_sml_optional_write(buf); + sml_buf_optional_write(buf); } void sml_time_free(sml_time *time) { diff --git a/sml/src/sml_tree.c b/sml/src/sml_tree.c index 28e1511..fd24761 100644 --- a/sml/src/sml_tree.c +++ b/sml/src/sml_tree.c @@ -69,8 +69,8 @@ void sml_tree_write(sml_tree *tree, sml_buffer *buf) { sml_octet_string_write(tree->parameter_name, buf); // TODO sml_proc_par_value_write(tree->parameter_value, buf); - //mc_sml_optional_write(buf); - mc_sml_optional_write(buf); + //sml_buf_optional_write(buf); + sml_buf_optional_write(buf); } sml_proc_par_value *sml_proc_par_value_init(u8 tag, void *data) {