commit b97582ac026d04f4082e8c73b87f100d476aaee3
author Vipul Rahane <vipulrahane@apache.org> Wed Jan 15 17:31:10 2020 -0800
committer GitHub <noreply@github.com> Wed Jan 15 17:31:10 2020 -0800
tree fbdd8cadd3e9dac9693f5f1656d653972bfd4e21
parent 2424f043a093e8ac352164a2a191260400d601cb
parent 5f2be3d07d28ec4dc4da33f1e2797b90d172d2f1

Merge pull request #55 from vrahane/remove_log_version_2

cmd/log_mgmt: Remove support for LOG_VERSION 2

cmd/img_mgmt/port/mynewt/src/mynewt_img_mgmt_log.c

diff --git a/cmd/img_mgmt/port/mynewt/src/mynewt_img_mgmt_log.c b/cmd/img_mgmt/port/mynewt/src/mynewt_img_mgmt_log.c
index ad4cfd8..c74d8b8 100644
--- a/cmd/img_mgmt/port/mynewt/src/mynewt_img_mgmt_log.c
+++ b/cmd/img_mgmt/port/mynewt/src/mynewt_img_mgmt_log.c
@@ -71,8 +71,7 @@
 static int
 img_mgmt_log_gen(const char *ev, int status, const uint8_t *hash)
 {
-#if MYNEWT_VAL(LOG_VERSION) > 2 && \
-    LOG_MOD_LEVEL_IS_ACTIVE(MYNEWT_VAL(IMG_MGMT_LOG_LVL), LOG_LEVEL_INFO)
+#if LOG_MOD_LEVEL_IS_ACTIVE(MYNEWT_VAL(IMG_MGMT_LOG_LVL), LOG_LEVEL_INFO)
 
     struct os_mbuf *om;
     int rc;

cmd/log_mgmt/port/mynewt/src/mynewt_log_mgmt.c

diff --git a/cmd/log_mgmt/port/mynewt/src/mynewt_log_mgmt.c b/cmd/log_mgmt/port/mynewt/src/mynewt_log_mgmt.c
index 33dd774..6bdf6fb 100644
--- a/cmd/log_mgmt/port/mynewt/src/mynewt_log_mgmt.c
+++ b/cmd/log_mgmt/port/mynewt/src/mynewt_log_mgmt.c
@@ -192,15 +192,10 @@
     entry.module = leh->ue_module;
     entry.level = leh->ue_level;
 
-#if MYNEWT_VAL(LOG_VERSION) < 3
-    entry.type = LOG_ETYPE_STRING;
-    entry.flags = 0;
-#else
     entry.type = leh->ue_etype;
     entry.flags = leh->ue_flags;
     entry.imghash = (leh->ue_flags & LOG_FLAGS_IMG_HASH) ?
         leh->ue_imghash : NULL;
-#endif
     entry.len = len;
     entry.data = mynewt_log_mgmt_walk_arg->chunk;
 

cmd/log_mgmt/src/log_mgmt.c

diff --git a/cmd/log_mgmt/src/log_mgmt.c b/cmd/log_mgmt/src/log_mgmt.c
index 42343a5..9f24b72 100644
--- a/cmd/log_mgmt/src/log_mgmt.c
+++ b/cmd/log_mgmt/src/log_mgmt.c
@@ -95,7 +95,6 @@
     if (entry->offset == 0) {
         err |= cbor_encoder_create_map(enc, &lmec->mapenc, CborIndefiniteLength);
 
-#if MYNEWT_VAL(LOG_VERSION) > 2
         switch (entry->type) {
         case LOG_MGMT_ETYPE_CBOR:
             err |= cbor_encode_text_stringz(&lmec->mapenc, "type");
@@ -112,7 +111,6 @@
         default:
             return LOG_MGMT_ERR_ECORRUPT;
         }
-#endif
         err |= cbor_encode_text_stringz(&lmec->mapenc, "ts");
         err |= cbor_encode_int(&lmec->mapenc, entry->ts);
         err |= cbor_encode_text_stringz(&lmec->mapenc, "level");
@@ -127,7 +125,6 @@
                                            LOG_MGMT_IMG_HASHLEN);
         }
 
-#if MYNEWT_VAL(LOG_VERSION) > 2
         err |= cbor_encode_text_stringz(&lmec->mapenc, "msg");
 
         /*
@@ -150,10 +147,6 @@
             err |= cbor_encode_byte_string(&lmec->msgenc, entry->data, entry->chunklen);
             bytes_encoded = entry->chunklen;
         }
-#else
-        err |= cbor_encode_text_stringz(&lmec->mapenc, "msg");
-        err |= cbor_encode_text_stringz(&lmec->mapenc, (char *)data);
-#endif
     } else {
         /*
          * The else case is executed for non-first chunks of data to be encoded
@@ -230,9 +223,7 @@
              * message in the "msg" field of the response
              */
             if (ctxt->counter == 0) {
-#if MYNEWT_VAL(LOG_VERSION) > 2
                 entry->type = LOG_ETYPE_STRING;
-#endif
                 snprintf((char *)entry->data, LOG_MGMT_MAX_RSP_LEN,
                          "error: entry too large (%zu bytes)", entry_len);
             }