hmx_upgrade_nvram: send debug output to stderr.
The hnvram command, if anything went wrong (or even a debug info message was
printed) would end up dumping the message to stdout. Since it's common to
do things like
var=$(hnvram -qg VARNAME)
This could have really messy results. Send error and info messages to
stderr where they belong.
Change-Id: Ibc5d42fdffbe00053dfeb31163e48808d3add294
diff --git a/libupgrade/hmx_upgrade_nvram.c b/libupgrade/hmx_upgrade_nvram.c
index 3797f13..91cf33f 100644
--- a/libupgrade/hmx_upgrade_nvram.c
+++ b/libupgrade/hmx_upgrade_nvram.c
@@ -68,8 +68,8 @@
#define get8bit(q) (unsigned char)((q)[0])
#define get32bit(q) (unsigned int)(((*(unsigned char *)(q)) << 24) | (*((unsigned char *)(q)+1) << 16) | (*((unsigned char *)(q)+2) << 8) | (*((unsigned char *)(q)+3)) )
-#define DEBUG_ERR printf
-#define DEBUG_INFO printf
+#define DEBUG_ERR(fmt, args...) fprintf(stderr, fmt, #args)
+#define DEBUG_INFO(fmt, args...) fprintf(stderr, fmt, #args)
#define UNUSED(x) (void)(x)
#define MAX_NVRAM_FILENAME_LENGTH 32
@@ -650,17 +650,17 @@
drv_error = drv_NVRAM_LoadByAddress(partition, s_nvram_offset[partition], s_nvram_size[partition]);
if (drv_error != DRV_OK)
{
- printf("[HMX_NVRAM_Load] error(%d) loading partition (%d)\n", drv_error, partition);
+ DEBUG_ERR("[HMX_NVRAM_Load] error(%d) loading partition (%d)\n", drv_error, partition);
if (s_nvram_backup_offset[partition] != 0)
{
drv_error = drv_NVRAM_LoadByAddress(partition, s_nvram_backup_offset[partition], s_nvram_size[partition]);
if (drv_error != DRV_OK)
{
- printf("[HMX_NVRAM_Load] error(%d) loading backup partition (%d)\n", drv_error, partition);
+ DEBUG_ERR("[HMX_NVRAM_Load] error(%d) loading backup partition (%d)\n", drv_error, partition);
}
else
{
- printf("[HMX_NVRAM_Load] load OK loading backup partition (%d)\n", partition);
+ DEBUG_INFO("[HMX_NVRAM_Load] load OK loading backup partition (%d)\n", partition);
}
}
}
