Merge pull request #68 from TokTok/master

Give global variable 'version' a less common name
camgunz · Apr 2, 2022 · 4c3737d · 4c3737d
2 parents fba1ac1 + 074e0df
commit 4c3737d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/cmp.c b/cmp.c
@@ -24,8 +24,8 @@ THE SOFTWARE.
 
 #include "cmp.h"
 
-static const uint32_t version = 20;
-static const uint32_t mp_version = 5;
+static const uint32_t _cmp_version = 20;
+static const uint32_t _cmp_mp_version = 5;
 
 enum {
   POSITIVE_FIXNUM_MARKER = 0x00,
@@ -797,11 +797,11 @@ void cmp_init(cmp_ctx_t *ctx, void *buf, cmp_reader read,
 }
 
 uint32_t cmp_version(void) {
-  return version;
+  return _cmp_version;
 }
 
 uint32_t cmp_mp_version(void) {
-  return mp_version;
+  return _cmp_mp_version;
 }
 
 const char* cmp_strerror(cmp_ctx_t *ctx) {

diff --git a/cmp.h b/cmp.h
@@ -298,7 +298,7 @@ bool cmp_read_str_size(cmp_ctx_t *ctx, uint32_t *size);
 
 /*
  * Reads a string from the backend; according to the spec, the string's data
- * ought to be encoded using UTF-8, 
+ * ought to be encoded using UTF-8, but CMP leaves that job up to the programmer.
  */
 bool cmp_read_str(cmp_ctx_t *ctx, char *data, uint32_t *size);