Changeset f2dff02 in git

Timestamp:

Mar 26, 2001, 9:30:24 PM (22 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', '0d6b7fcd9813a1ca1ed4220cfa2b104b97a0a003')

Children:

355f86ae1e09b962323c4d49da60c5aa3a7eb6c5

Parents:

1bd25e34e1c021af2213fdd6edb61b9aa82fa6ca

Message:

*hannes: CleanUp does a memset


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

Location:

Singular

Files:

• iparith.cc (modified) (3 diffs)
• ipid.cc (modified) (3 diffs)
• iplib.cc (modified) (4 diffs)
• ipshell.cc (modified) (4 diffs)
• ring.cc (modified) (4 diffs)
• subexpr.cc (modified) (11 diffs)

Singular/iparith.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: iparith.cc,v 1.260 2001-03-05 18:25:47 mschulze Exp $ */
+/* $Id: iparith.cc,v 1.261 2001-03-26 19:30:20 Singular Exp $ */
 
 /*
@@ -1448 +1448 @@
   memcpy(u->next,v,sizeof(sleftv));
   BOOLEAN r=iiExprArithM(res,u,iiOp);
-  v->rtyp=0; v->data=NULL; // iiExprArithM did the CleanUp
+  // iiExprArithM did the CleanUp
   return r;
 }
@@ -4008 +4008 @@
   memcpy(u->next->next,w,sizeof(sleftv));
   BOOLEAN r=iiExprArithM(res,u,iiOp);
-  v->rtyp=0; v->data=NULL; // iiExprArithM did the CleanUp
+  // iiExprArithM did the CleanUp
   w->rtyp=0; w->data=NULL;
   return r;

Singular/ipid.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: ipid.cc,v 1.46 2000-12-06 11:03:15 Singular Exp $ */
+/* $Id: ipid.cc,v 1.47 2001-03-26 19:30:21 Singular Exp $ */
 
 /*
@@ -517 +517 @@
         {
           sLastPrinted.CleanUp();
-          memset(&sLastPrinted,0,sizeof(sleftv));
         }
       }
@@ -901 +900 @@
       hdh = temp;
     }
-    if(checkPackage(pack)) {
+    if(checkPackage(pack))
+    {
       paCleanUp(pack);
       omFreeBin((ADDRESS)pack,  sip_package_bin);
-    } else return FALSE;
-  } else paCleanUp(pack);
+    }
+    else return FALSE;
+  }
+  else paCleanUp(pack);
   return TRUE;
 }

Singular/iplib.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: iplib.cc,v 1.81 2001-03-26 18:11:53 Singular Exp $ */
+/* $Id: iplib.cc,v 1.82 2001-03-26 19:30:22 Singular Exp $ */
 /*
 * ABSTRACT: interpreter: LIB and help
@@ -57 +57 @@
 char * iiGetLibName(procinfov pi)
 {
-  char *res=NULL;
-
-  res = pi->libname;
-  return res;
-}
+  return pi->libname;
+}
+
 /*2
 * given a line 'proc[ ]+{name}[ \t]*'
@@ -102 +100 @@
   BOOLEAN args_found;
   char *s;
-  char *argstr=(char *)omAlloc(124);
-  int argstrlen=124;
+  char *argstr=(char *)omAlloc(127); // see ../omalloc/omTables.inc
+  int argstrlen=127;
   *argstr='\0';
   do
@@ -379 +377 @@
   if(pi->is_static)
   {
-    if(ns==NULL)
-    {
-      Werror("'%s::%s()' 1 is a local procedure and cannot be accessed by an user.",
-             plib, pi->procname);
-      omFree(plib);
-      return NULL;
-    }
-    if(strcmp(plib, namespaceroot->name)!= 0)
-    {
-      Werror("'%s::%s()' 2 is a local procedure and cannot be accessed by an user.",
+    if((ns==NULL)
+    || (strcmp(plib, namespaceroot->name)!= 0))
+    {
+      Werror("'%s::%s()' is a local procedure and cannot be accessed by an user.",
              plib, pi->procname);
       omFree(plib);

Singular/ipshell.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: ipshell.cc,v 1.64 2001-03-22 19:11:04 Singular Exp $ */
+/* $Id: ipshell.cc,v 1.65 2001-03-26 19:30:23 Singular Exp $ */
 /*
 * ABSTRACT:
@@ -386 +386 @@
   while (h!=NULL)
   {
-    if ((all && (IDTYP(h)!=PROC_CMD)) || (typ == IDTYP(h))
+    if ((all && (IDTYP(h)!=PROC_CMD) &&(IDTYP(h)!=PACKAGE_CMD))
+    || (typ == IDTYP(h))
     || ((IDTYP(h)==QRING_CMD) && (typ==RING_CMD)))
     {
@@ -1043 +1044 @@
     else
     {
-      if(iiInternalExport(v, toLev)) {
+      if(iiInternalExport(v, toLev))
+      {
         r->CleanUp();
         return TRUE;
@@ -1087 +1089 @@
         }
       }
-      if(iiInternalExport(v, toLev, root)) {
+      if(iiInternalExport(v, toLev, root))
+      {
         rv->CleanUp();
         return TRUE;

Singular/ring.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: ring.cc,v 1.161 2001-02-21 10:08:14 Singular Exp $ */
+/* $Id: ring.cc,v 1.162 2001-03-26 19:30:23 Singular Exp $ */
 
 /*
@@ -128 +128 @@
   {
     sLastPrinted.CleanUp();
-    memset(&sLastPrinted,0,sizeof(sleftv));
   }
 
@@ -147 +146 @@
   {
     sLastPrinted.CleanUp();
-    memset(&sLastPrinted,0,sizeof(sleftv));
   }
 
@@ -876 +874 @@
       {
         sLastPrinted.CleanUp();
-        memset(&sLastPrinted,0,sizeof(sleftv));
       }
       if ((myynest>0) && (iiRETURNEXPR[myynest].RingDependend()))

Singular/subexpr.cc

@@ -5 +5 @@
 * ABSTRACT: handling of leftv
 */
-/* $Id: subexpr.cc,v 1.74 2001-03-23 18:27:41 Singular Exp $ */
+/* $Id: subexpr.cc,v 1.75 2001-03-26 19:30:24 Singular Exp $ */
 
 #include <stdlib.h>
@@ -286 +286 @@
     omFree((ADDRESS)name);
   }
-  name=NULL;
-  flag=0;
+  //name=NULL;
+  //flag=0;
 #ifdef HAVE_NAMESPACES
-  packhdl = NULL;
-  req_packhdl = NULL;
+  //packhdl = NULL;
+  //req_packhdl = NULL;
 #endif /* HAVE_NAMESPACES */
   if (data!=NULL)
@@ -361 +361 @@
       case VTIMER:
 #ifdef HAVE_RTIMER
-        case VRTIMER:
+      case VRTIMER:
 #endif
       case VOICE:
@@ -378 +378 @@
 #endif
     } /* end switch: (rtyp) */
-    data=NULL;
+    //data=NULL;
   }
   if (attribute!=NULL)
@@ -408 +408 @@
       case LIB_CMD:
       case 0:
-        attribute=NULL;
+        //attribute=NULL;
         break;
       default:
@@ -429 +429 @@
     e=h;
   }
-  rtyp=NONE;
+  //rtyp=NONE;
   if (next!=NULL)
   {
@@ -443 +443 @@
     } while (next!=NULL);
   }
+  Init();
 }
 
@@ -529 +530 @@
 void sleftv::Copy(leftv source)
 {
-  memset(this,0,sizeof(*this));
+  Init();
   rtyp=source->Typ();
   void *d=source->Data();
@@ -1109 +1110 @@
       // the evalutated form will be build in tmp
       sleftv tmp;
-      memset(&tmp,0,sizeof(tmp));
+      tmp.Init();
       tmp.rtyp=STRING_CMD;
       r=(char *)omAllocBin(size_two_bin);
@@ -1308 +1309 @@
   }
 #endif
-  memset(v,0,sizeof(sleftv));
+  v->Init();
 #ifdef HAVE_NAMESPACES
   v->packhdl = NULL;
@@ -1585 +1586 @@
             memset(&d->arg1,0,sizeof(sleftv));
             this->CleanUp();
-            memset(this,0,sizeof(sleftv));
             rtyp=NONE;
           }