LowLevel/Luma3DS-3GX
Archived
1
0
Fork 0
Code Issues Pull Requests Releases 2 Wiki Activity

sock_util: remove unneeded check

Browse Source 
We loop while (server_sockfd == -1) so it's safe to assume that (server_sockfd != -1) once out of the loop.
This commit is contained in:
Nanquitas 2018-01-18 22:57:46 +01:00 committed by GitHub
parent 11f820efa7
commit 337205eb08
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 20 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
sysmodules/rosalina/source/sock_util.c
View File

@ -135,33 +135,30 @@ void server_bind(struct sock_server *serv, u16 port)
server_sockfd = socSocket(AF_INET, SOCK_STREAM, 0); server_sockfd = socSocket(AF_INET, SOCK_STREAM, 0);
} }
if(server_sockfd != -1) struct sockaddr_in saddr;
saddr.sin_family = AF_INET;
saddr.sin_port = htons(port);
saddr.sin_addr.s_addr = gethostid();
res = socBind(server_sockfd, (struct sockaddr*)&saddr, sizeof(struct sockaddr_in));
if(res == 0)
{ {
struct sockaddr_in saddr; res = socListen(server_sockfd, 2);
saddr.sin_family = AF_INET;
saddr.sin_port = htons(port);
saddr.sin_addr.s_addr = gethostid();
res = socBind(server_sockfd, (struct sockaddr*)&saddr, sizeof(struct sockaddr_in));
if(res == 0) if(res == 0)
{ {
res = socListen(server_sockfd, 2); int idx = serv->nfds;
if(res == 0) serv->nfds++;
{ serv->poll_fds[idx].fd = server_sockfd;
int idx = serv->nfds; serv->poll_fds[idx].events = POLLIN;
serv->nfds++;
serv->poll_fds[idx].fd = server_sockfd;
serv->poll_fds[idx].events = POLLIN;
struct sock_ctx *new_ctx = server_alloc_server_ctx(serv); struct sock_ctx *new_ctx = server_alloc_server_ctx(serv);
memcpy(&new_ctx->addr_in, &saddr, sizeof(struct sockaddr_in)); memcpy(&new_ctx->addr_in, &saddr, sizeof(struct sockaddr_in));
new_ctx->type = SOCK_SERVER; new_ctx->type = SOCK_SERVER;
new_ctx->sockfd = server_sockfd; new_ctx->sockfd = server_sockfd;
new_ctx->n = 0; new_ctx->n = 0;
new_ctx->i = idx; new_ctx->i = idx;
serv->ctx_ptrs[idx] = new_ctx; serv->ctx_ptrs[idx] = new_ctx;
}
} }
} }
} }