Changeset 46feb1 in git

Timestamp:

Apr 27, 1998, 6:09:37 PM (25 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

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

Children:

38b2367c696dca8d148e865e1462e98984c9ccab

Parents:

94f4f4606dc2922d461753e53811bf335011bcf5

Message:

* hannes: use ReAlloc for enlargeT, enlargeL  (kutil.cc)


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

Location:

Singular

Files:

• ChangeLog (modified) (1 diff)
• kutil.cc (modified) (3 diffs)
• kutil.h (modified) (2 diffs)

Singular/ChangeLog

@@ +1 @@
+Mon Apr 27 18:07:21 MET DST 1998 hannes
+        * use ReAlloc for enlargeT, enlargeL  (kutil.cc)
 Mon Apr 27 16:45:41 MET DST 1998 hannes
         * fixed conversion of factory 0 to poly NULL (clapconv.cc)

Singular/kutil.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: kutil.cc,v 1.18 1998-04-23 09:52:11 Singular Exp $ */
+/* $Id: kutil.cc,v 1.19 1998-04-27 16:08:44 Singular Exp $ */
 /*
 * ABSTRACT: kernel: utils for std
@@ -205 +205 @@
 }
 
-void enlargeT (TSet* T,int* length,int incr)
+static inline void enlargeT (TSet* T,int* length,int incr)
 {
   TSet h;
 
-  h = (TSet)Alloc(((*length)+incr)* sizeof(TObject));
-  /*for (i=0; i<=(*length)-1; i++) h[i] = (*T)[i];*/
-  memcpy(h, *T, (*length) * sizeof(TObject));
-  Free((ADDRESS)*T,((*length)*sizeof(TObject)));
-  *T = h;
+  *T = (TSet)ReAlloc((ADDRESS)(*T),(*length)*sizeof(TObject),
+                                   ((*length)+incr)*sizeof(TObject));
   (*length) += incr;
 }
@@ -250 +247 @@
 }
 
-void enlargeL (LSet* L,int* length,int incr)
+static inline void enlargeL (LSet* L,int* length,int incr)
 {
   LSet h;
 
-  h = (LSet)Alloc(((*length)+incr)*sizeof(LObject));
-  /*for (i=0; i<(*length); i++) h[i] = (*L)[i];*/
-  memcpy(h, *L, (*length) * sizeof(LObject));
-  Free((ADDRESS)*L,((*length)*sizeof(LObject)));
-  *L = h;
+  *L = (LSet)ReAlloc((ADDRESS)(*L),(*length)*sizeof(LObject),
+                                   ((*length)+incr)*sizeof(LObject));
   (*length) += incr;
 }

Singular/kutil.h

@@ -4 +4 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: kutil.h,v 1.8 1998-04-22 07:49:02 Singular Exp $ */
+/* $Id: kutil.h,v 1.9 1998-04-27 16:09:37 Singular Exp $ */
 /*
 * ABSTRACT: kernel: utils for std
@@ -121 +121 @@
 void deleteHC(poly *p, int *e, int *l, kStrategy strat);
 void deleteInS (int i,kStrategy strat);
-void enlargeT (TSet* T,int* length,int incr);
 void cleanT (kStrategy strat);
 LSet initL ();
-void enlargeL (LSet* L,int* length,int incr);
 void deleteInL(LSet set, int *length, int j,kStrategy strat);
 void enterL (LSet *set,int *length, int *LSetmax, LObject p,int at);