/[guile]/guile/guile-core/libguile/convert.i.c
ViewVC logotype

Diff of /guile/guile-core/libguile/convert.i.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.1 by ela, Thu Jan 31 10:38:50 2002 UTC revision 1.2 by mvo, Mon Feb 11 18:06:50 2002 UTC
# Line 152  CTYPES2UVECT (const CTYPE *data, long n) Line 152  CTYPES2UVECT (const CTYPE *data, long n)
152    
153    SCM_ASSERT_RANGE (SCM_ARG2, scm_long2num (n),    SCM_ASSERT_RANGE (SCM_ARG2, scm_long2num (n),
154                      n > 0 && n <= SCM_UVECTOR_MAX_LENGTH);                      n > 0 && n <= SCM_UVECTOR_MAX_LENGTH);
155    if ((v = (char *) SCM_MUST_MALLOC_TYPE_NUM (CTYPE, n)) == NULL)    v = scm_gc_malloc (sizeof (CTYPE) * n, "vector");
     return SCM_UNDEFINED;  
156    memcpy (v, data, n * sizeof (CTYPE));    memcpy (v, data, n * sizeof (CTYPE));
157    return scm_alloc_cell (SCM_MAKE_UVECTOR_TAG (n, UVECTTYPE), (scm_t_bits) v);    return scm_alloc_cell (SCM_MAKE_UVECTOR_TAG (n, UVECTTYPE), (scm_t_bits) v);
158  }  }
# Line 168  CTYPES2UVECT2 (const unsigned CTYPE *dat Line 167  CTYPES2UVECT2 (const unsigned CTYPE *dat
167    
168    SCM_ASSERT_RANGE (SCM_ARG2, scm_long2num (n),    SCM_ASSERT_RANGE (SCM_ARG2, scm_long2num (n),
169                      n > 0 && n <= SCM_UVECTOR_MAX_LENGTH);                      n > 0 && n <= SCM_UVECTOR_MAX_LENGTH);
170    if ((v = (char *) SCM_MUST_MALLOC_TYPE_NUM (unsigned CTYPE, n)) == NULL)    v = scm_gc_malloc (sizeof (unsigned CTYPE) * n, "vector");
     return SCM_UNDEFINED;  
171    memcpy (v, data, n * sizeof (unsigned CTYPE));    memcpy (v, data, n * sizeof (unsigned CTYPE));
172    return scm_alloc_cell (SCM_MAKE_UVECTOR_TAG (n, UVECTTYPE2), (scm_t_bits) v);    return scm_alloc_cell (SCM_MAKE_UVECTOR_TAG (n, UVECTTYPE2), (scm_t_bits) v);
173  }  }

Legend:
Removed from v.1.1  
changed lines
  Added in v.1.2

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26