Use 4.12 convenience option macros in C stubs

No change entry needed

otherlibs/unix/dup2.c

@@ -23,8 +23,8 @@ CAMLprim value unix_dup2(value cloexec, value fd1, value fd2)
   if (Int_val(fd2) == Int_val(fd1)) {
     /* In this case, dup3 fails and dup2 does nothing. */
     /* Just apply the cloexec flag to fd2, if it is given. */
-    if (Is_block(cloexec)) {
-      if (Bool_val(Field(cloexec, 0)))
+    if (Is_some(cloexec)) {
+      if (Bool_val(Some_val(cloexec)))
         unix_set_cloexec(Int_val(fd2), "dup2", Nothing);
       else
         unix_clear_cloexec(Int_val(fd2), "dup2", Nothing);

otherlibs/unix/errmsg.c

@@ -15,14 +15,11 @@
 
 #include <errno.h>
 #include <string.h>
-#include <caml/mlvalues.h>
 #include <caml/alloc.h>
-
-extern int error_table[];
+#include "unixsupport.h"
 
 CAMLprim value unix_error_message(value err)
 {
-  int errnum;
-  errnum = Is_block(err) ? Int_val(Field(err, 0)) : error_table[Int_val(err)];
+  int errnum = code_of_unix_error(err);
   return caml_copy_string(strerror(errnum));
 }

otherlibs/unix/link.c

@@ -37,12 +37,12 @@ CAMLprim value unix_link(value follow, value path1, value path2)
   p1 = caml_stat_strdup(String_val(path1));
   p2 = caml_stat_strdup(String_val(path2));
   caml_enter_blocking_section();
-  if (follow == Val_int(0) /* None */)
+  if (Is_none(follow))
     ret = link(p1, p2);
-  else { /* Some bool */
+  else {
 # ifdef AT_SYMLINK_FOLLOW
     int flags =
-      Is_block(follow) && Bool_val(Field(follow, 0)) /* Some true */
+      Is_some(follow) && Bool_val(Some_val(follow))
       ? AT_SYMLINK_FOLLOW
       : 0;
     ret = linkat(AT_FDCWD, p1, AT_FDCWD, p2, flags);

otherlibs/unix/sockopt.c

@@ -205,24 +205,21 @@ unix_getsockopt_aux(char * name,
     return Val_int(optval.i);
   case TYPE_LINGER:
     if (optval.lg.l_onoff == 0) {
-      return Val_int(0);        /* None */
+      return Val_none;
     } else {
-      value res = caml_alloc_small(1, 0); /* Some */
-      Field(res, 0) = Val_int(optval.lg.l_linger);
-      return res;
+      return caml_alloc_some(Val_int(optval.lg.l_linger));
     }
   case TYPE_TIMEVAL:
     return caml_copy_double((double) optval.tv.tv_sec
                        + (double) optval.tv.tv_usec / 1e6);
   case TYPE_UNIX_ERROR:
     if (optval.i == 0) {
-      return Val_int(0);        /* None */
+      return Val_none;
     } else {
       value err, res;
       err = unix_error_of_code(optval.i);
       Begin_root(err);
-        res = caml_alloc_small(1, 0); /* Some */
-        Field(res, 0) = err;
+        res = caml_alloc_some(err);
       End_roots();
       return res;
     }
@@ -248,9 +245,9 @@ unix_setsockopt_aux(char * name,
     break;
   case TYPE_LINGER:
     optsize = sizeof(optval.lg);
-    optval.lg.l_onoff = Is_block (val);
+    optval.lg.l_onoff = Is_some(val);
     if (optval.lg.l_onoff)
-      optval.lg.l_linger = Int_val (Field (val, 0));
+      optval.lg.l_linger = Int_val(Some_val(val));
     break;
   case TYPE_TIMEVAL:
     f = Double_val(val);

otherlibs/unix/spawn.c

@@ -44,8 +44,8 @@ CAMLprim value unix_spawn(value executable, /* string */
   caml_unix_check_path(executable, "create_process");
   path = String_val(executable);
   argv = cstringvect(args, "create_process");
-  if (Is_block(optenv)) {
-    envp = cstringvect(Field(optenv, 0), "create_process");
+  if (Is_some(optenv)) {
+    envp = cstringvect(Some_val(optenv), "create_process");
   } else {
     envp = environ;
   }
@@ -76,7 +76,7 @@ CAMLprim value unix_spawn(value executable, /* string */
  error:
   posix_spawn_file_actions_destroy(&act);
   cstringvect_free(argv);
-  if (Is_block(optenv)) cstringvect_free(envp);
+  if (Is_some(optenv)) cstringvect_free(envp);
   if (r != 0) unix_error(r, "create_process", executable);
   return Val_long(pid);
 }
@@ -111,8 +111,8 @@ CAMLprim value unix_spawn(value executable, /* string */
   caml_unix_check_path(executable, "create_process");
   path = String_val(executable);
   argv = cstringvect(args, "create_process");
-  if (Is_block(optenv)) {
-    envp = cstringvect(Field(optenv, 0), "create_process");
+  if (Is_some(optenv)) {
+    envp = cstringvect(Some_val(optenv), "create_process");
   } else {
     envp = NULL;
   }

otherlibs/unix/unixsupport.c

@@ -276,7 +276,7 @@ value unix_error_of_code (int errcode)
   return err;
 }
 
-extern int code_of_unix_error (value error)
+int code_of_unix_error (value error)
 {
   if (Is_block(error)) {
     return Int_val(Field(error, 0));
@@ -323,9 +323,8 @@ int unix_cloexec_default = 0;
 
 int unix_cloexec_p(value cloexec)
 {
-  /* [cloexec] is a [bool option].  */
-  if (Is_block(cloexec))
-    return Bool_val(Field(cloexec, 0));
+  if (Is_some(cloexec))
+    return Bool_val(Some_val(cloexec));
   else
     return unix_cloexec_default;
 }

otherlibs/win32unix/errmsg.c

@@ -23,14 +23,12 @@
 #include <caml/osdeps.h>
 #include "unixsupport.h"
 
-extern int error_table[];
-
 CAMLprim value unix_error_message(value err)
 {
   int errnum;
   wchar_t buffer[512];
 
-  errnum = Is_block(err) ? Int_val(Field(err, 0)) : error_table[Int_val(err)];
+  errnum = code_of_unix_error(err);
   if (errnum > 0)
     return caml_copy_string(strerror(errnum));
   if (FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS,

otherlibs/win32unix/link.c

@@ -36,7 +36,7 @@ CAMLprim value unix_link(value follow, value path1, value path2)
   tCreateHardLink pCreateHardLink;
   BOOL result;
   wchar_t * wpath1, * wpath2;
-  if (Is_block(follow) && !Bool_val(Field(follow, 0))) { /* Some false */
+  if (Is_some(follow) && !Bool_val(Some_val(follow))) {
     errno = ENOSYS;
     uerror("link", path2);
   }

otherlibs/win32unix/sockopt.c

@@ -142,24 +142,21 @@ unix_getsockopt_aux(char * name,
     return Val_int(optval.i);
   case TYPE_LINGER:
     if (optval.lg.l_onoff == 0) {
-      return Val_int(0);        /* None */
+      return Val_none;
     } else {
-      value res = caml_alloc_small(1, 0); /* Some */
-      Field(res, 0) = Val_int(optval.lg.l_linger);
-      return res;
+      return caml_alloc_some(Val_int(optval.lg.l_linger));
     }
   case TYPE_TIMEVAL:
     return caml_copy_double((double) optval.tv.tv_sec
                        + (double) optval.tv.tv_usec / 1e6);
   case TYPE_UNIX_ERROR:
     if (optval.i == 0) {
-      return Val_int(0);        /* None */
+      return Val_none;
     } else {
       value err, res;
       err = unix_error_of_code(optval.i);
       Begin_root(err);
-        res = caml_alloc_small(1, 0); /* Some */
-        Field(res, 0) = err;
+        res = caml_alloc_some(err);
       End_roots();
       return res;
     }
@@ -186,9 +183,9 @@ unix_setsockopt_aux(char * name,
     break;
   case TYPE_LINGER:
     optsize = sizeof(optval.lg);
-    optval.lg.l_onoff = Is_block (val);
+    optval.lg.l_onoff = Is_some(val);
     if (optval.lg.l_onoff)
-      optval.lg.l_linger = Int_val (Field (val, 0));
+      optval.lg.l_linger = Int_val(Some_val(val));
     break;
   case TYPE_TIMEVAL:
     f = Double_val(val);

otherlibs/win32unix/unixsupport.c

@@ -284,6 +284,15 @@ value unix_error_of_code (int errcode)
   return err;
 }
 
+int code_of_unix_error (value error)
+{
+  if (Is_block(error)) {
+    return Int_val(Field(error, 0));
+  } else {
+    return error_table[Int_val(error)];
+  }
+}
+
 void unix_error(int errcode, const char *cmdname, value cmdarg)
 {
   value res;
@@ -323,9 +332,8 @@ int unix_cloexec_default = 0;
 
 int unix_cloexec_p(value cloexec)
 {
-  /* [cloexec] is a [bool option].  */
-  if (Is_block(cloexec))
-    return Bool_val(Field(cloexec, 0));
+  if (Is_some(cloexec))
+    return Bool_val(Some_val(cloexec));
   else
     return unix_cloexec_default;
 }

otherlibs/win32unix/unixsupport.h

@@ -57,6 +57,7 @@ extern int win_CRT_fd_of_filedescr(value handle);
 
 extern void win32_maperr(DWORD errcode);
 extern value unix_error_of_code (int errcode);
+extern int code_of_unix_error (value error);
 
 CAMLnoreturn_start
 extern void unix_error (int errcode, const char * cmdname, value arg)