[ViewVC] Diff of: cvs/deliantra/server/common/utils.C

Comparing deliantra/server/common/utils.C (file contents):
Revision 1.64 by root, Fri Aug 10 11:02:44 2007 UTC vs.
Revision 1.65 by root, Thu Aug 16 06:36:56 2007 UTC

     }
   else
     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_list ap;
-    va_start (ap, format);
+  va_start (ap, format);
-    len = vsnprintf (buf, sizeof (buf), format, ap);
+  buf.vprintf (format, ap);
-    va_end (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 ()
 {
   struct timeval tv;

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines