summaryrefslogtreecommitdiff
path: root/unix/modsocket.c
diff options
context:
space:
mode:
authorDamien George <damien.p.george@gmail.com>2016-10-07 14:05:15 +1100
committerDamien George <damien.p.george@gmail.com>2016-10-07 14:05:15 +1100
commit503089ea9d6b358f1a06ad1f164561b7cf11c742 (patch)
treec206ac1372a24d5f6da17e0d33cc30c9c7df0c93 /unix/modsocket.c
parent23a568240d9fb216c5f2ca9feeb3134725c9eea0 (diff)
unix: Use mp_raise_OSError helper function.
Diffstat (limited to 'unix/modsocket.c')
-rw-r--r--unix/modsocket.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/unix/modsocket.c b/unix/modsocket.c
index bc1531cae..dc4dc4c88 100644
--- a/unix/modsocket.c
+++ b/unix/modsocket.c
@@ -74,7 +74,7 @@ const mp_obj_type_t mp_type_socket;
// Helper functions
#define RAISE_ERRNO(err_flag, error_val) \
{ if (err_flag == -1) \
- { nlr_raise(mp_obj_new_exception_arg1(&mp_type_OSError, MP_OBJ_NEW_SMALL_INT(error_val))); } }
+ { mp_raise_OSError(error_val); } }
static inline mp_obj_t mp_obj_from_sockaddr(const struct sockaddr *addr, socklen_t len) {
return mp_obj_new_bytes((const byte *)addr, len);
@@ -400,7 +400,7 @@ STATIC mp_obj_t mod_socket_gethostbyname(mp_obj_t arg) {
struct hostent *h = gethostbyname(s);
if (h == NULL) {
// CPython: socket.herror
- nlr_raise(mp_obj_new_exception_arg1(&mp_type_OSError, MP_OBJ_NEW_SMALL_INT(h_errno)));
+ mp_raise_OSError(h_errno);
}
assert(h->h_length == 4);
return mp_obj_new_int(*(int*)*h->h_addr_list);
@@ -415,7 +415,7 @@ STATIC mp_obj_t mod_socket_inet_pton(mp_obj_t family_in, mp_obj_t addr_in) {
int r = inet_pton(family, mp_obj_str_get_str(addr_in), binaddr);
RAISE_ERRNO(r, errno);
if (r == 0) {
- nlr_raise(mp_obj_new_exception_arg1(&mp_type_OSError, MP_OBJ_NEW_SMALL_INT(EINVAL)));
+ mp_raise_OSError(MP_EINVAL);
}
int binaddr_len = 0;
switch (family) {
@@ -437,7 +437,7 @@ STATIC mp_obj_t mod_socket_inet_ntop(mp_obj_t family_in, mp_obj_t binaddr_in) {
vstr_t vstr;
vstr_init_len(&vstr, family == AF_INET ? INET_ADDRSTRLEN : INET6_ADDRSTRLEN);
if (inet_ntop(family, bufinfo.buf, vstr.buf, vstr.len) == NULL) {
- nlr_raise(mp_obj_new_exception_arg1(&mp_type_OSError, MP_OBJ_NEW_SMALL_INT(errno)));
+ mp_raise_OSError(errno);
}
vstr.len = strlen(vstr.buf);
return mp_obj_new_str_from_vstr(&mp_type_str, &vstr);