Add more corrections per review

Author: Dmitry Tatarinov

src/nav_msg_glo.c

@@ -18,11 +18,6 @@
 #include <libswiftnav/logging.h>
 #include <libswiftnav/bits.h>
 
-#ifdef UNIT_TEST
-#undef log_error
-#define log_error(...)
-#endif
-
 /* Word Ft (accuracy of measurements), refer to GLO ICD, Table 4.4 */
 const float f_t[] = { 1.0f, 2.0f, 2.5f, 4.0f, 5.0f, 7.0f, 10.0f, 12.0f, 14.0f,
                       16.0f, 32.0f, 64.0f, 128.0f, 256.0f, 512.0f, -1.0f };
@@ -107,12 +102,12 @@ s8 error_detection_glo(const nav_msg_glo_t *n)
 
     return 0; /* The string is good */
 
-  else if ((bit_set > 0 && !c_sum)
+  if ((bit_set > 0 && !c_sum)
            || (0 == bit_set && c_sum)) /* case c) from ICD */
 
     return -1; /* multiple errors, bad string */
 
-  else if (bit_set > 1 && c_sum) { /* case b) from ICD */
+  if (bit_set > 1 && c_sum) {  /* case b) from ICD */
 
     u8 i_corr = (c & 0x7f) + 8 - k; /* define number of bit to be corrected */
 

tests/check_glo_decoder.c

@@ -10,14 +10,15 @@
  * WARRANTIES OF MERCHANTABILITY AND/OR FITNESS FOR A PARTICULAR PURPOSE.
  */
 //#define DEBUG 1
-#define UNIT_TEST
 
 #include <stdio.h>
 #include <check.h>
 #include <math.h>
 #include <string.h>
-#include <nav_msg_glo.c>
 #include <libswiftnav/logging.h>
+#undef log_error
+#define log_error(...)
+#include <nav_msg_glo.c>
 
 nav_msg_glo_t n;
 ephemeris_t e;