Added [BOX64] prefix for all the stdout logs (#2279)

* Added [BOX64] prefix for all the stdout logs

* Remove some hardcoded prefix

* review

4 files changed, 19 insertions, 19 deletions

diff --git a/src/elfs/elfhash.c b/src/elfs/elfhash.c
index ebb81285..23431b0d 100644
--- a/src/elfs/elfhash.c
+++ b/src/elfs/elfhash.c
@@ -304,7 +304,7 @@ static void old_elf_hash_dump(elfheader_t* h)
     }
     printf_log(LOG_NONE,"Chains[%d] = ", nchains);
     for (uint32_t i = 0; i<nchains; ++i)
-        printf_log(LOG_NONE, "%d ", chains[i]);
+        printf_log_prefix(0, LOG_NONE, "%d ", chains[i]);
     printf_log(LOG_NONE, "\n------------\n");
 }
 
@@ -369,7 +369,7 @@ static void new_elf_hash_dump(elfheader_t* h)
     printf_log(LOG_NONE, "Buckets[%d] offset=%d = \n", nbuckets, symoffset);
     for(uint32_t i=0; i<nbuckets; ++i) {
         uint32_t symidx = buckets[i];
-        printf_log(LOG_NONE, "%d:", symidx);
+        printf_log_prefix(0, LOG_NONE, "%d:", symidx);
         while(symidx>=symoffset) {
             const char* name = h->DynStr + h->DynSym._64[symidx].st_name;
             const uint32_t hash = chains[symidx-symoffset];
@@ -377,7 +377,7 @@ static void new_elf_hash_dump(elfheader_t* h)
                 symidx=0;
             else
                 symidx++;
-            printf_log(LOG_NONE, " %s (%x) -> %d", name, hash, symidx);
+            printf_log_prefix(0, LOG_NONE, " %s (%x) -> %d", name, hash, symidx);
         }
         printf_log(LOG_NONE, "\n");
     }
diff --git a/src/elfs/elfhash32.c b/src/elfs/elfhash32.c
index 3773e59a..dcb231ae 100644
--- a/src/elfs/elfhash32.c
+++ b/src/elfs/elfhash32.c
@@ -112,7 +112,7 @@ static void old_elf_hash_dump(elfheader_t* h)
     }
     printf_log(LOG_NONE,"Chains[%d] = ", nchains);
     for (uint32_t i = 0; i<nchains; ++i)
-        printf_log(LOG_NONE, "%d ", chains[i]);
+        printf_log_prefix(0, LOG_NONE, "%d ", chains[i]);
     printf_log(LOG_NONE, "\n------------\n");
 }
 
diff --git a/src/elfs/elfload_dump.c b/src/elfs/elfload_dump.c
index fbd24eaa..f6fa50be 100644
--- a/src/elfs/elfload_dump.c
+++ b/src/elfs/elfload_dump.c
@@ -427,19 +427,19 @@ void DumpBinary(char* p, int sz)
         if (n>sz) n = sz;
         int fill = 16-sz;
         for (int j = 0; j<delta; ++j)
-            printf_dump(LOG_NEVER, "   ");
+            printf_dump_prefix(0, LOG_NEVER, "   ");
         for (int j = 0; j<n; ++j)
-            printf_dump(LOG_NEVER, "%02X ", d[j]);
+            printf_dump_prefix(0, LOG_NEVER, "%02X ", d[j]);
         for (int j = 0; j<fill; ++j)
-            printf_dump(LOG_NEVER, "   ");
-        printf_dump(LOG_NEVER, " | ");
+            printf_dump_prefix(0, LOG_NEVER, "   ");
+        printf_dump_prefix(0, LOG_NEVER, " | ");
         for (int j = 0; j<delta; ++j)
-            printf_dump(LOG_NEVER, " ");
+            printf_dump_prefix(0, LOG_NEVER, " ");
         for (int j = 0; j<n; ++j)
-            printf_dump(LOG_NEVER, "%c", (d[j]<32 || d[j]>127)?'.':d[j]);
+            printf_dump_prefix(0, LOG_NEVER, "%c", (d[j]<32 || d[j]>127)?'.':d[j]);
         for (int j = 0; j<fill; ++j)
-            printf_dump(LOG_NEVER, " ");
-        printf_dump(LOG_NEVER, "\n");
+            printf_dump_prefix(0, LOG_NEVER, " ");
+        printf_dump_prefix(0, LOG_NEVER, "\n");
         d+=n;
         sz-=n;
         delta=0;
diff --git a/src/elfs/elfloader.c b/src/elfs/elfloader.c
index 3a979ed5..11943c1a 100644
--- a/src/elfs/elfloader.c
+++ b/src/elfs/elfloader.c
@@ -1059,7 +1059,7 @@ int LoadNeededLibs(elfheader_t* h, lib_t *maplib, int local, int bindnow, int de
                 box_free(platform);
             }
             if(strchr(rpath, '$')) {
-                printf_log(LOG_INFO, "BOX64: Warning, RPATH with $ variable not supported yet (%s)\n", rpath);
+                printf_log(LOG_INFO, "Warning, RPATH with $ variable not supported yet (%s)\n", rpath);
             } else {
                 printf_log(LOG_DEBUG, "Prepending path \"%s\" to BOX64_LD_LIBRARY_PATH\n", rpath);
                 PrependList(&box64->box64_ld_lib, rpath, 1);
@@ -1574,32 +1574,32 @@ void ResetSpecialCaseMainElf(elfheader_t* h)
             if(strcmp(symname, "_IO_2_1_stderr_")==0 && ((void*)sym->st_value+h->delta)) {
                 memcpy((void*)sym->st_value+h->delta, stderr, sym->st_size);
                 my__IO_2_1_stderr_ = (void*)sym->st_value+h->delta;
-                printf_log(LOG_DEBUG, "BOX64: Set @_IO_2_1_stderr_ to %p\n", my__IO_2_1_stderr_);
+                printf_log(LOG_DEBUG, "Set @_IO_2_1_stderr_ to %p\n", my__IO_2_1_stderr_);
             } else
             if(strcmp(symname, "_IO_2_1_stdin_")==0 && ((void*)sym->st_value+h->delta)) {
                 memcpy((void*)sym->st_value+h->delta, stdin, sym->st_size);
                 my__IO_2_1_stdin_ = (void*)sym->st_value+h->delta;
-                printf_log(LOG_DEBUG, "BOX64: Set @_IO_2_1_stdin_ to %p\n", my__IO_2_1_stdin_);
+                printf_log(LOG_DEBUG, "Set @_IO_2_1_stdin_ to %p\n", my__IO_2_1_stdin_);
             } else
             if(strcmp(symname, "_IO_2_1_stdout_")==0 && ((void*)sym->st_value+h->delta)) {
                 memcpy((void*)sym->st_value+h->delta, stdout, sym->st_size);
                 my__IO_2_1_stdout_ = (void*)sym->st_value+h->delta;
-                printf_log(LOG_DEBUG, "BOX64: Set @_IO_2_1_stdout_ to %p\n", my__IO_2_1_stdout_);
+                printf_log(LOG_DEBUG, "Set @_IO_2_1_stdout_ to %p\n", my__IO_2_1_stdout_);
             } else
             if(strcmp(symname, "_IO_stderr_")==0 && ((void*)sym->st_value+h->delta)) {
                 memcpy((void*)sym->st_value+h->delta, stderr, sym->st_size);
                 my__IO_2_1_stderr_ = (void*)sym->st_value+h->delta;
-                printf_log(LOG_DEBUG, "BOX64: Set @_IO_stderr_ to %p\n", my__IO_2_1_stderr_);
+                printf_log(LOG_DEBUG, "Set @_IO_stderr_ to %p\n", my__IO_2_1_stderr_);
             } else
             if(strcmp(symname, "_IO_stdin_")==0 && ((void*)sym->st_value+h->delta)) {
                 memcpy((void*)sym->st_value+h->delta, stdin, sym->st_size);
                 my__IO_2_1_stdin_ = (void*)sym->st_value+h->delta;
-                printf_log(LOG_DEBUG, "BOX64: Set @_IO_stdin_ to %p\n", my__IO_2_1_stdin_);
+                printf_log(LOG_DEBUG, "Set @_IO_stdin_ to %p\n", my__IO_2_1_stdin_);
             } else
             if(strcmp(symname, "_IO_stdout_")==0 && ((void*)sym->st_value+h->delta)) {
                 memcpy((void*)sym->st_value+h->delta, stdout, sym->st_size);
                 my__IO_2_1_stdout_ = (void*)sym->st_value+h->delta;
-                printf_log(LOG_DEBUG, "BOX64: Set @_IO_stdout_ to %p\n", my__IO_2_1_stdout_);
+                printf_log(LOG_DEBUG, "Set @_IO_stdout_ to %p\n", my__IO_2_1_stdout_);
             }
         }
     }