Miscellaneous code cleanups for C standard compliance

(cherry picked from commit 50a2d4024d8fc8c23610d9137d5cc297a67b9625)

diff --git a/hdrs/division.h b/hdrs/division.h
index 8d89025f08b315923ef8e859fef803bc1ae7f463..cb9b780f69e68e60e07e3866fa8ed53c093ba9be 100644 (file)
--- a/hdrs/division.h
+++ b/hdrs/division.h
@@ -200,8 +200,6 @@ typedef struct power_group_t POWERGROUP;
    thing, is the object receiving the effects of marker powerz
    */
 #define marker_powers(t, m, o) SLEVEL(o) = m ? LEVEL_DIRECTOR : LEVEL_ADMIN ; 
-                     //         division_powerlevel_set(GOD, o, (t ? (m ? PL_DIRECTOR : PL_ROYALTY) : PL_PLAYER), 1);  
-
 
 /* power over checks {{{1 */
 #define POWC(x)         int x(int, dbref, dbref)

diff --git a/src/funtime.c b/src/funtime.c
index 7cac6dc2778ddc9ed4bb34fe64f57d698df3c08d..3c6439172545eaa2ce598b0329db9c680af5f7b0 100644 (file)
--- a/src/funtime.c
+++ b/src/funtime.c
@@ -243,31 +243,31 @@ etime_to_secs(char *str1, int *secs)
     }
     str2[i] = '\0';
     if (!*str1) {
-      *secs += parse_integer(str2);    // no more chars, just add seconds and stop
+      *secs += parse_integer(str2);    /* no more chars, just add seconds and stop */
       break;
     }
     switch (*str1) {
     case 'd':
     case 'D':
-      *secs += (parse_integer(str2) * 86400);  // days
+      *secs += (parse_integer(str2) * 86400);  /* days */
       break;
     case 'h':
     case 'H':
-      *secs += (parse_integer(str2) * 3600);   // hours
+      *secs += (parse_integer(str2) * 3600);   /* hours */
       break;
     case 'm':
     case 'M':
-      *secs += (parse_integer(str2) * 60);     // minutes
+      *secs += (parse_integer(str2) * 60);     /* minutes */
       break;
     case 's':
     case 'S':
     case ' ':
-      *secs += parse_integer(str2);    // seconds
+      *secs += parse_integer(str2);    /* seconds */
       break;
     default:
       return 0;
     }
-    str1++;                    // move past the time char
+    str1++;                    /* move past the time char */
   }
   return 1;
 }

diff --git a/src/notify.c b/src/notify.c
index 56a9e7ff7056255a44e97e132e8cba995cb825ab..387dab0d8981d201cba4f6c674bb9dc6df34cdad 100644 (file)
--- a/src/notify.c
+++ b/src/notify.c
@@ -165,8 +165,7 @@ enum na_type {
   NA_NANSI,                    /**< ANSI and NOACCENTS */
   NA_NCOLOR,                   /**< ANSI, COLOR, NOACCENTS */
   NA_NPUEBLO,                  /**< html & NOACCENTS */
-  NA_NPASCII,                  /**< NOACCENTS */
-//  NA_EVALONCONTACT           /**< Evaluate on Contact */
+  NA_NPASCII                   /**< NOACCENTS */
 };
 
 /** Number of possible message text renderings */

diff --git a/src/prog.c b/src/prog.c
index 65811f6d4bf26af6065ef13fafeff4b3464beb3c..f47bd1da7c2d272045ab8f817702fcdfc504898c 100644 (file)
--- a/src/prog.c
+++ b/src/prog.c
@@ -59,6 +59,7 @@ COMMAND(cmd_prog)
   ATTR *patr;
   DESC *d;
   int i, pflags = 0;
+  char buf[BUFFER_LEN], *bp;
 
   if (!arg_left) {
     notify(player, "Invalid arguments.");
@@ -163,7 +164,6 @@ COMMAND(cmd_prog)
                   "WARNING: %s is using bad prompt syntax with @program.  Refer to help @prompt.",
                   object_header(Owner(player), player));
 
-    char buf[BUFFER_LEN], *bp;
     tooref = ooref, ooref = NOTHING;
     atr_add(target, "XY_PROGPROMPT", t, GOD, NOTHING);
     ooref = tooref;

diff --git a/src/sql.c b/src/sql.c
index 8c75e7e09f52b80a32b504b08bf51015970defdf..221c7123d7f936552f4fd1d648d4d179311352cb 100644 (file)
--- a/src/sql.c
+++ b/src/sql.c
@@ -547,7 +547,6 @@ query_table:
        memset(buf, '\0', BUFFER_LEN);
        strncpy(buf, row_p[3], BUFFER_LEN-1);
        j = sqllist_check(Contents(SQLCMD_MasterRoom), player, '$', ':', buf, 0);
-   //     j = list_check(Contents(SQLCMD_MasterRoom), player, '$', ':', buf, 0);
        if(j < 1) {
          mysql_free_result(qres2);
          mysql_query(mysql_struct, tprintf("UPDATE query_t SET query=\"-1\", io=0 WHERE id = %d", atoi(row_p[0]) ));