riot-ci/RIOT
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

posix sockets: remove pointless inline function

Browse Source
This commit is contained in:
Oleg Hahm 2015-11-20 22:12:59 +01:00
parent c366f2bbcd
commit 5f663826c7
1 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
sys/posix/sockets/posix_sockets.c
View File

@ -120,11 +120,6 @@ static inline int _choose_ipproto(int type, int protocol)
return -1; return -1;
} }
static inline void _htons_port(uint16_t *port)
{
*port = htons(*port);
}
static inline ipv4_addr_t *_in_addr_ptr(struct sockaddr_storage *addr) static inline ipv4_addr_t *_in_addr_ptr(struct sockaddr_storage *addr)
{ {
return (ipv4_addr_t *)(&((struct sockaddr_in *)addr)->sin_addr); return (ipv4_addr_t *)(&((struct sockaddr_in *)addr)->sin_addr);
@ -366,8 +361,8 @@ int accept(int socket, struct sockaddr *restrict address,
res = -1; res = -1;
break; break;
} }
_htons_port(port); /* XXX: sin(6)_port is supposed to be network byte *port = htons(*port); /* XXX: sin(6)_port is supposed to be
* order */ network byte order */
*address_len = _addr_truncate(address, *address_len, &tmp, tmp_len); *address_len = _addr_truncate(address, *address_len, &tmp, tmp_len);
} }
break; break;
@ -542,8 +537,8 @@ int getpeername(int socket, struct sockaddr *__restrict address,
return -1; return -1;
} }
tmp.ss_family = s->domain; tmp.ss_family = s->domain;
_htons_port(port); /* XXX: sin(6)_port is supposed to be network byte *port = htons(*port); /* XXX: sin(6)_port is supposed to be network byte
* order */ order */
*address_len = _addr_truncate(address, *address_len, &tmp, tmp_len); *address_len = _addr_truncate(address, *address_len, &tmp, tmp_len);
return 0; return 0;
} }
@ -626,8 +621,8 @@ int getsockname(int socket, struct sockaddr *__restrict address,
return -1; return -1;
} }
tmp.ss_family = AF_INET; tmp.ss_family = AF_INET;
_htons_port(port); /* XXX: sin(6)_port is supposed to be network byte *port = htons(*port); /* XXX: sin(6)_port is supposed to be network byte
* order */ order */
*address_len = _addr_truncate(address, *address_len, &tmp, tmp_len); *address_len = _addr_truncate(address, *address_len, &tmp, tmp_len);
return 0; return 0;
} }
@ -762,8 +757,8 @@ ssize_t recvfrom(int socket, void *restrict buffer, size_t length, int flags,
} }
if ((address != NULL) && (address_len != NULL)) { if ((address != NULL) && (address_len != NULL)) {
tmp.ss_family = s->domain; tmp.ss_family = s->domain;
_htons_port(port); /* XXX: sin_port is supposed to be network byte *port = htons(*port); /* XXX: sin(6)_port is supposed to be network
* order */ byte order */
*address_len = _addr_truncate(address, *address_len, &tmp, tmp_len); *address_len = _addr_truncate(address, *address_len, &tmp, tmp_len);
} }
return res; return res;