Rename end() function to avoid potential duplicate with linker symbol

Overdrivr · Dec 14, 2016 · 4bc6c45 · 4bc6c45
1 parent 2476df8
commit 4bc6c45
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/src/telemetry/c/framing.c b/src/telemetry/c/framing.c
@@ -54,7 +54,7 @@ void outgoing_storage(uint8_t * buf, uint32_t bufSize)
   outgoingStorage.size = bufSize;
 }
 
-void begin()
+void begin_frame()
 {
   if(outgoingStorage.size == 0 || outgoingStorage.ptr == NULL)
     return;
@@ -97,7 +97,7 @@ void append4(uint32_t fourbytes)
   append(ptr[3]);
 }
 
-uint32_t end()
+uint32_t end_frame()
 {
   if(outgoingStorage.size == 0 || outgoingStorage.ptr == NULL)
     return 0;

diff --git a/src/telemetry/c/telemetry_core.c b/src/telemetry/c/telemetry_core.c
@@ -192,7 +192,7 @@ uint16_t payload(const void * p, uint32_t size, uint16_t crc)
 void frame(const char * t, TM_type type, const void * data, uint32_t datasize)
 {
   // start new frame
-  begin();
+  begin_frame();
 
   // header
   uint16_t crc = header(type);
@@ -207,7 +207,7 @@ void frame(const char * t, TM_type type, const void * data, uint32_t datasize)
   append2(crc);
 
   // complete frame
-  uint32_t bytesAmount = end();
+  uint32_t bytesAmount = end_frame();
 
   // send data
   send(outgoingBuffer, bytesAmount);

diff --git a/src/telemetry/headers/framing.h b/src/telemetry/headers/framing.h
@@ -9,11 +9,11 @@ void initialize_framing();
 // Set storage for the outgoing frame
 void outgoing_storage(uint8_t * buf, uint32_t bufSize);
 
-void begin();
+void begin_frame();
 void append(uint8_t byte);
 void append2(uint16_t twobytes);
 void append4(uint32_t fourbytes);
-uint32_t end();
+uint32_t end_frame();
 
 // Incoming data
 // Set storage for the incoming data