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

Comparing deliantra/server/common/utils.C (file contents):
Revision 1.61 by root, Tue Jul 10 05:51:37 2007 UTC vs.
Revision 1.67 by root, Tue Oct 16 05:34:24 2007 UTC

 #include <funcpoint.h>
 #include <material.h>
 #include <glib.h>
+refcnt_base::refcnt_t refcnt_dummy;
+size_t slice_alloc;
 rand_gen rndm;
 void
 tausworthe_random_generator::seed (uint32_t seed)
 {
 {
   for (materialtype_t *mt = materialt; mt && mt->next; mt = mt->next)
     if (name == mt->name)
       return mt;
-  return materialt;
+  return 0;
 }
 /* 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)
 {
   materialtype_t *mt;
   int j;
  * a 'list' for the purposes here, is a string of items, seperated by commas, except
  * for the last entry, which has an 'and' before it, and a full stop (period) after it.
  * This function will also strip all trailing non alphanumeric characters.
  * It does not insert an oxford comma.
  */
 void
 make_list_like (char *input)
 {
   char *p, tmp[MAX_BUF];
   int i;
 void *salloc_ (int n) throw (std::bad_alloc)
 {
 #ifdef PREFER_MALLOC
   void *ptr = malloc (n);
 #else
+  slice_alloc += n;
   void *ptr = g_slice_alloc (n);
 #endif
   if (!ptr)
     throw std::bad_alloc ();
     }
   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;
     0xcdd70693UL, 0x54de5729UL, 0x23d967bfUL, 0xb3667a2eUL, 0xc4614ab8UL,
     0x5d681b02UL, 0x2a6f2b94UL, 0xb40bbe37UL, 0xc30c8ea1UL, 0x5a05df1bUL,
     0x2d02ef8dL
 };

Diff Legend

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

Comparing deliantra/server/common/utils.C (file contents): Revision 1.61 by root, Tue Jul 10 05:51:37 2007 UTC vs. Revision 1.67 by root, Tue Oct 16 05:34:24 2007 UTC

Diff Legend

Comparing deliantra/server/common/utils.C (file contents):
Revision 1.61 by root, Tue Jul 10 05:51:37 2007 UTC vs.
Revision 1.67 by root, Tue Oct 16 05:34:24 2007 UTC