Changeset 888bfe6 in git

Timestamp:

Oct 14, 2008, 9:56:47 AM (15 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', '0604212ebb110535022efecad887940825b97c3f')

Children:

5c9d99573bf1433cfce050d20faf365415f0e341

Parents:

0ebb922e88968aeb8c46d80e1e4f0e32a6039f3d

Message:

*hannes: StringAppend opt. again


git-svn-id: file:///usr/local/Singular/svn/trunk@11137 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.21 2008-10-13 17:32:34 Singular Exp $ */
+/* $Id: febase.cc,v 1.22 2008-10-14 07:56:47 Singular Exp $ */
 /*
 * ABSTRACT: i/o system
@@ -822 +822 @@
   long more;
   va_start(ap, fmt);
-  if (*fmt!='\0')
-  {
-    if ((more=feBufferStart-feBuffer+strlen(fmt)+100)>feBufferLength)
-    {
-      more = ((more + (8*1024-1))/(8*1024))*(8*1024);
-      int l=s-feBuffer;
-      //if (more!=feBufferLength)
-      {
-        feBuffer=(char *)omReallocSize((ADDRESS)feBuffer,feBufferLength,
-                                                       more);
-        omMarkAsStaticAddr(feBuffer);
-        feBufferLength=more;
-        s=feBuffer+l;
+  if ((more=feBufferStart-feBuffer+strlen(fmt)+100)>feBufferLength)
+  {
+    more = ((more + (8*1024-1))/(8*1024))*(8*1024);
+    int l=s-feBuffer;
+    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;