Skip to content

Commit 66b25ea

Browse files
committed
working change ocaml#2
1 parent 3386376 commit 66b25ea

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

65 files changed

+271
-257
lines changed

otherlibs/systhreads/st_posix.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -435,7 +435,7 @@ static value st_encode_sigset(sigset_t * set)
435435
Begin_root(res)
436436
for (i = 1; i < NSIG; i++)
437437
if (sigismember(set, i) > 0) {
438-
value newcons = caml_alloc_small(2, 0);
438+
value newcons = caml_alloc(2, 0);
439439
Field(newcons, 0) = Val_int(caml_rev_convert_signal_number(i));
440440
Field(newcons, 1) = res;
441441
res = newcons;

otherlibs/systhreads/st_stubs.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -370,7 +370,7 @@ static value caml_thread_new_descriptor(value clos)
370370
/* Create and initialize the termination semaphore */
371371
mu = caml_threadstatus_new();
372372
/* Create a descriptor for the new thread */
373-
descr = caml_alloc_small(3, 0);
373+
descr = caml_alloc(3, 0);
374374
Ident(descr) = Val_long(thread_next_ident);
375375
Start_closure(descr) = clos;
376376
Terminated(descr) = mu;

otherlibs/unix/accept.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ CAMLprim value unix_accept(value cloexec, value sock)
4949
#endif
5050
a = alloc_sockaddr(&addr, addr_len, retcode);
5151
Begin_root (a);
52-
res = caml_alloc_small(2, 0);
52+
res = caml_alloc(2, 0);
5353
Field(res, 0) = Val_int(retcode);
5454
Field(res, 1) = a;
5555
End_roots();

otherlibs/unix/getaddrinfo.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ static value convert_addrinfo(struct addrinfo * a)
4646
memcpy(&sa.s_gen, a->ai_addr, len);
4747
vaddr = alloc_sockaddr(&sa, len, -1);
4848
vcanonname = caml_copy_string(a->ai_canonname == NULL ? "" : a->ai_canonname);
49-
vres = caml_alloc_small(5, 0);
49+
vres = caml_alloc(5, 0);
5050
Field(vres, 0) = cst_to_constr(a->ai_family, socket_domain_table, 3, 0);
5151
Field(vres, 1) = cst_to_constr(a->ai_socktype, socket_type_table, 4, 0);
5252
Field(vres, 2) = Val_int(a->ai_protocol);
@@ -117,7 +117,7 @@ CAMLprim value unix_getaddrinfo(value vnode, value vserv, value vopts)
117117
if (retcode == 0) {
118118
for (r = res; r != NULL; r = r->ai_next) {
119119
e = convert_addrinfo(r);
120-
v = caml_alloc_small(2, 0);
120+
v = caml_alloc(2, 0);
121121
Field(v, 0) = e;
122122
Field(v, 1) = vres;
123123
vres = v;

otherlibs/unix/getgr.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ static value alloc_group_entry(struct group *entry)
3333
hence this workaround */
3434
pass = caml_copy_string(entry->gr_passwd ? entry->gr_passwd : "");
3535
mem = caml_copy_string_array((const char**)entry->gr_mem);
36-
res = caml_alloc_small(4, 0);
36+
res = caml_alloc(4, 0);
3737
Field(res,0) = name;
3838
Field(res,1) = pass;
3939
Field(res,2) = Val_int(entry->gr_gid);

otherlibs/unix/gethost.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ static value alloc_host_entry(struct hostent *entry)
7171
entry_h_length = entry->h_length;
7272
addr_list =
7373
caml_alloc_array(alloc_one_addr, (const char**)entry->h_addr_list);
74-
res = caml_alloc_small(4, 0);
74+
res = caml_alloc(4, 0);
7575
Field(res, 0) = name;
7676
Field(res, 1) = aliases;
7777
switch (entry->h_addrtype) {

otherlibs/unix/getnameinfo.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ CAMLprim value unix_getnameinfo(value vaddr, value vopts)
5454
if (retcode != 0) caml_raise_not_found();
5555
vhost = caml_copy_string(host);
5656
vserv = caml_copy_string(serv);
57-
vres = caml_alloc_small(2, 0);
57+
vres = caml_alloc(2, 0);
5858
Field(vres, 0) = vhost;
5959
Field(vres, 1) = vserv;
6060
CAMLreturn(vres);

otherlibs/unix/getproto.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ static value alloc_proto_entry(struct protoent *entry)
3333
Begin_roots2 (name, aliases);
3434
name = caml_copy_string(entry->p_name);
3535
aliases = caml_copy_string_array((const char**)entry->p_aliases);
36-
res = caml_alloc_small(3, 0);
36+
res = caml_alloc(3, 0);
3737
Field(res,0) = name;
3838
Field(res,1) = aliases;
3939
Field(res,2) = Val_int(entry->p_proto);

otherlibs/unix/getpw.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ static value alloc_passwd_entry(struct passwd *entry)
3737
#endif
3838
dir = caml_copy_string(entry->pw_dir);
3939
shell = caml_copy_string(entry->pw_shell);
40-
res = caml_alloc_small(7, 0);
40+
res = caml_alloc(7, 0);
4141
Field(res,0) = name;
4242
Field(res,1) = passwd;
4343
Field(res,2) = Val_int(entry->pw_uid);

otherlibs/unix/getserv.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ static value alloc_service_entry(struct servent *entry)
3838
name = caml_copy_string(entry->s_name);
3939
aliases = caml_copy_string_array((const char**)entry->s_aliases);
4040
proto = caml_copy_string(entry->s_proto);
41-
res = caml_alloc_small(4, 0);
41+
res = caml_alloc(4, 0);
4242
Field(res,0) = name;
4343
Field(res,1) = aliases;
4444
Field(res,2) = Val_int(ntohs(entry->s_port));

0 commit comments

Comments
 (0)