--- deliantra/server/common/utils.C	2007/08/06 10:54:11	1.63
+++ deliantra/server/common/utils.C	2007/09/09 06:56:10	1.66
@@ -222,7 +222,6 @@
 /* when doing transmutation of objects, we have to recheck the resistances,
  * as some that did not apply previously, may apply now.
  */
-
 void
 transmute_materialname (object *op, const object *change)
 {
@@ -421,7 +420,6 @@
  * This function will also strip all trailing non alphanumeric characters.
  * It does not insert an oxford comma.
  */
-
 void
 make_list_like (char *input)
 {
@@ -521,40 +519,19 @@
     memcpy (dst, src, len + 1);
 }
 
-const std::string
+const char *
 format (const char *format, ...)
 {
-  int len;
+  static dynbuf_text buf;
+
+  buf.clear ();
 
-  {
-    char buf[128];
+  va_list ap;
+  va_start (ap, format);
+  buf.vprintf (format, ap);
+  va_end (ap);
 
-    va_list ap;
-    va_start (ap, format);
-    len = vsnprintf (buf, sizeof (buf), format, ap);
-    va_end (ap);
-
-    assert (len >= 0); // shield againstz broken vsnprintf's
-
-    // was our static buffer short enough?
-    if (len < sizeof (buf))
-      return std::string (buf, len);
-  }
-
-  {
-    // longer, try harder
-    char *buf = salloc<char> (len + 1);
-
-    va_list ap;
-    va_start (ap, format);
-    vsnprintf (buf, len + 1, format, ap);
-    va_end (ap);
-
-    const std::string s (buf, len);
-    sfree<char> (buf, len + 1);
-      
-    return buf;
-  }
+  return buf;
 }
 
 tstamp now ()
@@ -632,12 +609,3 @@
     0x2d02ef8dL
 };
 
-#if 0
-void xyzzy (object_ptr &a, object_ptr &o)
-{
-  asm volatile ("int3");
-  a = o;
-  asm volatile ("int3");
-}
-#endif
-