diff options
| author | Damien Doligez <damien.doligez-inria.fr> | 2003-12-16 18:09:44 +0000 |
|---|---|---|
| committer | Damien Doligez <damien.doligez-inria.fr> | 2003-12-16 18:09:44 +0000 |
| commit | aa46693dc5810998b2668c31a8649c31f0f2e49c (patch) | |
| tree | e9548200a8d76ee9d3d1dbe0a776aa5b32d01f4c /byterun/ints.c | |
| parent | a90b6e9d1279612493dec0a50185bcdc8392807c (diff) | |
depollution (PR#1914, PR#1956)
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@6023 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
Diffstat (limited to 'byterun/ints.c')
| -rw-r--r-- | byterun/ints.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/byterun/ints.c b/byterun/ints.c index 7cad6bbdf..6e4de92fe 100644 --- a/byterun/ints.c +++ b/byterun/ints.c @@ -79,7 +79,7 @@ static long parse_long(value s, int nbits) /* Detect overflow in addition (base * res) + d */ if (res < (unsigned long) d) failwith("int_of_string"); } - if (p != String_val(s) + string_length(s)) failwith("int_of_string"); + if (p != String_val(s) + caml_string_length(s)) failwith("int_of_string"); if (base == 10) { /* Signed representation expected, allow -2^(nbits-1) to 2^(nbits - 1) */ if (res > 1UL << (nbits - 1)) @@ -139,7 +139,7 @@ static char * parse_format(value fmt, /* Copy Caml format fmt to format_string, adding the suffix before the last letter of the format */ - len = string_length(fmt); + len = caml_string_length(fmt); len_suffix = strlen(suffix); if (len + len_suffix + 1 >= FORMAT_BUFFER_SIZE) invalid_argument("format_int: format too long"); @@ -523,7 +523,7 @@ CAMLprim value int64_of_string(value s) /* Detect overflow in addition (base * res) + d */ if (I64_ult(res, I64_of_int32(d))) failwith("int_of_string"); } - if (p != String_val(s) + string_length(s)) failwith("int_of_string"); + if (p != String_val(s) + caml_string_length(s)) failwith("int_of_string"); if (base == 10 && I64_ult(max_int64, res)) failwith("int_of_string"); if (sign < 0) res = I64_neg(res); return copy_int64(res); |