From a31efa8215fcfdc15e0c56b29f3324838f77daca Mon Sep 17 00:00:00 2001
From: Juri Glass <juri.glass@dai-labor.de>
Date: Thu, 16 Jun 2011 16:49:19 +0200
Subject: [PATCH] renamed mc_sml_buf_get_current_byte to
 sml_buf_get_current_byte

---
 sml/include/sml/sml_shared.h | 2 +-
 sml/src/sml.c                | 2 +-
 sml/src/sml_message.c        | 2 +-
 sml/src/sml_number.c         | 2 +-
 sml/src/sml_shared.c         | 8 ++++----
 sml/src/sml_status.c         | 2 +-
 sml/src/sml_value.c          | 2 +-
 7 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/sml/include/sml/sml_shared.h b/sml/include/sml/sml_shared.h
index e650e81..c7c9d82 100644
--- a/sml/include/sml/sml_shared.h
+++ b/sml/include/sml/sml_shared.h
@@ -91,7 +91,7 @@ int sml_buf_has_errors(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);
+unsigned char sml_buf_get_current_byte(sml_buffer *buf);
 
 // Returns a pointer to the current buffer position.
 unsigned char *mc_sml_buf_get_current_buf(sml_buffer *buf);
diff --git a/sml/src/sml.c b/sml/src/sml.c
index 6c012f2..83826b6 100644
--- a/sml/src/sml.c
+++ b/sml/src/sml.c
@@ -64,7 +64,7 @@ sml_file *sml_file_parse(unsigned char *buffer, size_t buffer_len) {
     // parsing all messages
     for (; buf->cursor < buf->buffer_len;) {
         
-        if(mc_sml_buf_get_current_byte(buf) == SML_MESSAGE_END) {
+        if(sml_buf_get_current_byte(buf) == SML_MESSAGE_END) {
             // reading trailing zeroed bytes
             mc_sml_buf_update_read_bytes(buf, 1);
             continue;
diff --git a/sml/src/sml_message.c b/sml/src/sml_message.c
index 8833c0f..75461f6 100644
--- a/sml/src/sml_message.c
+++ b/sml/src/sml_message.c
@@ -67,7 +67,7 @@ sml_message *sml_message_parse(sml_buffer *buf) {
 	msg->crc = mc_sml_parse_u16(buf);
 	if (sml_buf_has_errors(buf)) goto error;
 	
-	if (mc_sml_buf_get_current_byte(buf) == SML_MESSAGE_END) {
+	if (sml_buf_get_current_byte(buf) == SML_MESSAGE_END) {
 		mc_sml_buf_update_read_bytes(buf, 1);
 	}
 	return msg;
diff --git a/sml/src/sml_number.c b/sml/src/sml_number.c
index bd20da6..e5a6960 100644
--- a/sml/src/sml_number.c
+++ b/sml/src/sml_number.c
@@ -41,7 +41,7 @@ u64 mc_sml_parse_number(sml_buffer *buf, unsigned char type, int max_size) {
 	//					 maybe this one is fixed too?
 	for (i = 0; i < l; i++) {
 		n <<= 8;
-		n |= mc_sml_buf_get_current_byte(buf);
+		n |= sml_buf_get_current_byte(buf);
 		mc_sml_buf_update_read_bytes(buf, 1);
 	}
 	return n;
diff --git a/sml/src/sml_shared.c b/sml/src/sml_shared.c
index cc569d5..5cb0a6e 100644
--- a/sml/src/sml_shared.c
+++ b/sml/src/sml_shared.c
@@ -23,11 +23,11 @@
 
 int sml_buf_get_next_length(sml_buffer *buf) {
 	int length = 0;
-	unsigned char byte = mc_sml_buf_get_current_byte(buf);
+	unsigned char byte = sml_buf_get_current_byte(buf);
 	int list = ((byte & SML_TYPE_FIELD) == SML_TYPE_LIST) ? 0 : -1;
 	
 	for (;buf->cursor < buf->buffer_len;) {
-		byte = mc_sml_buf_get_current_byte(buf);
+		byte = sml_buf_get_current_byte(buf);
 		length <<= 4;
 		length |= (byte & SML_LENGTH_FIELD);
 		
@@ -85,7 +85,7 @@ int sml_buf_get_next_type(sml_buffer *buf) {
 	return (buf->buffer[buf->cursor] & SML_TYPE_FIELD);
 }
 
-unsigned char mc_sml_buf_get_current_byte(sml_buffer *buf) {
+unsigned char sml_buf_get_current_byte(sml_buffer *buf) {
 	return buf->buffer[buf->cursor];
 }
 
@@ -122,7 +122,7 @@ void sml_buffer_free(sml_buffer *buf) {
 }
 
 int mc_sml_is_optional_skipped(sml_buffer *buf) {
-	if (mc_sml_buf_get_current_byte(buf) == SML_OPTIONAL_SKIPPED) {
+	if (sml_buf_get_current_byte(buf) == SML_OPTIONAL_SKIPPED) {
 		mc_sml_buf_update_read_bytes(buf, 1);
 		return 1;
 	}
diff --git a/sml/src/sml_status.c b/sml/src/sml_status.c
index 379d68c..7e653c3 100644
--- a/sml/src/sml_status.c
+++ b/sml/src/sml_status.c
@@ -22,7 +22,7 @@
 
 sml_status *sml_status_parse(sml_buffer *buf) {
 	int type = sml_buf_get_next_type(buf);
-	unsigned char byte = mc_sml_buf_get_current_byte(buf);
+	unsigned char byte = sml_buf_get_current_byte(buf);
 	
 	sml_status *state = (sml_status *) malloc(sizeof(sml_status));
 	switch (type) {
diff --git a/sml/src/sml_value.c b/sml/src/sml_value.c
index b24016d..a549e19 100644
--- a/sml/src/sml_value.c
+++ b/sml/src/sml_value.c
@@ -23,7 +23,7 @@
 
 sml_value *sml_value_parse(sml_buffer *buf) {
 	int type = sml_buf_get_next_type(buf);
-	unsigned char byte = mc_sml_buf_get_current_byte(buf);
+	unsigned char byte = sml_buf_get_current_byte(buf);
 	
 	sml_value *value = (sml_value *) malloc(sizeof(sml_value));
     value->type = type;