diff options
author | Andy Wingo <wingo@pobox.com> | 2011-05-13 15:45:43 +0200 |
---|---|---|
committer | Andy Wingo <wingo@pobox.com> | 2011-05-13 15:45:43 +0200 |
commit | 86fb1eb631d455aec634aa475a14d2c88052752c (patch) | |
tree | 98936072396a05aa1e4a6d177452f6d5e65a62f5 /libguile/socket.c | |
parent | fc7bd367ab4b5027a7f80686b1e229c62e43c90b (diff) | |
parent | 2002f1f84797c2c46d0634eabd5ac5fd61e13d73 (diff) | |
download | guile-86fb1eb631d455aec634aa475a14d2c88052752c.tar.gz |
merge strictness branch from 2.0
Diffstat (limited to 'libguile/socket.c')
-rw-r--r-- | libguile/socket.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libguile/socket.c b/libguile/socket.c index 2e59a15c9..d085d330e 100644 --- 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 |