resolve review comments

1 files changed, 5 insertions, 7 deletions

diff --git a/src/librfu_rfu.c b/src/librfu_rfu.c
index 9cd8fe13e..582060f78 100644
--- a/src/librfu_rfu.c
+++ b/src/librfu_rfu.c
@@ -108,19 +108,17 @@ static const struct LLSFStruct llsf_struct[2] = {
     }
 };
 
-#if LIBRFU_VERSION == 1026
-static const char lib_ver[] = "RFU_V1026";
-#else
-static const char lib_ver[] = "RFU_V1024";
-#endif
+#define xstr(s) str(s)
+#define str(s) #s
+const char version_string[] = "RFU_V" xstr(LIBRFU_VERSION);
 
 static const char str_checkMbootLL[] = "RFU-MBOOT";
 
 #define COPY(src, dst, iterator, size) do {         \
     const u16 *_src = (const u16 *)(src);           \
     u16 *_dst = (u16 *)(dst);                       \
-    iterator = (size);                              \
-    while (iterator-- != 0)                         \
+    (iterator) = (size);                            \
+    while ((iterator)-- != 0)                       \
         *_dst++ = *_src++;                          \
 } while (0)