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

Comparing deliantra/server/common/utils.C (file contents):
Revision 1.85 by root, Wed Dec 31 17:35:37 2008 UTC vs.
Revision 1.86 by root, Mon Jan 12 03:40:21 2009 UTC

 #endif
 /******************************************************************************/
+int
-void assign (char *dst, const char *src, int maxlen)
+assign (char *dst, const char *src, int maxsize)
 {
   if (!src)
     src = "";
   int len = strlen (src);
-  if (len >= maxlen - 1)
+  if (len >= maxsize)
     {
-      if (maxlen <= 4)
+      if (maxsize <= 4)
         {
-          memset (dst, '.', maxlen - 1);
+          memset (dst, '.', maxsize - 2);
-          dst [maxlen - 1] = 0;
+          dst [maxsize - 1] = 0;
         }
       else
         {
-          memcpy (dst, src, maxlen - 4);
+          memcpy (dst, src, maxsize - 4);
-          memcpy (dst + maxlen - 4, "...", 4);
+          memcpy (dst + maxsize - 4, "...", 4);
         }
+      len = maxsize;
     }
   else
-    memcpy (dst, src, len + 1);
+    memcpy (dst, src, ++len);
+  return len;
 }
 const char *
 format (const char *format, ...)
 {

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