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.

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

Pedatic warnings #247

Merged
merged 3 commits into from
May 27, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions examples/BinaryEntityCreation/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ void on_topic(
uint16_t length,
void* args)
{
(void) session; (void) object_id; (void) request_id; (void) stream_id; (void) length;
(void) session; (void) object_id; (void) request_id; (void) stream_id; (void) length; (void) args;

int32_t data;
ucdr_deserialize_int32_t(ub, &data);
Expand Down Expand Up @@ -122,8 +122,8 @@ int main(
0
};
delivery_control.max_samples = UXR_MAX_SAMPLES_UNLIMITED;
uint16_t read_data_req = uxr_buffer_request_data(&session, reliable_out, datareader_id, reliable_in,
&delivery_control);
uxr_buffer_request_data(&session, reliable_out, datareader_id, reliable_in,
&delivery_control);

// Write topics
bool connected = true;
Expand Down
19 changes: 10 additions & 9 deletions examples/ContinuousFragment/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -76,8 +76,8 @@ int main(
"</rtps>"
"</participant>"
"</dds>";
uint16_t participant_req = uxr_buffer_create_participant_xml(&session, reliable_out, participant_id, 0,
participant_xml, UXR_REPLACE);
uxr_buffer_create_participant_xml(&session, reliable_out, participant_id, 0,
participant_xml, UXR_REPLACE);
uxr_run_session_until_confirm_delivery(&session, 100);
uxrObjectId topic_id = uxr_object_id(0x01, UXR_TOPIC_ID);
const char* topic_xml = "<dds>"
Expand All @@ -86,13 +86,13 @@ int main(
"<dataType>HelloWorld</dataType>"
"</topic>"
"</dds>";
uint16_t topic_req = uxr_buffer_create_topic_xml(&session, reliable_out, topic_id, participant_id, topic_xml,
UXR_REPLACE);
uxr_buffer_create_topic_xml(&session, reliable_out, topic_id, participant_id, topic_xml,
UXR_REPLACE);
uxr_run_session_until_confirm_delivery(&session, 100);
uxrObjectId publisher_id = uxr_object_id(0x01, UXR_PUBLISHER_ID);
const char* publisher_xml = "";
uint16_t publisher_req = uxr_buffer_create_publisher_xml(&session, reliable_out, publisher_id, participant_id,
publisher_xml, UXR_REPLACE);
uxr_buffer_create_publisher_xml(&session, reliable_out, publisher_id, participant_id,
publisher_xml, UXR_REPLACE);

uxrObjectId datawriter_id = uxr_object_id(0x01, UXR_DATAWRITER_ID);
const char* datawriter_xml = "<dds>"
Expand All @@ -105,12 +105,13 @@ int main(
"</topic>"
"</data_writer>"
"</dds>";
uint16_t datawriter_req = uxr_buffer_create_datawriter_xml(&session, reliable_out, datawriter_id, publisher_id,
datawriter_xml, UXR_REPLACE);
uxr_buffer_create_datawriter_xml(&session, reliable_out, datawriter_id, publisher_id,
datawriter_xml, UXR_REPLACE);

uxr_run_session_until_confirm_delivery(&session, 100);

// Write topic
uint8_t buf[20000];
char buf[20000];
memset(buf, 'A', sizeof(buf));

ucdrBuffer ub;
Expand Down
3 changes: 3 additions & 0 deletions examples/CustomTransports/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,9 @@ int main(
int args,
char** argv)
{
(void) args;
(void) argv;

// Transport
uxrCustomTransport transport;
uxr_set_custom_transport_callbacks(
Expand Down
8 changes: 8 additions & 0 deletions examples/CustomTransports/my_custom_transport.c
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ static struct pollfd poll_fd;
bool my_custom_transport_open(
uxrCustomTransport* transport)
{
(void) transport;

printf("Micro XRCE-DDS Client Custom transport: opening\n");

bool rv = false;
Expand Down Expand Up @@ -49,6 +51,8 @@ bool my_custom_transport_open(
bool my_custom_transport_close(
uxrCustomTransport* transport)
{
(void) transport;

printf("Micro XRCE-DDS Client Custom transport: closing\n");

return (-1 == poll_fd.fd) ? true : (0 == close(poll_fd.fd));
Expand All @@ -60,6 +64,8 @@ size_t my_custom_transport_write(
size_t len,
uint8_t* errcode)
{
(void) transport;

size_t rv = 0;
ssize_t bytes_sent = send(poll_fd.fd, (void*)buf, len, 0);
if (-1 != bytes_sent)
Expand All @@ -84,6 +90,8 @@ size_t my_custom_transport_read(
int timeout,
uint8_t* errcode)
{
(void) transport;

size_t rv = 0;
int poll_rv = poll(&poll_fd, 1, timeout);
if (0 < poll_rv)
Expand Down
2 changes: 1 addition & 1 deletion examples/CustomTransports/my_custom_transport.h
Original file line number Diff line number Diff line change
Expand Up @@ -34,4 +34,4 @@ size_t my_custom_transport_read(
int timeout,
uint8_t* errcode);

#endif // ifndef _my_custom_transport_H_
#endif // ifndef _my_custom_transport_H_
2 changes: 1 addition & 1 deletion examples/Discovery/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ int main(
TransportLocator agent_list[MAX_AGENTS];
for (int i = 1; i < args; i += 2, size++)
{
uxr_ip_to_locator(argv[i], (uint16_t)atoi(argv[i + 1]), UXR_IPv4, &agent_list[i++]);
uxr_ip_to_locator(argv[i], (uint16_t)atoi(argv[i + 1]), UXR_IPv4, &agent_list[size]);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
uxr_ip_to_locator(argv[i], (uint16_t)atoi(argv[i + 1]), UXR_IPv4, &agent_list[size]);
uxr_ip_to_locator(argv[i], (uint16_t)atoi(argv[i + 1]), UXR_IPv4, &agent_list[size]);
i++;

Missing the deleted increment

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is done in the for loop: for (int i = 1; i < args; i += 2, size++)

}

uxr_discovery_agents(10, 1000, on_agent_found, NULL, agent_list, size);
Expand Down
10 changes: 5 additions & 5 deletions examples/MultiSessionHelloWorld/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ void on_topic(
uint16_t length,
void* args)
{
(void) session; (void) object_id; (void) request_id; (void) stream_id; (void) length;
(void) object_id; (void) request_id; (void) stream_id; (void) length; (void) args;

HelloWorld topic;
HelloWorld_deserialize_topic(ub, &topic);
Expand Down Expand Up @@ -282,10 +282,10 @@ int main(
0
};
delivery_control.max_samples = UXR_MAX_SAMPLES_UNLIMITED;
uint16_t read_data_req_1 = uxr_buffer_request_data(&session_1, reliable_out_1, datareader_id_1, reliable_in_1,
&delivery_control);
uint16_t read_data_req_2 = uxr_buffer_request_data(&session_2, reliable_out_2, datareader_id_2, reliable_in_2,
&delivery_control);
uxr_buffer_request_data(&session_1, reliable_out_1, datareader_id_1, reliable_in_1,
&delivery_control);
uxr_buffer_request_data(&session_2, reliable_out_2, datareader_id_2, reliable_in_2,
&delivery_control);

// Write topics
uint32_t count = 0;
Expand Down
2 changes: 1 addition & 1 deletion examples/PingAgent/Serial/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -58,4 +58,4 @@ int main(

return 0;
#endif // WIN32
}
}
2 changes: 1 addition & 1 deletion examples/PingAgent/TCP/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -51,4 +51,4 @@ int main(
uxr_close_tcp_transport(&transport);

return 0;
}
}
2 changes: 1 addition & 1 deletion examples/PingAgent/UDP/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -51,4 +51,4 @@ int main(
uxr_close_udp_transport(&transport);

return 0;
}
}
3 changes: 2 additions & 1 deletion examples/ReplyAdder/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ void on_request(
(void) object_id;
(void) request_id;
(void) length;
(void) args;

uint32_t rhs;
uint32_t lhs;
Expand Down Expand Up @@ -155,4 +156,4 @@ int main(
}

return 0;
}
}
8 changes: 5 additions & 3 deletions examples/RequestAdder/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,11 @@ void on_reply(
uint16_t length,
void* args)
{
(void) session;
(void) object_id;
(void) request_id;
(void) length;
(void) args;

uint64_t result;
ucdr_deserialize_uint64_t(ub, &result);
Expand Down Expand Up @@ -125,8 +127,8 @@ int main(
0
};
delivery_control.max_samples = UXR_MAX_SAMPLES_UNLIMITED;
uint16_t read_data_req = uxr_buffer_request_data(&session, reliable_out, requester_id, reliable_in,
&delivery_control);
uxr_buffer_request_data(&session, reliable_out, requester_id, reliable_in,
&delivery_control);

// Write requests
bool connected = true;
Expand All @@ -150,4 +152,4 @@ int main(
}

return 0;
}
}
4 changes: 2 additions & 2 deletions examples/SubscribeHelloWorldBestEffort/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -146,8 +146,8 @@ int main(
0
};
delivery_control.max_samples = UXR_MAX_SAMPLES_UNLIMITED;
uint16_t read_data_req = uxr_buffer_request_data(&session, reliable_out, datareader_id, besteffort_in,
&delivery_control);
uxr_buffer_request_data(&session, reliable_out, datareader_id, besteffort_in,
&delivery_control);

// Read topics
while (count < max_topics)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,4 +34,4 @@ typedef struct uxrTCPPlatform
}
#endif // ifdef __cplusplus

#endif // UXR_CLIENT_PROFILE_TRANSPORT_IP_TCP_TCPTRANSPORTPOSIX_H_
#endif // UXR_CLIENT_PROFILE_TRANSPORT_IP_TCP_TCPTRANSPORTPOSIX_H_
2 changes: 1 addition & 1 deletion include/uxr/client/util/ping.h
Original file line number Diff line number Diff line change
Expand Up @@ -74,4 +74,4 @@ UXRDLLAPI bool uxr_ping_agent_attempts(
}
#endif // ifdef __cplusplus

#endif // UXR_CLIENT_UTIL_PING_H_
#endif // UXR_CLIENT_UTIL_PING_H_
4 changes: 2 additions & 2 deletions src/c/core/session/read_access.c
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@ inline void read_format_data(
request_id,
&sample_id,
&temp_buffer,
(size_t)request_length,
request_length,
session->on_request_args);

session->on_data_flag = true;
Expand Down Expand Up @@ -232,7 +232,7 @@ inline void read_format_data(
request_id,
(uint16_t)((request.request_id.data[0] << 8) + request.request_id.data[1]),
&temp_buffer,
(size_t)reply_length,
reply_length,
session->on_reply_args);

session->on_data_flag = true;
Expand Down
2 changes: 1 addition & 1 deletion src/c/profile/transport/ip/ip_posix.c
Original file line number Diff line number Diff line change
Expand Up @@ -70,4 +70,4 @@ bool uxr_locator_to_ip(
break;
}
return result;
}
}