Browse Source

par can't be NULL

Bryan Drewery 11 years ago
parent
commit
27ef70ae55
1 changed files with 3 additions and 3 deletions
  1. 3 3
      src/cmds.cc

+ 3 - 3
src/cmds.cc

@@ -979,7 +979,7 @@ static void cmd_channels(int idx, char *par) {
       show_channels(idx, NULL);
       show_channels(idx, NULL);
   }
   }
 
 
-  if ((dcc[idx].user->flags & USER_MASTER) && !(par && par[0]))
+  if ((dcc[idx].user->flags & USER_MASTER) && !par[0])
     dprintf(idx, "You can also %schannels <user|%%group>\n", (dcc[idx].u.chat->channel >= 0) ? settings.dcc_prefix : "");
     dprintf(idx, "You can also %schannels <user|%%group>\n", (dcc[idx].u.chat->channel >= 0) ? settings.dcc_prefix : "");
 }
 }
 
 
@@ -2906,7 +2906,7 @@ static void cmd_last(int idx, char *par) {
 
 
   char user[20] = "";
   char user[20] = "";
 
 
-  if (par && par[0]) {
+  if (par[0]) {
     strlcpy(user, par, sizeof(user));
     strlcpy(user, par, sizeof(user));
   } else if (conf.username) {
   } else if (conf.username) {
     strlcpy(user, conf.username, sizeof(user));
     strlcpy(user, conf.username, sizeof(user));
@@ -3434,7 +3434,7 @@ static void cmd_nopass(int idx, char *par)
   size_t userssiz = 1;
   size_t userssiz = 1;
   bool dopass = 0;
   bool dopass = 0;
 
 
-  putlog(LOG_CMDS, "*", "#%s# nopass %s", dcc[idx].nick, (par && par[0]) ? par : "");
+  putlog(LOG_CMDS, "*", "#%s# nopass %s", dcc[idx].nick, par[0] ? par : "");
 
 
   if (par[0])
   if (par[0])
     dopass = 1;
     dopass = 1;