Changeset 1aecaec in git for factory/NTLconvert.cc

Timestamp:

Nov 13, 2006, 3:12:45 PM (17 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

80f80553bbef4f6821f903af441f6f5a3a50eba3

Parents:

d8847097b316a3093d010f81ca18aff328abb63c

Message:

*hannes/grayson: avoid static vars


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

File:

• factory/NTLconvert.cc (modified) (4 diffs)

factory/NTLconvert.cc

@@ -1 @@
-/* $Id: NTLconvert.cc,v 1.19 2006-09-25 12:33:36 Singular Exp $ */
+/* $Id: NTLconvert.cc,v 1.20 2006-11-13 14:12:45 Singular Exp $ */
 #include <config.h>
 
@@ -572 +572 @@
 ////////////////////////////////////////////////////////////////////////////////
 
-static char *cf_stringtemp=NULL;
-static char *cf_stringtemp2=NULL;
+static char *cf_stringtemp;
+static char *cf_stringtemp2;
 static int cf_stringtemp_l=0;
 CanonicalForm convertZZ2CF(ZZ coefficient)
@@ -579 +579 @@
   long coeff_long;
   //CanonicalForm tmp=0;
-  if (cf_stringtemp_l==0)
-  {
-    cf_stringtemp=(char *)Alloc(1023);
-    cf_stringtemp2=(char *)Alloc(1023);
-    cf_stringtemp[0]='\0';
-    cf_stringtemp2[0]='\0';
-    cf_stringtemp_l=1023;
-  }
   char dummy[2];
   int minusremainder=0;
@@ -604 +596 @@
   {
     // coefficient is not immediate (gmp-number)
+    if (cf_stringtemp_l==0)
+    {
+      cf_stringtemp=(char *)Alloc(1023);
+      cf_stringtemp2=(char *)Alloc(1023);
+      cf_stringtemp[0]='\0';
+      cf_stringtemp2[0]='\0';
+      cf_stringtemp_l=1023;
+    }
 
     // convert coefficient to char* (input for gmp)