From 15d12df25bd53b84228e9f662d9477cdc3e7c83d Mon Sep 17 00:00:00 2001
From: rlar <rlar>
Date: Sun, 24 Oct 2010 13:27:18 +0000
Subject: [PATCH] tmalloc usage unification, parenthesize some terms

---
 ChangeLog                        | 6 ++++++
 src/frontend/com_compose.c       | 8 ++++----
 src/frontend/plotting/plotcurv.c | 2 +-
 src/maths/poly/interpolate.c     | 2 +-
 4 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 302c6dcb7..205b167bd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-10-24  Robert Larice
+ * src/frontend/com_compose.c ,
+ * src/frontend/plotting/plotcurv.c ,
+ * src/maths/poly/interpolate.c :
+  tmalloc usage unification, parenthesize some terms
+
 2010-10-24  Robert Larice
  * src/spicelib/devices/asrc/asrcset.c ,
  * src/xspice/mif/mif_inp2.c :
diff --git a/src/frontend/com_compose.c b/src/frontend/com_compose.c
index 562d6d845..25c03db30 100644
--- a/src/frontend/com_compose.c
+++ b/src/frontend/com_compose.c
@@ -180,11 +180,11 @@ com_compose(wordlist *wl)
         for (i = 0, blocksize = 1; i < dim - 1; i++)
             blocksize *= dims[i];
         if (realflag)
-            data = (double *) tmalloc(sizeof (double) * length *
-                    blocksize);
+            data = (double *) tmalloc(sizeof (double) * (length *
+                    blocksize));
         else
-            cdata = (ngcomplex_t *) tmalloc(sizeof(ngcomplex_t) * length *
-                    blocksize);
+            cdata = (ngcomplex_t *) tmalloc(sizeof(ngcomplex_t) * (length *
+                    blocksize));
 
         /* Now copy all the data over... If the sizes are too small
          * then the extra elements are left as 0.
diff --git a/src/frontend/plotting/plotcurv.c b/src/frontend/plotting/plotcurv.c
index 35bf9e122..6b554f202 100644
--- a/src/frontend/plotting/plotcurv.c
+++ b/src/frontend/plotting/plotcurv.c
@@ -211,7 +211,7 @@ ft_graf(struct dvec *v, struct dvec *xs, bool nostart)
     /* We need to do curve fitting now. First get some scratch 
      * space
      */
-    scratch = (double *) tmalloc((degree + 1) * (degree + 2) * 
+    scratch = (double *) tmalloc(((degree + 1) * (degree + 2)) * 
             sizeof (double));
     result = (double *) tmalloc((degree + 1) * sizeof (double));
     xdata = (double *) tmalloc((degree + 1) * sizeof (double));
diff --git a/src/maths/poly/interpolate.c b/src/maths/poly/interpolate.c
index 745cef893..b4747d7ac 100644
--- a/src/maths/poly/interpolate.c
+++ b/src/maths/poly/interpolate.c
@@ -55,7 +55,7 @@ ft_interpolate(double *data, double *ndata, double *oscale, int olen,
     else
         sign = 1;
 
-    scratch = (double *) tmalloc((degree + 1) * (degree + 2) * 
+    scratch = (double *) tmalloc(((degree + 1) * (degree + 2)) * 
             sizeof (double));
     result = (double *) tmalloc((degree + 1) * sizeof (double));
     xdata = (double *) tmalloc((degree + 1) * sizeof (double));