Remove unnecessary static buffer non-NULL checks

(cherry picked from commit 649633fd0006d8a97292dc83e8cd5deb65ae6d02)

diff --git a/src/bsd.c b/src/bsd.c
index c59e9ba9914b881513f44e65b17a6f7930c765f1..9d24fdcc1117ab47977b150553138550dd15bf97 100644 (file)
--- a/src/bsd.c
+++ b/src/bsd.c
@@ -2869,11 +2869,11 @@ dump_messages(DESC *d, dbref player, int isnew)
       (Guest(player) && !options.guest_allow)) {
     if (!options.login_allow) {
       fcache_dump(d, fcache.down_fcache, NULL);
-      if (cf_downmotd_msg && *cf_downmotd_msg)
+      if (*cf_downmotd_msg)
        raw_notify(player, cf_downmotd_msg);
     } else if (MAX_LOGINS && !under_limit) {
       fcache_dump(d, fcache.full_fcache, NULL);
-      if (cf_fullmotd_msg && *cf_fullmotd_msg)
+      if (*cf_fullmotd_msg)
        raw_notify(player, cf_fullmotd_msg);
     }
     if (!Can_Login(player)) {
@@ -3766,7 +3766,7 @@ announce_connect(dbref player, int isnew, int num)
   }
   orator = player;
 
-  if (cf_motd_msg && *cf_motd_msg) {
+  if (*cf_motd_msg) {
     raw_notify(player, cf_motd_msg);
   }
   raw_notify(player, " ");

diff --git a/src/division.c b/src/division.c
index 46e14910a364b5398c7c8d63a824827607a9f288..5acb9709b65a4f8e3d95fdbab33c361eb7aa022e 100644 (file)
--- a/src/division.c
+++ b/src/division.c
@@ -1292,7 +1292,7 @@ COMMAND(cmd_power)
         *tbp = '\0';
 
         notify_format(player, "Power Name    : %s", power->name);
-        notify_format(player, "Power Aliases : %s", tbuf ? tbuf : "");
+        notify_format(player, "Power Aliases : %s", tbuf);
         notify_format(player, "Power Type    : %s", powc_list[i].name);
       } else
         notify(player, "No such power.");
@@ -2672,7 +2672,7 @@ void do_list_powers(dbref player, const char *name) {
           safe_format(tbuf, &tbp, ", %s", pname);
       }
     *tbp = '\0';
-    notify_format(player, "Powers List: %s", tbuf ? tbuf : "None.");
+    notify_format(player, "Powers List: %s", tbuf);
 }
 
 char *list_all_powers(dbref player, const char *name) {

diff --git a/src/extchat.c b/src/extchat.c
index fc5a1ad4b0e0939f0aed2c9a6d7a900ba8758960..08dd238011663e7ce0657f79a7e5567e20e52526 100644 (file)
--- a/src/extchat.c
+++ b/src/extchat.c
@@ -237,7 +237,7 @@ load_chatdb_oldstyle(FILE * fp)
 
   /* Check for **END OF DUMP*** */
   fgets(buff, sizeof buff, fp);
-  if (!buff)
+  if (!*buff)
     do_rawlog(LT_ERR, T("CHAT: No end-of-dump marker in the chat database."));
   else if (strcmp(buff, EOD) != 0)
     do_rawlog(LT_ERR, T("CHAT: Trailing garbage in the chat database."));
@@ -310,7 +310,7 @@ load_chatdb(FILE * fp)
 
   /* Check for **END OF DUMP*** */
   fgets(buff, sizeof buff, fp);
-  if (!buff)
+  if (!*buff)
     do_rawlog(LT_ERR, T("CHAT: No end-of-dump marker in the chat database."));
   else if (strcmp(buff, EOD) != 0)
     do_rawlog(LT_ERR, T("CHAT: Trailing garbage in the chat database."));
@@ -1955,7 +1955,7 @@ ok_channel_name(const char *n)
 
   strcpy(name, remove_markup(n, NULL));
 
-  if (!name || !*name)
+  if (!*name)
     return 0;
 
   /* No leading spaces */

diff --git a/src/extmail.c b/src/extmail.c
index 202b0556c14e809593aad753e8dc9a1f7a7a9b2e..10aba79a57eb70e087ec2b6b31e5f0ee542354f9 100644 (file)
--- a/src/extmail.c
+++ b/src/extmail.c
@@ -2037,7 +2037,7 @@ load_mail(FILE * fp)
     if (nbuf1[0] == '0' && nbuf1[1] == '\n') {
       char buff[20];
       fgets(buff, sizeof buff, fp);
-      if (!buff)
+      if (!*buff)
        do_rawlog(LT_ERR,
                  T("MAIL: Missing end-of-dump marker in mail database."));
       else if (strcmp(buff, (mail_flags & MDBF_NEW_EOD)
@@ -2153,7 +2153,7 @@ load_mail(FILE * fp)
   {
     char buff[20];
     fgets(buff, sizeof buff, fp);
-    if (!buff)
+    if (!*buff)
       do_rawlog(LT_ERR,
                T("MAIL: Missing end-of-dump marker in mail database."));
     else if (strcmp(buff, (mail_flags & MDBF_NEW_EOD)

diff --git a/src/flags.c b/src/flags.c
index d239fffb2a859ce2e39d8a283a7d8cacb9e76f2f..b303a2de99e4c2183a29d9003cc44ac9be99c226 100644 (file)
--- a/src/flags.c
+++ b/src/flags.c
@@ -1450,7 +1450,7 @@ set_flag(dbref player, dbref thing, const char *flag, int negate,
                  icloc_ptr = atr_get(thing, "TRUERACE");
                  if(icloc_ptr) 
                    strncpy(icloc_buf, atr_value(icloc_ptr), BUFFER_LEN-1);
-                 if(!icloc_buf) {
+                 if(!*icloc_buf) {
                          if(player != thing)
                                  notify(player, "That player does not have a valid TRUERACE set.");
                          notify(thing, "You do not have a valid TRUERACE set.  Contact an administrator.");
@@ -1465,7 +1465,7 @@ set_flag(dbref player, dbref thing, const char *flag, int negate,
                  memset(icloc_buf, '\0', BUFFER_LEN);
                  if(icloc_ptr)
                          strncpy(icloc_buf, atr_value(icloc_ptr), BUFFER_LEN-1);
-                 if(!icloc_buf) {
+                 if(!*icloc_buf) {
                          if(player != thing)
                            notify(player, "That player has an invalid RP location set."); 
                          notify(thing, "You have an invalid RP location set.  Contact an administrator.");