Changeset 678db5 in git

Timestamp:

Oct 13, 2008, 7:17:06 PM (16 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', '17f1d200f27c5bd38f5dfc6e8a0879242279d1d8')

Children:

47fa19583c6aac5d7fbb8a1d45f75499e841eafd

Parents:

557ebdfb9713d33ae4d3f50db45c8018a9c4c377

Message:

*hannes: minor opt: StringAppend


git-svn-id: file:///usr/local/Singular/svn/trunk@11132 2c84dea3-7e68-4137-9b89-c4e89433aadc

File:

• kernel/febase.cc (modified) (2 diffs)

kernel/febase.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: febase.cc,v 1.19 2008-10-13 16:17:14 Singular Exp $ */
+/* $Id: febase.cc,v 1.20 2008-10-13 17:17:06 Singular Exp $ */
 /*
 * ABSTRACT: i/o system
@@ -822 +822 @@
   long more;
   va_start(ap, fmt);
-  if ((more=feBufferStart-feBuffer+strlen(fmt)+100)>feBufferLength)
-  {
-    more = ((more + (4*1024-1))/(4*1024))*(4*1024);
-    int l=s-feBuffer;
-    feBuffer=(char *)omReallocSize((ADDRESS)feBuffer,feBufferLength,
-                                                     more);
-    omMarkAsStaticAddr(feBuffer);
-    feBufferLength=more;
-    s=feBuffer+l;
+  if (*fmt!='\0')
+  {
+    if ((more=feBufferStart-feBuffer+strlen(fmt)+100)>feBufferLength)
+    {
+      more = ((more + (4*1024-1))/(4*1024))*(4*1024);
+      int l=s-feBuffer;
+      if (more!=feBufferLength)
+      {
+        feBuffer=(char *)omReallocSize((ADDRESS)feBuffer,feBufferLength,
+                                                       more);
+        omMarkAsStaticAddr(feBuffer);
+        feBufferLength=more;
+        s=feBuffer+l;
 #ifndef BSD_SPRINTF
-    feBufferStart=s;
-#endif
-  }
+        feBufferStart=s;
+#endif
+      }
+    }
 #ifdef BSD_SPRINTF
-  vsprintf(s, fmt, ap);
-  while (*s!='\0') s++;
-  feBufferStart =s;
+    vsprintf(s, fmt, ap);
+    while (*s!='\0') s++;
+    feBufferStart =s;
 #else
 #ifdef HAVE_VSNPRINTF
-  vs = vsnprintf(s, feBufferLength - (feBufferStart - feBuffer), fmt, ap);
-  if (vs == -1)
-  {
-    assume(0);
-    feBufferStart = feBuffer + feBufferLength -1;
-  }
-  else
-  {
-    feBufferStart += vs;
-  }
+    vs = vsnprintf(s, feBufferLength - (feBufferStart - feBuffer), fmt, ap);
+    if (vs == -1)
+    {
+      assume(0);
+      feBufferStart = feBuffer + feBufferLength -1;
+    }
+    else
+    {
+      feBufferStart += vs;
+    }
 #else
-  feBufferStart += vsprintf(s, fmt, ap);
-#endif
-#endif
-  omCheckAddrSize(feBuffer, feBufferLength);
+    feBufferStart += vsprintf(s, fmt, ap);
+#endif
+#endif
+    omCheckAddrSize(feBuffer, feBufferLength);
+  }
   va_end(ap);
   return feBuffer;