openocd: remove NULL comparisons with checkpatch [1/2]

[openocd.git] / src / server / telnet_server.c

diff --git a/src/server/telnet_server.c b/src/server/telnet_server.c
index acb57efd10b6bf06c083cdf6442182e914f19366..97af3d97f1a7c5172998c95b6bf5ada318a105b4 100644 (file)
--- a/src/server/telnet_server.c
+++ b/src/server/telnet_server.c
@@ -150,7 +150,7 @@ static void telnet_load_history(struct telnet_connection *t_con)
 
        char *history = get_home_dir(TELNET_HISTORY);
 
-       if (history == NULL) {
+       if (!history) {
                LOG_INFO("unable to get user home directory, telnet history will be disabled");
                return;
        }
@@ -186,7 +186,7 @@ static void telnet_save_history(struct telnet_connection *t_con)
 
        char *history = get_home_dir(TELNET_HISTORY);
 
-       if (history == NULL) {
+       if (!history) {
                LOG_INFO("unable to get user home directory, telnet history will be disabled");
                return;
        }
@@ -199,7 +199,7 @@ static void telnet_save_history(struct telnet_connection *t_con)
                i = t_con->current_history + 1;
                i %= TELNET_LINE_HISTORY_SIZE;
 
-               while (t_con->history[i] == NULL && num > 0) {
+               while (!t_con->history[i] && num > 0) {
                        i++;
                        i %= TELNET_LINE_HISTORY_SIZE;
                        num--;
@@ -500,22 +500,18 @@ static void telnet_auto_complete(struct connection *connection)
                bool ignore_cmd = false;
                Jim_Cmd *jim_cmd = Jim_GetCommand(command_context->interp, elem, JIM_NONE);
 
-               if (!jim_cmd)
+               if (!jim_cmd) {
+                       /* Why we are here? Let's ignore it! */
                        ignore_cmd = true;
-               else {
-                       if (!jim_cmd->isproc) {
-                               /* ignore commands without handler
-                                * and those with COMMAND_CONFIG mode */
-                               /* FIXME it's better to use jimcmd_is_ocd_command(jim_cmd)
-                                * or command_find_from_name(command_context->interp, name) */
-                               struct command *cmd = jim_cmd->u.native.privData;
-                               if (!cmd)
-                                       ignore_cmd = true;
-                               /* make Valgrind happy by checking that cmd is not NULL  */
-                               else if (cmd != NULL && !cmd->handler && !cmd->jim_handler)
-                                       ignore_cmd = true;
-                               else if (cmd != NULL && cmd->mode == COMMAND_CONFIG)
-                                       ignore_cmd = true;
+               } else if (jimcmd_is_oocd_command(jim_cmd)) {
+                       struct command *cmd = jimcmd_privdata(jim_cmd);
+
+                       if (cmd && !cmd->handler && !cmd->jim_handler) {
+                               /* Initial part of a multi-word command. Ignore it! */
+                               ignore_cmd = true;
+                       } else if (cmd && cmd->mode == COMMAND_CONFIG) {
+                               /* Not executable after config phase. Ignore it! */
+                               ignore_cmd = true;
                        }
                }
 
@@ -644,7 +640,7 @@ static int telnet_input(struct connection *connection)
                                                        /* save only non-blank not repeating lines in the history */
                                                        char *prev_line = t_con->history[(t_con->current_history > 0) ?
                                                                        t_con->current_history - 1 : TELNET_LINE_HISTORY_SIZE-1];
-                                                       if (*t_con->line && (prev_line == NULL ||
+                                                       if (*t_con->line && (!prev_line ||
                                                                        strcmp(t_con->line, prev_line))) {
                                                                /* if the history slot is already taken, free it */
                                                                free(t_con->history[t_con->next_history]);