Changeset bbcf1d2 in git

Timestamp:

May 11, 2011, 12:22:16 PM (12 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', '00e2e9c41af3fde1273eb3633f4c0c7c3db2579d')

Children:

7d2573e1aca16d3661e41bb819c81b7bf820bd8b

Parents:

9f73e809ff62b04e212d2894f2bd5a52d50cc4bc

Message:

code cleanup from spielwiese

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

File:

• kernel/ring.cc (modified) (8 diffs)

kernel/ring.cc

@@ -386 +386 @@
             int64 *w=(int64 *)r->wvhdl[l];
             #if SIZEOF_LONG == 4
-                  Print("%*lld " ,nlen,w[i+j],i+j);
+            Print("%*lld " ,nlen,w[i+j]);
             #else
-            Print(" %*ld"  ,nlen,w[i+j],i+j);
+            Print(" %*ld"  ,nlen,w[i+j]);
             #endif
           }
           else
-            Print(" %*d" ,nlen,r->wvhdl[l][i+j],i+j);
+            Print(" %*d" ,nlen,r->wvhdl[l][i+j]);
         }
         if (r->order[l]!=ringorder_M) break;
@@ -1408 +1408 @@
       matrix D  = mpNew(l,l);
 
-      int param_shift = 0;
-
       for (i = 1; i <= rVar(R1); i++)
         for (j= rVar(R1)+1; j <= l; j++)
@@ -2343 +2341 @@
   place++;
   rO_Align(place,bitplace);
-  int i;
 }
 
@@ -5316 +5313 @@
 #include <ctype.h>
 
-static int rRealloc1(ring r, ring src, int size, int pos)
+static int rRealloc1(ring r, int size, int pos)
 {
   r->order=(int*)omReallocSize(r->order, size*sizeof(int), (size+1)*sizeof(int));
@@ -5472 +5469 @@
       case ringorder_dp: /* dp -> a(1..1),ls */
       {
-        l=rRealloc1(r,src,l,j);
+        l=rRealloc1(r,l,j);
         r->order[j]=ringorder_a;
         r->block0[j]=rOppVar(r, src->block1[i]);
@@ -5488 +5485 @@
       case ringorder_Dp: /* Dp -> a(1..1),rp */
       {
-        l=rRealloc1(r,src,l,j);
+        l=rRealloc1(r,l,j);
         r->order[j]=ringorder_a;
         r->block0[j]=rOppVar(r, src->block1[i]);
@@ -5504 +5501 @@
       case ringorder_wp: /* wp -> a(...),ls */
       {
-        l=rRealloc1(r,src,l,j);
+        l=rRealloc1(r,l,j);
         r->order[j]=ringorder_a;
         r->block0[j]=rOppVar(r, src->block1[i]);
@@ -5519 +5516 @@
       case ringorder_Wp: /* Wp -> a(...),rp */
       {
-        l=rRealloc1(r,src,l,j);
+        l=rRealloc1(r,l,j);
         r->order[j]=ringorder_a;
         r->block0[j]=rOppVar(r, src->block1[i]);