commit f13b87bebb36d1c2aaa9b9d358aac5300ff6e025
author Radek Krejci <rkrejci@cesnet.cz> Tue Dec 01 22:02:17 2020 +0100
committer Michal Vasko <mvasko@cesnet.cz> Wed Dec 02 12:20:04 2020 +0100
tree 67025b56916d0a5ec5ed5ed668e9540ea5417902
parent e9ff43b37b86f73db7db8991474f479656068587

libyang REFACTOR avoid constant literals

Improve readability of the code.

Includes also unification of "no break in the case" comment to "fall
through".

src/printer_lyb.c

diff --git a/src/printer_lyb.c b/src/printer_lyb.c
index 12da019..01d35f4 100644
--- a/src/printer_lyb.c
+++ b/src/printer_lyb.c
@@ -267,8 +267,8 @@
 
         if (full) {
             /* write the meta information (inner chunk count and chunk size) */
-            meta_buf[0] = full->written & 0xFF;
-            meta_buf[1] = full->inner_chunks & 0xFF;
+            meta_buf[0] = full->written & LYB_BYTE_MASK;
+            meta_buf[1] = full->inner_chunks & LYB_BYTE_MASK;
             LY_CHECK_RET(ly_write_skipped(out, full->position, (char *)meta_buf, LYB_META_BYTES));
 
             /* zero written and inner chunks */
@@ -305,8 +305,8 @@
     uint8_t meta_buf[LYB_META_BYTES];
 
     /* write the meta chunk information */
-    meta_buf[0] = LYB_LAST_SUBTREE(lybctx).written & 0xFF;
-    meta_buf[1] = LYB_LAST_SUBTREE(lybctx).inner_chunks & 0xFF;
+    meta_buf[0] = LYB_LAST_SUBTREE(lybctx).written & LYB_BYTE_MASK;
+    meta_buf[1] = LYB_LAST_SUBTREE(lybctx).inner_chunks & LYB_BYTE_MASK;
     LY_CHECK_RET(ly_write_skipped(out, LYB_LAST_SUBTREE(lybctx).position, (char *)&meta_buf, LYB_META_BYTES));
 
     LY_ARRAY_DECREMENT(lybctx->subtrees);
@@ -432,17 +432,17 @@
     revision = 0;
     if (mod && mod->revision) {
         int r = atoi(mod->revision);
-        r -= 2000;
-        r <<= 9;
+        r -= LYB_REV_YEAR_OFFSET;
+        r <<= LYB_REV_YEAR_SHIFT;
 
         revision |= r;
 
-        r = atoi(mod->revision + 5);
-        r <<= 5;
+        r = atoi(mod->revision + ly_strlen_const("YYYY-"));
+        r <<= LYB_REV_MONTH_SHIFT;
 
         revision |= r;
 
-        r = atoi(mod->revision + 8);
+        r = atoi(mod->revision + ly_strlen_const("YYYY-MM-"));
 
         revision |= r;
     }
@@ -514,12 +514,8 @@
 static LY_ERR
 lyb_print_magic_number(struct ly_out *out)
 {
-    char magic_number[3];
-
     /* 'l', 'y', 'b' - 0x6c7962 */
-    magic_number[0] = 'l';
-    magic_number[1] = 'y';
-    magic_number[2] = 'b';
+    char magic_number[] = {'l', 'y', 'b'};
 
     LY_CHECK_RET(ly_write_(out, magic_number, 3));