PennMUSH incorporation. Applied patch 1.8.1-patch09. Untested

diff --git a/src/function.c b/src/function.c
index 96df7a172850a4756f3df83c169747e0484dfc87..147e43a1f7efd7e621b8a86db1836babd7c5590d 100644 (file)
--- a/src/function.c
+++ b/src/function.c
@@ -554,7 +554,7 @@ FUNTAB flist[] = {
   {"OOREF", fun_ooref, 0, 0, FN_REG},
   {"OWNER", fun_owner, 1, 1, FN_REG},
   {"PARENT", fun_parent, 1, 2, FN_REG},
-  {"PCREATE", fun_pcreate, 2, 2, FN_REG},
+  {"PCREATE", fun_pcreate, 1, 2, FN_REG},
   {"PEMIT", fun_pemit, 2, -2, FN_REG},
   {"PGHASPOWER", fun_pghaspower, 3, 4, FN_REG},
   {"PGPOWERS", fun_pgpowers, 2, 2, FN_REG},

diff --git a/src/funlist.c b/src/funlist.c
index 9e63d22c56ee45cac6fcae09745be7ea584aa371..8d244220e68093151aaa80ae8a3ad661d7ec874b 100644 (file)
--- a/src/funlist.c
+++ b/src/funlist.c
@@ -1431,7 +1431,7 @@ FUNCTION(fun_setunion)
 {
   char sep;
   char **a1, **a2;
-  int n1, n2, x1, x2, val, orign1, orign2;
+  int n1, n2, x1, x2, val;
   int lastx1, lastx2, found;
   char *sort_type = ALPHANUM_LIST;
   int osepl = 0;
@@ -1447,11 +1447,11 @@ FUNCTION(fun_setunion)
   a1 = (char **) mush_malloc(MAX_SORTSIZE * sizeof(char *), "ptrarray");
   a2 = (char **) mush_malloc(MAX_SORTSIZE * sizeof(char *), "ptrarray");
   if (!a1 || !a2)
-    mush_panic("Unable to allocate memory in fun_setunion");
+    mush_panic("Unable to allocate memory in fun_diff");
 
   /* make arrays out of the lists */
-  orign1 = n1 = list2arr(a1, MAX_SORTSIZE, args[0], sep);
-  orign2 = n2 = list2arr(a2, MAX_SORTSIZE, args[1], sep);
+  n1 = list2arr(a1, MAX_SORTSIZE, args[0], sep);
+  n2 = list2arr(a2, MAX_SORTSIZE, args[1], sep);
 
   if (nargs < 4) {
     osepd[0] = sep;
@@ -1475,7 +1475,6 @@ FUNCTION(fun_setunion)
     osep = args[4];
     osepl = arglens[4];
   }
-
   /* sort each array */
   do_gensort(executor, a1, NULL, n1, sort_type);
   do_gensort(executor, a2, NULL, n2, sort_type);