fix some log levels

Author: 7Ji

include/common.h

@@ -8,6 +8,7 @@
 #include <stdint.h>
 #include <stdbool.h>
 #include <errno.h>
+#include <string.h>
 #include <inttypes.h>
 
 /* Defitition */

src/cli.c

@@ -559,7 +559,7 @@ cli_write_ept(
         close(fd);
         return 5;
     }
-    prln_error("write successful");
+    prln_info("write successful");
     if (cli_options.rereadpart) {
         prln_error("trying to tell kernel to re-read partitions");
         /* Just don't care about return value */
@@ -612,7 +612,7 @@ cli_mode_dtoe(
     ept_report(&table_new);
 #ifdef CLI_LAZY_WRITE
     if (table && !ept_compare_table(table, &table_new)) {
-        prln_error("new table is the same as the old table, no need to update");
+        prln_info("new table is the same as the old table, no need to update");
         return 0;
     }
 #endif
@@ -628,7 +628,7 @@ int
 cli_mode_epedantic(
     struct ept_table const * const  table
 ){
-    prln_error("check if EPT is pedantic");
+    prln_info("check if EPT is pedantic");
     if (!table || !table->partitions_count || ept_valid_table(table)) {
         prln_error("EPT does not exist or is invalid, refuse to work");
         return -1;
@@ -725,7 +725,7 @@ cli_write_ept_from_dtb(
     }
 #ifdef CLI_LAZY_WRITE
     if (table && !ept_compare_table(table, &table_new)) {
-        prln_error("corresponding table same, no need to write it");
+        prln_info("corresponding table same, no need to write it");
     } else {
 #endif
         if (cli_write_ept(table, &table_new)) {
@@ -857,7 +857,7 @@ cli_mode_eedit(
         }
 #ifdef CLI_LAZY_WRITE
     } else {
-        prln_error("old and new table same, no need to write");
+        prln_info("old and new table same, no need to write");
     }
 #endif
     if (bhelper && cli_write_dtb_from_ept(bhelper, &table_new, capacity)) {
@@ -872,7 +872,7 @@ int
 cli_mode_dsnapshot(
     struct dtb_buffer_helper const * const  bhelper
 ){
-    prln_error("take snapshot of partitions node in DTB");
+    prln_info("take snapshot of partitions node in DTB");
     if (!bhelper || !bhelper->dtb_count) {
         prln_error("DTB not correct or invalid");
         return 1;
@@ -892,7 +892,7 @@ int
 cli_mode_esnapshot(
     struct ept_table const * const  table
 ){
-    prln_error("take snapshot of EPT");
+    prln_info("take snapshot of EPT");
     if (!table || !table->partitions_count || ept_valid_table(table)) {
         prln_error("EPT does not exist or is invalid, refuse to work");
         return 1;
@@ -996,7 +996,7 @@ cli_mode_dclone(
     }
 #ifdef CLI_LAZY_WRITE
     if (!dts_compare_partitions_mixed(&bhelper->dtbs->phelper, &dparts)) {
-        prln_error("new partitions same as old, no need to write");
+        prln_info("new partitions same as old, no need to write");
     } else {
 #endif
         if (cli_write_dtb(bhelper, &dparts)) {
@@ -1073,7 +1073,7 @@ cli_mode_ecreate(
         return -1;
     }
     if (!table || !ept_valid_table(table)) {
-        prln_error("warning, old table corrupted or not valid, continue anyway");
+        prln_warn("old table corrupted or not valid, continue anyway");
     }
     size_t const capacity = cli_get_capacity(table);
     if (!capacity) {
@@ -1094,7 +1094,7 @@ cli_mode_ecreate(
         }
 #ifdef CLI_LAZY_WRITE
     } else {
-        prln_error("old and new table same, no need to write");
+        prln_info("old and new table same, no need to write");
     }
 #endif
     if (bhelper && cli_write_dtb_from_ept(bhelper, &table_new, capacity)) {

src/dtb.c

@@ -985,7 +985,7 @@ dtb_buffer_helper_remove_partitions(
     }
     new->dtb_count = old->dtb_count;
     if (!(new->dtbs = malloc(new->dtb_count * sizeof *new->dtbs))) {
-        prln_error("failed to allocate memory for entries");
+        prln_error_with_errno("failed to allocate memory for entries");
         new->dtb_count = 0;
         return 1;
     }
@@ -1146,7 +1146,7 @@ dtb_compose(
         prln_error("DTB size too large (0x%lx), trying to gzip it", *size);
         uint8_t *buffer;
         if (!(*size = gzip_zip(*dtb, *size, &buffer))) {
-            prln_error("failed to compose Gzipped multi-DTB");
+            prln_error("failed to compose gzipped multi-DTB");
             free(*dtb);
             dtb_free_buffer_helper(&bhelper_new);
             return 6;

src/dts.c

@@ -184,7 +184,7 @@ dts_skip_node(
                 return 0;
         }
     }
-    prln_error("skip node");
+    prln_error("node not properly ended");
     return 0;
 }
 
@@ -252,10 +252,10 @@ dts_get_property_actual(
         current = start + i;
         switch (*current) {
             case DTS_BEGIN_NODE_ACTUAL:
-                prln_error("DTS get property actual: child node starts, property not found, give up");
+                prln_error("child node starts, property not found, give up");
                 return 1;
             case DTS_END_NODE_ACTUAL:
-                prln_error("DTS get property actual: node ends, give up");
+                prln_error("node ends, give up");
                 return 1;
             case DTS_PROP_ACTUAL:
                 len_prop = bswap_32(*(current+1));
@@ -270,7 +270,7 @@ dts_get_property_actual(
             case DTS_NOP_ACTUAL:
                 break;
             default:
-                prln_error("DTS get property: Invalid token %"PRIu32"", bswap_32(*current));
+                prln_error("invalid token %"PRIu32"", bswap_32(*current));
                 return 1;
         }
     }
@@ -1439,7 +1439,7 @@ dts_dedit_parse(
         prln_error("no editor");
         return 2;
     }
-    prln_error("table before editting:");
+    prln_info("table before editting:");
     dts_report_partitions_simple(dparts);
     for (unsigned i = 0; i < ehelper.count; ++i) {
         if (dts_dedit_each(dparts, ehelper.editors + i)) {
@@ -1449,7 +1449,7 @@ dts_dedit_parse(
         }
     }
     free(ehelper.editors);
-    prln_error("table after editting:");
+    prln_info("table after editting:");
     dts_report_partitions_simple(dparts);
     return 0;
 }

src/ept.c

@@ -215,7 +215,7 @@ ept_valid_partition_name(
         term = false;
     }
     if (ret) {
-        prln_error("%u illegal characters found in partition name '%s'%s", ret, name, term ? "" : ", and the previously mentioit does not end properly");
+        prln_error("%u illegal characters found in partition name '%s'%s", ret, name, term ? "" : ", and the partition name does not end properly");
     }
     return ret;
 }
@@ -457,19 +457,19 @@ ept_compare_partition(
         return -1;
     }
     if (strncmp(part_a->name, part_b->name, MAX_PARTITION_NAME_LENGTH)) {
-        prln_error("names different");
+        prln_warn("names different");
         return 1;
     }
     if (part_a->offset != part_b->offset) {
-        prln_error("offset different");
+        prln_warn("offset different");
         return 2;
     }
     if (part_a->size != part_b->size) {
-        prln_error("size different");
+        prln_warn("size different");
         return 4;
     }
     if (part_a->mask_flags != part_b->mask_flags) {
-        prln_error("masks different");
+        prln_warn("masks different");
         return 8;
     }
     return 0;
@@ -684,7 +684,7 @@ void
 ept_snapshot_hex(
     struct ept_table const * const  table
 ){
-    prln_error("EPT snapshot hex:");
+    prln_info("EPT snapshot hex:");
     struct ept_partition const *const part_start = table->partitions;
     struct ept_partition const *part_current;
     uint32_t const pcount = util_safe_partitions_count(table->partitions_count);
@@ -704,7 +704,7 @@ void
 ept_snapshot_human(
     struct ept_table const * const  table
 ){
-    prln_error("EPT snapshot human:");
+    prln_info("EPT snapshot human:");
     struct ept_partition const *const part_start = table->partitions;
     struct ept_partition const *part_current;
     size_t offset;
@@ -855,7 +855,7 @@ ept_get_minimum_block(
         }
 #ifdef EPT_GET_MINUMUM_BLOCK_AVOID_LAST_SIZE
         if (part_last->offset % block) {
-            prln_error("shift down block size from 0x%x due to part %u (%s)'s offset 0x%lx", block, table->partitions_count, part_last->name, part_last->offset);
+            prln_warn("shift down block size from 0x%x due to part %u (%s)'s offset 0x%lx", block, table->partitions_count, part_last->name, part_last->offset);
             block >>= 1;
             change = true;
         }

src/gzip.c

@@ -9,6 +9,7 @@
 
 /* Local */
 
+#include "common.h"
 #include "util.h"
 
 /* Definition */
@@ -32,10 +33,10 @@ gzip_unzip_no_header(
     uint8_t * * const   out
 ){
     size_t allocated_size = util_nearest_upper_bound_with_multiply_ulong(in_size, 64, 4); // 4 times the size, nearest multiply of 64
-    prln_error("Decompressing raw deflated data, in size %ld, allocated %ld", in_size, allocated_size);
+    prln_info("decompressing raw deflated data, in size %ld, allocated %ld", in_size, allocated_size);
     *out = malloc(allocated_size);
     if (!*out) {
-        prln_error("Failed to allocate memory for decompression");
+        prln_error_with_errno("failed to allocate memory for decompression");
         return 0;
     }
     z_stream s;
@@ -45,7 +46,7 @@ gzip_unzip_no_header(
     if (inflateInit2(&s, -MAX_WBITS) != Z_OK) {
         free(*out);
         *out = NULL;
-        prln_error("Failed to initialize Z stream for decompression");
+        prln_error("failed to initialize Z stream for decompression");
         return 0;
     }
     s.next_in = in;
@@ -67,20 +68,20 @@ gzip_unzip_no_header(
                 if (temp_buffer) {
                     s.next_out = temp_buffer + (s.next_out - *out);
                     *out = temp_buffer;
-                    prln_error("Re-allocated memory, now %lu", allocated_size);
+                    prln_warn("re-allocated memory, now %lu", allocated_size);
                 } else {
                     free(*out);
                     *out = NULL;
                     inflateEnd(&s);
-                    prln_error("Failed to reallocate memory for decompression");
+                    prln_error_with_errno("failed to reallocate memory for decompression");
                     return 0;
                 }
                 break;
             default:
                 free(*out);
                 *out = NULL;
                 inflateEnd(&s);
-                prln_error("Unknown error when decompressing, errno: %d", r);
+                prln_error("unknown error when decompressing, errno: %d", r);
                 return 0;
         }
     }
@@ -151,7 +152,7 @@ gzip_zip(
         return 0;
     }
     size_t allocated_size = deflateBound(&s, in_size);
-    prln_error("Compressing data to gzip, size %ld, allocated %ld", in_size, allocated_size);
+    prln_error("compressing data to gzip, size %ld, allocated %ld", in_size, allocated_size);
     *out = malloc(allocated_size);
     if (!*out) {
         free(*out);

src/io.c

@@ -269,11 +269,11 @@ io_identify_target_type_get_basic_stat(
             return 2;
         }
     } else if (S_ISREG(st.st_mode)) {
-        prln_error("'%s' is a regular file, getting its size via stat", path);
+        prln_info("'%s' is a regular file, getting its size via stat", path);
         type->file = IO_TARGET_TYPE_FILE_REGULAR;
         type->size = st.st_size;
     } else {
-        prln_error("'%s' is neither a regular file nor a block device, assuming its size as 0", path);
+        prln_info("'%s' is neither a regular file nor a block device, assuming its size as 0", path);
         type->file = IO_TARGET_TYPE_FILE_UNSUPPORTED;
         type->size = 0;
     }
@@ -463,7 +463,7 @@ io_seek_and_read(
         return 1;
     }
     if (r_seek != offset) {
-        prln_error("seeked offset different from expected: Result 0x%lx, expected 0x%lx", r_seek, offset);
+        prln_error("seeked offset different from expected: result 0x%lx, expected 0x%lx", r_seek, offset);
         return 2;
     }
     if (io_read_till_finish(fd, buffer, size)) {
@@ -583,7 +583,7 @@ io_rereadpart(
         return -1;
     }
     if (ioctl(fd, BLKRRPART) == -1) {
-        prln_error_with_errno("Failed to send ioctl BLKRRPART to kernel");
+        prln_error_with_errno("failed to send ioctl BLKRRPART to kernel");
         return 1;
     }
     prln_info("reread partitions success");

src/parg.c

@@ -393,7 +393,7 @@ parg_parse_modifier_get_cloner(
 ){
     size_t len_new_name = strlen(cloner);
     if (len_new_name > MAX_PARTITION_NAME_LENGTH - 1) {
-        prln_error("New name to clone to is too long: %s", cloner);
+        prln_error("new name to clone to is too long: %s", cloner);
         return 1;
     }
     strncpy(modifier->name, cloner, len_new_name);