merge strictness branch from 2.0

[bpt/guile.git] / libguile / socket.c

diff --git a/libguile/socket.c b/libguile/socket.c
index 2e59a15..d085d33 100644 (file)
--- a/libguile/socket.c
+++ b/libguile/socket.c
@@ -910,7 +910,7 @@ SCM_DEFINE (scm_connect, "connect", 2, 1, 1,
   SCM_VALIDATE_OPFPORT (1, sock);
   fd = SCM_FPORT_FDES (sock);
 
-  if (address == SCM_UNDEFINED)
+  if (scm_is_eq (address, SCM_UNDEFINED))
     /* No third argument was passed to FAM_OR_SOCKADDR must actually be a
        `socket address' object.  */
     soka = scm_to_sockaddr (fam_or_sockaddr, &size);
@@ -979,7 +979,7 @@ SCM_DEFINE (scm_bind, "bind", 2, 1, 1,
   SCM_VALIDATE_OPFPORT (1, sock);
   fd = SCM_FPORT_FDES (sock);
 
-  if (address == SCM_UNDEFINED)
+  if (scm_is_eq (address, SCM_UNDEFINED))
     /* No third argument was passed to FAM_OR_SOCKADDR must actually be a
        `socket address' object.  */
     soka = scm_to_sockaddr (fam_or_sockaddr, &size);
@@ -1192,14 +1192,14 @@ scm_to_sockaddr (SCM address, size_t *address_size)
            size_t path_len = 0;
 
            path = SCM_SIMPLE_VECTOR_REF (address, 1);
-           if ((!scm_is_string (path)) && (path != SCM_BOOL_F))
+           if (!scm_is_string (path) && !scm_is_false (path))
              scm_misc_error (FUNC_NAME, "invalid unix address "
                              "path: ~A", scm_list_1 (path));
            else
              {
                struct sockaddr_un c_unix;
 
-               if (path == SCM_BOOL_F)
+               if (scm_is_false (path))
                  path_len = 0;
                else
                  path_len = scm_c_string_length (path);
@@ -1594,7 +1594,7 @@ SCM_DEFINE (scm_sendto, "sendto", 3, 1, 1,
         means that the following arguments, i.e. ADDRESS and those listed in
         ARGS_AND_FLAGS, are the `MSG_' flags.  */
       soka = scm_to_sockaddr (fam_or_sockaddr, &size);
-      if (address != SCM_UNDEFINED)
+      if (!scm_is_eq (address, SCM_UNDEFINED))
        args_and_flags = scm_cons (address, args_and_flags);
     }
   else