Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix gcc 11.2.0 compile error #59

Merged
merged 1 commit into from
Apr 30, 2022
Merged

fix gcc 11.2.0 compile error #59

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions src/device/peripheral/mros-dev/mros-src/comm/cimpl/mros_comm_socket_cimpl.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,28 +61,28 @@ void mros_comm_socket_close(mRosCommSocketType *socket)

static mRosReturnType mros_comm_socket_select(mRosCommSocketType *socket, mros_uint32 timeout, mros_boolean read, mros_boolean write) {

mRosFdSetType fd_set;
mRosFdSetType set;
mRosTimeValType tmo;

MROS_FD_ZERO(&fd_set);
MROS_FD_SET(socket->sock_fd, &fd_set);
MROS_FD_ZERO(&set);
MROS_FD_SET(socket->sock_fd, &set);

mRosFdSetType* r_set = MROS_NULL;
mRosFdSetType* w_set = MROS_NULL;

if (read == MROS_TRUE) {
r_set = &fd_set;
r_set = &set;
}
if (write == MROS_TRUE) {
w_set = &fd_set;
w_set = &set;
}
mros_comm_set_timeval(timeout, &tmo);
mRosReturnType ret = mros_comm_select(MROS_FD_SETSIZE, r_set, w_set, MROS_NULL, &tmo);
if (ret < 0) {
ROS_ERROR("%s %s() %u ret=%d", __FILE__, __FUNCTION__, __LINE__, ret);
return MROS_E_SYSERR;
}
if ((ret == 0 || !MROS_FD_ISSET(socket->sock_fd, &fd_set))) {
if ((ret == 0 || !MROS_FD_ISSET(socket->sock_fd, &set))) {
return MROS_E_NOENT;
}
return MROS_E_OK;
Expand Down