Mercurial > hg > minc-tools

changeset 1000:d47128626f36

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
*** empty log message ***
author david <david>
date Tue, 16 Apr 1996 14:26:56 +0000
parents a3bece5b4a6b
children 82e597e0ee28
files volume_io/Include/volume_io/alloc.h volume_io/Prog_utils/alloc.c
diffstat 2 files changed, 6 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/volume_io/Include/volume_io/alloc.h
+++ b/volume_io/Include/volume_io/alloc.h
@@ -29,7 +29,7 @@
 ---------------------------------------------------------------------------- */
 
 #ifndef lint
-static char alloc_rcsid[] = "$Header: /private-cvsroot/minc/volume_io/Include/volume_io/alloc.h,v 1.11 1995-08-14 18:08:22 david Exp $";
+static char alloc_rcsid[] = "$Header: /private-cvsroot/minc/volume_io/Include/volume_io/alloc.h,v 1.12 1996-04-16 14:27:57 david Exp $";
 #endif
 
 #include  <basic.h>
@@ -139,9 +139,9 @@
 ---------------------------------------------------------------------------- */
 
 #define  ALLOC_VAR_SIZED_STRUCT( ptr, element_type, n_elements )              \
-             alloc_memory_in_bytes( (void **) &(ptr),                         \
-             (size_t) (sizeof(*(ptr))+((n_elements)-1) * sizeof(element_type))\
-             _ALLOC_SOURCE_LINE )
+  alloc_memory_in_bytes( (void **) &(ptr),                                    \
+  (size_t) (sizeof(*(ptr))+((size_t)(n_elements)-1) * sizeof(element_type))   \
+  _ALLOC_SOURCE_LINE )
 
 /* ----------------------------- MNI Header -----------------------------------
 @NAME       : ALLOC2D
--- a/volume_io/Prog_utils/alloc.c
+++ b/volume_io/Prog_utils/alloc.c
@@ -16,7 +16,7 @@
 #include  <stdlib.h>
 
 #ifndef lint
-static char rcsid[] = "$Header: /private-cvsroot/minc/volume_io/Prog_utils/alloc.c,v 1.19 1995-10-19 15:46:43 david Exp $";
+static char rcsid[] = "$Header: /private-cvsroot/minc/volume_io/Prog_utils/alloc.c,v 1.20 1996-04-16 14:26:56 david Exp $";
 #endif
 
 /* ----------------------------- MNI Header -----------------------------------
@@ -45,7 +45,7 @@
     size_t   i;
 
     for_less( i, 1, n1 )
-        ptr[i] = (void *) ((long) ptr[i-1] + n2 * type_size);
+        ptr[i] = (void *) ((long) ptr[i-1] + (long) n2* (long) type_size);
 }
 
 /* ----------------------------- MNI Header -----------------------------------