Changeset c232af in git for Singular/febase.cc

Timestamp:

Aug 14, 2000, 2:58:28 PM (24 years ago)

Author:

Olaf Bachmann <obachman@…>

Branches:

(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', 'b4f17ed1d25f93d46dbe29e4b499baecc2fd51bb')

Children:

d26c2e9dd38f1531c0e77c38e6177109182b5bca

Parents:

4697a8a1ccbf49d0048033ea29c651e3966ba729

Message:

* omalloc stuff


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

File:

• Singular/febase.cc (modified) (22 diffs)

Singular/febase.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: febase.cc,v 1.87 2000-06-05 12:23:10 Singular Exp $ */
+/* $Id: febase.cc,v 1.88 2000-08-14 12:56:06 obachman Exp $ */
 /*
 * ABSTRACT: i/o system
@@ -29 +29 @@
 #include "tok.h"
 #include "febase.h"
-#include "mmemory.h"
+#include <omalloc.h>
 #include "subexpr.h"
 #include "ipshell.h"
@@ -46 +46 @@
 #define INITIAL_PRINT_BUFFER 24*1024
 static int feBufferLength=INITIAL_PRINT_BUFFER;
-static char * feBuffer=(char *)Alloc(INITIAL_PRINT_BUFFER);
+static char * feBuffer=(char *)omAlloc(INITIAL_PRINT_BUFFER);
 
 int     si_echo = 0;
@@ -156 +156 @@
     char *s;
 
-    if (where==NULL) s=(char *)AllocL(250);
+    if (where==NULL) s=(char *)omAlloc(250);
     else             s=where;
 
@@ -187 +187 @@
       if (f!=NULL)
       {
-        if (where==NULL) FreeL((ADDRESS)s);
+        if (where==NULL) omFree((ADDRESS)s);
         return f;
       }
@@ -196 +196 @@
       f=myfopen(path,mode);
     }
-    if (where==NULL) FreeL((ADDRESS)s);
+    if (where==NULL) omFree((ADDRESS)s);
   }
   if ((f==NULL)&&(useWerror))
@@ -215 +215 @@
     more = ((more + (4*1024-1))/(4*1024))*(4*1024);
     int l=s-feBuffer;
-    feBuffer=(char *)ReAlloc((ADDRESS)feBuffer,feBufferLength,
+    feBuffer=(char *)omReallocSize((ADDRESS)feBuffer,feBufferLength,
                                                      more);
     feBufferLength=more;
@@ -243 +243 @@
 #endif
 #endif
-  mmTest(feBuffer, feBufferLength);
+  omCheckAddrSize(feBuffer, feBufferLength);
   va_end(ap);
   return feBuffer;
@@ -256 +256 @@
   {
     more = ((more + (4*1024-1))/(4*1024))*(4*1024);
-    feBuffer=(char *)ReAlloc((ADDRESS)feBuffer,feBufferLength,
+    feBuffer=(char *)omReallocSize((ADDRESS)feBuffer,feBufferLength,
                                                      more);
     feBufferLength=more;
@@ -272 +272 @@
   {
     more = ((l + (4*1024-1))/(4*1024))*(4*1024);
-    feBuffer=(char *)ReAlloc((ADDRESS)feBuffer,feBufferLength,
+    feBuffer=(char *)omReallocSize((ADDRESS)feBuffer,feBufferLength,
                                                      more);
     feBufferLength=more;
@@ -301 +301 @@
     if (feErrors==NULL)
     {
-      feErrors=(char *)Alloc(256);
+      feErrors=(char *)omAlloc(256);
       feErrorsLen=256;
       *feErrors = '\0';
@@ -309 +309 @@
       if (((int)(strlen((char *)s)+ 20 +strlen(feErrors)))>=feErrorsLen)
       {
-        feErrors=(char *)ReAlloc(feErrors,feErrorsLen,feErrorsLen+256);
+        feErrors=(char *)omReallocSize(feErrors,feErrorsLen,feErrorsLen+256);
         feErrorsLen+=256;
       }
@@ -347 +347 @@
   va_list ap;
   va_start(ap, fmt);
-  char *s=(char *)Alloc(256);
+  char *s=(char *)omAlloc(256);
   vsprintf(s, fmt, ap);
   WerrorS(s);
-  Free(s,256);
+  omFreeSize(s,256);
   va_end(ap);
 }
@@ -386 +386 @@
   va_list ap;
   va_start(ap, fmt);
-  char *s=(char *)Alloc(256);
+  char *s=(char *)omAlloc(256);
   vsprintf(s, fmt, ap);
   WarnS(s);
-  Free(s,256);
+  omFreeSize(s,256);
   va_end(ap);
 }
@@ -448 +448 @@
 void SPrintStart()
 {
-  sprint = mstrdup("");
+  sprint = omStrDup("");
 }
 
 static void SPrintS(char* s)
 {
-  mmTestL(sprint);
+  omCheckAddr(sprint);
   if (s == NULL) return;
   int ls = strlen(s);
@@ -460 +460 @@
   char* ns;
   int l = strlen(sprint);
-  ns = (char*) AllocL((l + ls + 1)*sizeof(char));
+  ns = (char*) omAlloc((l + ls + 1)*sizeof(char));
   if (l > 0) strcpy(ns, sprint);
 
   strcpy(&(ns[l]), s);
-  FreeL(sprint);
+  omFree(sprint);
   sprint = ns;
-  mmTestL(sprint);
+  omCheckAddr(sprint);
 }
 
@@ -473 +473 @@
   char* ns = sprint;
   sprint = NULL;
-  mmTestL(ns);
+  omCheckAddr(ns);
   return ns;
 }
@@ -528 +528 @@
     va_list ap;
     va_start(ap, fmt);
-    mmTestL(sprint);
+    omCheckAddr(sprint);
     if (fmt != NULL && ls > 0)
     {
       char* ns;
       int l = strlen(sprint);
-      ns = (char*) AllocL(sizeof(char)*(ls + l + 256));
+      ns = (char*) omAlloc(sizeof(char)*(ls + l + 256));
       if (l > 0)  strcpy(ns, sprint);
 
@@ -542 +542 @@
       vsprintf(&(ns[l]), fmt, ap);
 #endif
-      mmTestL(ns);
-      FreeL(sprint);
+      omCheckAddr(ns);
+      omFree(sprint);
       sprint = ns;
     }
@@ -558 +558 @@
 #if (defined(HAVE_TCL) || defined(macintosh))
     {
-      char *s=(char *)Alloc(strlen(fmt)+256);
+      char *s=(char *)omAlloc(strlen(fmt)+256);
       vsprintf(s,fmt, ap);
 #ifdef HAVE_TCL
@@ -601 +601 @@
   {
     fclose(feProtFile);
+    feProt = 0;
   }
   if ((s!=NULL) && (*s!='\0'))
@@ -608 +609 @@
     {
       Werror("cannot open %s",s);
+      feProt=0;
     }
     else