diff options
Diffstat (limited to 'otherlibs/bigarray/mmap_win32.c')
| -rw-r--r-- | otherlibs/bigarray/mmap_win32.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/otherlibs/bigarray/mmap_win32.c b/otherlibs/bigarray/mmap_win32.c index fc48c7f5f..2fdfa84eb 100644 --- a/otherlibs/bigarray/mmap_win32.c +++ b/otherlibs/bigarray/mmap_win32.c @@ -65,12 +65,12 @@ CAMLprim value caml_ba_map_file(value vfd, value vkind, value vlayout, /* Extract dimensions from Caml array */ num_dims = Wosize_val(vdim); if (num_dims < 1 || num_dims > MAX_NUM_DIMS) - invalid_argument("Bigarray.mmap: bad number of dimensions"); + caml_invalid_argument("Bigarray.mmap: bad number of dimensions"); for (i = 0; i < num_dims; i++) { dim[i] = Long_val(Field(vdim, i)); if (dim[i] == -1 && i == major_dim) continue; - if (dim[i] < 0 || dim[i] > 0x7FFFFFFFL) - invalid_argument("Bigarray.create: negative dimension"); + if (dim[i] < 0) + caml_invalid_argument("Bigarray.create: negative dimension"); } /* Determine file size */ currpos = caml_ba_set_file_pointer(fd, 0, FILE_CURRENT); @@ -79,19 +79,19 @@ CAMLprim value caml_ba_map_file(value vfd, value vkind, value vlayout, if (file_size == -1) caml_ba_sys_error(); /* Determine array size in bytes (or size of array without the major dimension if that dimension wasn't specified) */ - array_size = bigarray_element_size[flags & BIGARRAY_KIND_MASK]; + array_size = caml_ba_element_size[flags & BIGARRAY_KIND_MASK]; for (i = 0; i < num_dims; i++) if (dim[i] != -1) array_size *= dim[i]; /* Check if the first/last dimension is unknown */ if (dim[major_dim] == -1) { /* Determine first/last dimension from file size */ if (file_size < startpos) - failwith("Bigarray.mmap: file position exceeds file size"); + caml_failwith("Bigarray.mmap: file position exceeds file size"); data_size = file_size - startpos; dim[major_dim] = (uintnat) (data_size / array_size); array_size = dim[major_dim] * array_size; if (array_size != data_size) - failwith("Bigarray.mmap: file size doesn't match array dimensions"); + caml_failwith("Bigarray.mmap: file size doesn't match array dimensions"); } /* Restore original file position */ caml_ba_set_file_pointer(fd, currpos, FILE_BEGIN); @@ -118,7 +118,7 @@ CAMLprim value caml_ba_map_file(value vfd, value vkind, value vlayout, /* Close the file mapping */ CloseHandle(fmap); /* Build and return the Caml bigarray */ - return alloc_bigarray(flags | BIGARRAY_MAPPED_FILE, num_dims, addr, dim); + return caml_ba_alloc(flags | BIGARRAY_MAPPED_FILE, num_dims, addr, dim); } CAMLprim value caml_ba_map_file_bytecode(value * argv, int argn) @@ -151,5 +151,5 @@ static void caml_ba_sys_error(void) sizeof(buffer), NULL)) sprintf(buffer, "Unknown error %ld\n", errnum); - raise_sys_error(copy_string(buffer)); + caml_raise_sys_error(caml_copy_string(buffer)); } |