examples/vm_power: fix check for null

The check for NULL is in the wrong position in the "if" error leg. The
pointer should be checked for NULL before checking what the value of
what the pointer points to is.

Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>

diff --git a/examples/vm_power_manager/channel_manager.c b/examples/vm_power_manager/channel_manager.c
index 34a395d7fe9e27052f302bb3ce47a60371f4d133..04344ae991c18c7f8efeb34cbb52e1c6829472a9 100644 (file)
--- a/examples/vm_power_manager/channel_manager.c
+++ b/examples/vm_power_manager/channel_manager.c
@@ -389,7 +389,7 @@ add_all_channels(const char *vm_name)
                errno = 0;
                channel_num = (unsigned)strtol(remaining, &tail_ptr, 0);
                if ((errno != 0) || (remaining[0] == '\0') ||
-                               (*tail_ptr != '\0') || tail_ptr == NULL) {
+                               tail_ptr == NULL || (*tail_ptr != '\0')) {
                        RTE_LOG(WARNING, CHANNEL_MANAGER, "Malformed channel name"
                                        "'%s' found it should be in the form of "
                                        "'<guest_name>.<channel_num>(decimal)'\n",

diff --git a/examples/vm_power_manager/vm_power_cli.c b/examples/vm_power_manager/vm_power_cli.c
index e7f4469170905b44ba9cacaf5a0a4c9e2e919875..bd685fd9eddbe0bf829e184edd4b8e360a0a5eea 100644 (file)
--- a/examples/vm_power_manager/vm_power_cli.c
+++ b/examples/vm_power_manager/vm_power_cli.c
@@ -323,7 +323,7 @@ cmd_channels_op_parsed(void *parsed_result, struct cmdline *cl,
                        break;
                errno = 0;
                channel_num = (unsigned)strtol(token, &tail_ptr, 10);
-               if ((errno != 0) || (*tail_ptr != '\0') || tail_ptr == NULL)
+               if ((errno != 0) || tail_ptr == NULL || (*tail_ptr != '\0'))
                        break;
 
                if (channel_num == CHANNEL_CMDS_MAX_VM_CHANNELS) {
@@ -408,7 +408,7 @@ cmd_channels_status_op_parsed(void *parsed_result, struct cmdline *cl,
                        break;
                errno = 0;
                channel_num = (unsigned)strtol(token, &tail_ptr, 10);
-               if ((errno != 0) || (*tail_ptr != '\0') || tail_ptr == NULL)
+               if ((errno != 0) || tail_ptr == NULL || (*tail_ptr != '\0'))
                        break;
 
                if (channel_num == CHANNEL_CMDS_MAX_VM_CHANNELS) {