Index: shop.c
===================================================================
--- shop.c	(revision 151)
+++ shop.c	(revision 153)
@@ -142,6 +142,8 @@
   if (shop->producing) {
     temp = shop->producing;
     while (temp) {
+      char buf[MAX_STRING_LENGTH] = { "\0" };
+
       if (subDao == NULL) {
         subDao = dao_newChild(parentDao, "items");
         if (subDao == NULL) {
@@ -152,7 +154,6 @@
       i++;
 
       /* Save the entry */
-      char buf[MAX_STRING_LENGTH] = { "\0" };
       snprintf(buf, sizeof(buf), "%d", i + 1);
       if (temp->item != NULL) {
         dao_newScalar(subDao, buf, "%s:%d", temp->item->zone->keyword, temp->item->vnum);
Index: dao.c
===================================================================
--- dao.c	(revision 151)
+++ dao.c	(revision 153)
@@ -897,6 +897,7 @@
   } else {
     /* Declare a buffer for accumulating scalar values. */
     char buf[MAX_STRING_LENGTH];
+    int ch = EOF;
 
     /* Declare the position in the buffer. */
     register size_t bufpos = 0;
@@ -905,7 +906,7 @@
     retcode = TRUE;
 
     /* Read the first character from the stream. */
-    int ch = fgetc(stream);
+    ch = fgetc(stream);
 
     /* Skip any leading whitespace. */
     dao_skipSpaces(&ch, stream);
@@ -1286,11 +1287,12 @@
    if (stream == NULL) {
      log("Couldn't open file '%s' for writing.", filename);
    } else {
+     /* Declare an iterator variable. */
+     register daoData_t *temp = NULL;
+
      /* Assume we've succeeded until we actually fail. */
      retcode = TRUE;
 
-     /* Declare an iterator variable. */
-     register daoData_t *temp = NULL;
      /* Iterate over the DAO's children. */
      for (temp = dao->children; retcode && temp; temp = temp->next) {
        /* Print each child DAO to the stream. */
Index: structs.h
===================================================================
--- structs.h	(revision 151)
+++ structs.h	(revision 153)
@@ -33,7 +33,7 @@
  * in utils.h.  See there for usage.
  */
 #define _CIRCLEMUD	  0x030100      /**< Major/Minor/Patchlevel - MMmmPP */
-#define _CIRCLEMUDSQUARED 0x0001        /**< Major/Minor            - MMmm   */
+#define _CIRCLEMUDSQUARED 0x0005        /**< Major/Minor            - MMmm   */
 
 /*
  * If you want equipment to be automatically equipped to the same place
Index: interpreter.c
===================================================================
--- interpreter.c	(revision 151)
+++ interpreter.c	(revision 153)
@@ -380,7 +380,7 @@
         onWord = TRUE;
         num++;
       }
-      *(p++);
+      p++;
     }    
   }
 
Index: act_comm.c
===================================================================
--- act_comm.c	(revision 151)
+++ act_comm.c	(revision 153)
@@ -449,16 +449,6 @@
   char buf1[MAX_INPUT_LENGTH];
   int channum = 0;
 
-  /*
-   * This is hack-ish, but untila  new channel system can be coded this will
-   * maintain the original functionality.
-   */
-  if (CMD_IS("holler"))   channum = 0;
-  if (CMD_IS("shout"))    channum = 1;
-  if (CMD_IS("gossip"))   channum = 2;
-  if (CMD_IS("auction"))  channum = 3;
-  if (CMD_IS("grats"))    channum = 4;
-
   /* Array of flags which must _not_ be set in order for comm to be heard */
   int channels[] = {
     0,
@@ -502,6 +492,16 @@
     KGRN}
   };
 
+  /*
+   * This is hack-ish, but until a new channel system can be coded this will
+   * maintain the original functionality.
+   */
+  if (CMD_IS("holler"))   channum = 0;
+  if (CMD_IS("shout"))    channum = 1;
+  if (CMD_IS("gossip"))   channum = 2;
+  if (CMD_IS("auction"))  channum = 3;
+  if (CMD_IS("grats"))    channum = 4;
+
   /* to keep pets, etc from being ordered to shout */
   if (!ch->desc)
     return;