mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-15 00:40:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Style nits

Browse Source
This commit is contained in:
twinaphex 2021-04-05 20:02:19 +02:00
parent 0e26077a64
commit 966e0640af
1 changed files with 30 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
command.c
View File

@ -100,7 +100,7 @@ static void command_parse_sub_msg(command_t *handle, const char *tok)
static void command_parse_msg( static void command_parse_msg(
command_t *handle, char *buf) command_t *handle, char *buf)
{ {
char *save = NULL; char *save = NULL;
const char *tok = strtok_r(buf, "\n", &save); const char *tok = strtok_r(buf, "\n", &save);
while (tok) while (tok)
@ -111,7 +111,6 @@ static void command_parse_msg(
} }
#if defined(HAVE_NETWORK_CMD) #if defined(HAVE_NETWORK_CMD)
typedef struct typedef struct
{ {
/* Network socket FD */ /* Network socket FD */
@ -147,7 +146,7 @@ static void command_network_poll(command_t *handle)
{ {
fd_set fds; fd_set fds;
struct timeval tmp_tv = {0}; struct timeval tmp_tv = {0};
command_network_t *netcmd = (command_network_t*)handle->userptr; command_network_t *netcmd = (command_network_t*)handle->userptr;
if (netcmd->net_fd < 0) if (netcmd->net_fd < 0)
return; return;
@ -182,11 +181,12 @@ static void command_network_poll(command_t *handle)
command_t* command_network_new(uint16_t port) command_t* command_network_new(uint16_t port)
{ {
struct addrinfo *res = NULL; struct addrinfo *res = NULL;
command_t *cmd = (command_t*)calloc(1, sizeof(command_t)); command_t *cmd = (command_t*)calloc(1, sizeof(command_t));
command_network_t *netcmd = (command_network_t*)calloc( command_network_t *netcmd = (command_network_t*)calloc(
1, sizeof(command_network_t)); 1, sizeof(command_network_t));
int fd = socket_init((void**)&res, port, NULL, SOCKET_TYPE_DATAGRAM); int fd = socket_init(
(void**)&res, port, NULL, SOCKET_TYPE_DATAGRAM);
RARCH_LOG("%s %hu.\n", RARCH_LOG("%s %hu.\n",
msg_hash_to_str(MSG_BRINGING_UP_COMMAND_INTERFACE_ON_PORT), msg_hash_to_str(MSG_BRINGING_UP_COMMAND_INTERFACE_ON_PORT),
@ -196,10 +196,10 @@ command_t* command_network_new(uint16_t port)
goto error; goto error;
netcmd->net_fd = fd; netcmd->net_fd = fd;
cmd->userptr = netcmd; cmd->userptr = netcmd;
cmd->poll = command_network_poll; cmd->poll = command_network_poll;
cmd->replier = network_command_reply; cmd->replier = network_command_reply;
cmd->destroy = network_command_free; cmd->destroy = network_command_free;
if (!socket_nonblock(netcmd->net_fd)) if (!socket_nonblock(netcmd->net_fd))
goto error; goto error;
@ -246,11 +246,12 @@ static void stdin_command_free(command_t *handle)
free(handle); free(handle);
} }
static void command_stdin_poll(command_t *handle) { static void command_stdin_poll(command_t *handle)
{
ptrdiff_t msg_len; ptrdiff_t msg_len;
char *last_newline = NULL; char *last_newline = NULL;
command_stdin_t *stdincmd = (command_stdin_t*)handle->userptr; command_stdin_t *stdincmd = (command_stdin_t*)handle->userptr;
ssize_t ret = read_stdin( ssize_t ret = read_stdin(
stdincmd->stdin_buf + stdincmd->stdin_buf_ptr, stdincmd->stdin_buf + stdincmd->stdin_buf_ptr,
CMD_BUF_SIZE - stdincmd->stdin_buf_ptr - 1); CMD_BUF_SIZE - stdincmd->stdin_buf_ptr - 1);
@ -297,10 +298,10 @@ command_t* command_stdin_new(void)
#endif #endif
#endif #endif
cmd = (command_t*)calloc(1, sizeof(command_t)); cmd = (command_t*)calloc(1, sizeof(command_t));
stdincmd = (command_stdin_t*)calloc(1, sizeof(command_stdin_t)); stdincmd = (command_stdin_t*)calloc(1, sizeof(command_stdin_t));
cmd->userptr = stdincmd; cmd->userptr = stdincmd;
cmd->poll = command_stdin_poll; cmd->poll = command_stdin_poll;
cmd->replier = stdin_command_reply; cmd->replier = stdin_command_reply;
cmd->destroy = stdin_command_free; cmd->destroy = stdin_command_free;
@ -343,11 +344,12 @@ static void uds_command_free(command_t *handle)
free(handle); free(handle);
} }
static void command_uds_poll(command_t *handle) { static void command_uds_poll(command_t *handle)
{
int i; int i;
command_uds_t *udscmd = (command_uds_t*)handle->userptr;
int maxfd = udscmd->sfd;
fd_set fds; fd_set fds;
command_uds_t *udscmd = (command_uds_t*)handle->userptr;
int maxfd = udscmd->sfd;
struct timeval tmp_tv = {0}; struct timeval tmp_tv = {0};
if (udscmd->sfd < 0) if (udscmd->sfd < 0)
@ -355,6 +357,7 @@ static void command_uds_poll(command_t *handle) {
FD_ZERO(&fds); FD_ZERO(&fds);
FD_SET(udscmd->sfd, &fds); FD_SET(udscmd->sfd, &fds);
for (i = 0; i < MAX_USER_CONNECTIONS; i++) for (i = 0; i < MAX_USER_CONNECTIONS; i++)
{ {
if (udscmd->userfd[i] >= 0) if (udscmd->userfd[i] >= 0)
@ -418,9 +421,9 @@ command_t* command_uds_new(void)
command_t *cmd; command_t *cmd;
command_uds_t *subcmd; command_uds_t *subcmd;
struct sockaddr_un addr; struct sockaddr_un addr;
const char *sp = "retroarch/cmd"; const char *sp = "retroarch/cmd";
socklen_t addrsz = offsetof(struct sockaddr_un, sun_path) + strlen(sp) + 1; socklen_t addrsz = offsetof(struct sockaddr_un, sun_path) + strlen(sp) + 1;
int fd = socket(AF_UNIX, SOCK_STREAM, 0); int fd = socket(AF_UNIX, SOCK_STREAM, 0);
if (fd < 0) if (fd < 0)
return NULL; return NULL;
@ -430,7 +433,8 @@ command_t* command_uds_new(void)
strcpy(&addr.sun_path[1], sp); strcpy(&addr.sun_path[1], sp);
if (bind(fd, (struct sockaddr*)&addr, addrsz) < 0 || if (bind(fd, (struct sockaddr*)&addr, addrsz) < 0 ||
listen(fd, MAX_USER_CONNECTIONS) < 0) { listen(fd, MAX_USER_CONNECTIONS) < 0)
{
socket_close(fd); socket_close(fd);
return NULL; return NULL;
} }
@ -441,15 +445,15 @@ command_t* command_uds_new(void)
return NULL; return NULL;
} }
cmd = (command_t*)calloc(1, sizeof(command_t)); cmd = (command_t*)calloc(1, sizeof(command_t));
subcmd = (command_uds_t*)calloc(1, sizeof(command_uds_t)); subcmd = (command_uds_t*)calloc(1, sizeof(command_uds_t));
subcmd->sfd = fd; subcmd->sfd = fd;
subcmd->last_fd = -1; subcmd->last_fd = -1;
for (i = 0; i < MAX_USER_CONNECTIONS; i++) for (i = 0; i < MAX_USER_CONNECTIONS; i++)
subcmd->userfd[i] = -1; subcmd->userfd[i] = -1;
cmd->userptr = subcmd; cmd->userptr = subcmd;
cmd->poll = command_uds_poll; cmd->poll = command_uds_poll;
cmd->replier = uds_command_reply; cmd->replier = uds_command_reply;
cmd->destroy = uds_command_free; cmd->destroy = uds_command_free;