Changeset e14e025 in git

Timestamp:

Feb 6, 2013, 7:27:47 PM (10 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'a800fe4b3e9d37a38c5a10cc0ae9dfa0c15a4ee6')

Children:

34bed3afb398ed629ac9df0a7633a0816ba27718

Parents:

1c5a1af33531acb85a9938d6894ef8808fcae845

Message:

opt: omfree -> omFree

Files:

• Singular/ipid.cc (modified) (1 diff)
• kernel/kstd1.cc (modified) (2 diffs)
• kernel/kstd2.cc (modified) (2 diffs)

Singular/ipid.cc

@@ -672 +672 @@
     }
 #endif /* HAVE_STATIC */
-    omfree((ADDRESS)pack->libname);
+    omFree((ADDRESS)pack->libname);
     memset((void *) pack, 0, sizeof(sip_package));
     pack->language=LANG_NONE;

kernel/kstd1.cc

@@ -1559 +1559 @@
   /*- release temp data------------------------------- -*/
   cleanT(strat);
+  assume(strat->L==NULL); /*strat->L unsed */
+  assume(strat->B==NULL); /*strat->B unused */
   omFreeSize((ADDRESS)strat->T,strat->tmax*sizeof(TObject));
   omFreeSize((ADDRESS)strat->ecartS,IDELEMS(strat->Shdl)*sizeof(int));
   omFreeSize((ADDRESS)strat->sevS,IDELEMS(strat->Shdl)*sizeof(unsigned long));
   omFreeSize((ADDRESS)strat->NotUsedAxis,((currRing->N)+1)*sizeof(BOOLEAN));
-  omfree(strat->sevT);
-  omfree(strat->S_2_R);
-  omfree(strat->R);
+  omFree(strat->sevT);
+  omFree(strat->S_2_R);
+  omFree(strat->R);
 
   if ((Q!=NULL)&&(strat->fromQ!=NULL))
@@ -1699 +1701 @@
   }
   /*- release temp data------------------------------- -*/
+  assume(strat->L==NULL); /*strat->L unsed */
+  assume(strat->B==NULL); /*strat->B unused */
   omFreeSize((ADDRESS)strat->T,strat->tmax*sizeof(TObject));
   omFreeSize((ADDRESS)strat->ecartS,IDELEMS(strat->Shdl)*sizeof(int));
   omFreeSize((ADDRESS)strat->sevS,IDELEMS(strat->Shdl)*sizeof(unsigned long));
   omFreeSize((ADDRESS)strat->NotUsedAxis,((currRing->N)+1)*sizeof(BOOLEAN));
-  omfree(strat->sevT);
-  omfree(strat->S_2_R);
-  omfree(strat->R);
+  omFree(strat->sevT);
+  omFree(strat->S_2_R);
+  omFree(strat->R);
   if ((Q!=NULL)&&(strat->fromQ!=NULL))
   {

kernel/kstd2.cc

@@ -2079 +2079 @@
   }
   /*- release temp data------------------------------- -*/
-  omfree(strat->sevS);
-  omfree(strat->ecartS);
-  omfree(strat->T);
-  omfree(strat->sevT);
-  omfree(strat->R);
+  assume(strat->L==NULL); /* strat->L unused */
+  assume(strat->B==NULL); /* strat->B unused */
+  omFree(strat->sevS);
+  omFree(strat->ecartS);
+  assume(strat->T==NULL);//omfree(strat->T);
+  assume(strat->sevT==NULL);//omfree(strat->sevT);
+  assume(strat->R==NULL);//omfree(strat->R);
   omfree(strat->S_2_R);
-  omfree(strat->L);
-  omfree(strat->B);
   omfree(strat->fromQ);
   idDelete(&strat->Shdl);
@@ -2156 +2156 @@
   }
   /*- release temp data------------------------------- -*/
-  SI_RESTORE_OPT1(save1);
-  omfree(strat->sevS);
-  omfree(strat->ecartS);
-  omfree(strat->T);
-  omfree(strat->sevT);
-  omfree(strat->R);
+  assume(strat->L==NULL); /* strat->L unused */
+  assume(strat->B==NULL); /* strat->B unused */
+  omFree(strat->sevS);
+  omFree(strat->ecartS);
+  assume(strat->T==NULL);//omfree(strat->T);
+  assume(strat->sevT==NULL);//omfree(strat->sevT);
+  assume(strat->R==NULL);//omfree(strat->R);
   omfree(strat->S_2_R);
-  omfree(strat->L);
-  omfree(strat->B);
   omfree(strat->fromQ);
   idDelete(&strat->Shdl);