Peter M. Groen / libmodbus

Commit 0468c30b09bd8612310d50ad9ae9a7bcb36dbae4

Authored by Stéphane Raimbault
1 parent 03e9d630

Fix all compilations warnings spotted by new compilation flags

Inline Side-by-side
Showing 4 changed files with 33 additions and 35 deletions
src/modbus-rtu.c
  View file @0468c30
... ... @@ -157,14 +157,14 @@ static uint16_t crc16(uint8_t *buffer, uint16_t buffer_length)
157 157 return (crc_hi << 8 | crc_lo);
158 158 }
159 159  
160   -int _modbus_rtu_prepare_response_tid(const uint8_t *req, int *req_length)
  160 +static int _modbus_rtu_prepare_response_tid(const uint8_t *req, int *req_length)
161 161 {
162 162 (*req_length) -= _MODBUS_RTU_CHECKSUM_LENGTH;
163 163 /* No TID */
164 164 return 0;
165 165 }
166 166  
167   -int _modbus_rtu_send_msg_pre(uint8_t *req, int req_length)
  167 +static int _modbus_rtu_send_msg_pre(uint8_t *req, int req_length)
168 168 {
169 169 uint16_t crc = crc16(req, req_length);
170 170 req[req_length++] = crc >> 8;
... ... @@ -260,7 +260,7 @@ static int win32_ser_read(struct win32_ser *ws, uint8_t *p_msg,
260 260 }
261 261 #endif
262 262  
263   -void _modbus_rtu_ioctl_rts(int fd, int on)
  263 +static void _modbus_rtu_ioctl_rts(int fd, int on)
264 264 {
265 265 #if HAVE_DECL_TIOCM_RTS
266 266 int flags;
... ... @@ -275,7 +275,7 @@ void _modbus_rtu_ioctl_rts(int fd, int on)
275 275 #endif
276 276 }
277 277  
278   -ssize_t _modbus_rtu_send(modbus_t *ctx, const uint8_t *req, int req_length)
  278 +static ssize_t _modbus_rtu_send(modbus_t *ctx, const uint8_t *req, int req_length)
279 279 {
280 280 #if defined(_WIN32)
281 281 modbus_rtu_t *ctx_rtu = ctx->backend_data;
... ... @@ -309,7 +309,7 @@ ssize_t _modbus_rtu_send(modbus_t *ctx, const uint8_t *req, int req_length)
309 309 #endif
310 310 }
311 311  
312   -int _modbus_rtu_receive(modbus_t *ctx, uint8_t *req)
  312 +static int _modbus_rtu_receive(modbus_t *ctx, uint8_t *req)
313 313 {
314 314 int rc;
315 315 modbus_rtu_t *ctx_rtu = ctx->backend_data;
... ... @@ -332,7 +332,7 @@ int _modbus_rtu_receive(modbus_t *ctx, uint8_t *req)
332 332 return rc;
333 333 }
334 334  
335   -ssize_t _modbus_rtu_recv(modbus_t *ctx, uint8_t *rsp, int rsp_length)
  335 +static ssize_t _modbus_rtu_recv(modbus_t *ctx, uint8_t *rsp, int rsp_length)
336 336 {
337 337 #if defined(_WIN32)
338 338 return win32_ser_read(&((modbus_rtu_t *)ctx->backend_data)->w_ser, rsp, rsp_length);
... ... @@ -341,10 +341,10 @@ ssize_t _modbus_rtu_recv(modbus_t *ctx, uint8_t *rsp, int rsp_length)
341 341 #endif
342 342 }
343 343  
344   -int _modbus_rtu_flush(modbus_t *);
  344 +static int _modbus_rtu_flush(modbus_t *);
345 345  
346   -int _modbus_rtu_pre_check_confirmation(modbus_t *ctx, const uint8_t *req,
347   - const uint8_t *rsp, int rsp_length)
  346 +static int _modbus_rtu_pre_check_confirmation(modbus_t *ctx, const uint8_t *req,
  347 + const uint8_t *rsp, int rsp_length)
348 348 {
349 349 /* Check responding slave is the slave we requested (except for broacast
350 350 * request) */
... ... @@ -364,8 +364,8 @@ int _modbus_rtu_pre_check_confirmation(modbus_t *ctx, const uint8_t *req,
364 364 /* The check_crc16 function shall return 0 is the message is ignored and the
365 365 message length if the CRC is valid. Otherwise it shall return -1 and set
366 366 errno to EMBADCRC. */
367   -int _modbus_rtu_check_integrity(modbus_t *ctx, uint8_t *msg,
368   - const int msg_length)
  367 +static int _modbus_rtu_check_integrity(modbus_t *ctx, uint8_t *msg,
  368 + const int msg_length)
369 369 {
370 370 uint16_t crc_calculated;
371 371 uint16_t crc_received;
... ... @@ -917,7 +917,7 @@ int modbus_rtu_get_rts(modbus_t *ctx) {
917 917 }
918 918 }
919 919  
920   -void _modbus_rtu_close(modbus_t *ctx)
  920 +static void _modbus_rtu_close(modbus_t *ctx)
921 921 {
922 922 /* Closes the file descriptor in RTU mode */
923 923 modbus_rtu_t *ctx_rtu = ctx->backend_data;
... ... @@ -937,7 +937,7 @@ void _modbus_rtu_close(modbus_t *ctx)
937 937 #endif
938 938 }
939 939  
940   -int _modbus_rtu_flush(modbus_t *ctx)
  940 +static int _modbus_rtu_flush(modbus_t *ctx)
941 941 {
942 942 #if defined(_WIN32)
943 943 modbus_rtu_t *ctx_rtu = ctx->backend_data;
... ... @@ -948,7 +948,7 @@ int _modbus_rtu_flush(modbus_t *ctx)
948 948 #endif
949 949 }
950 950  
951   -int _modbus_rtu_select(modbus_t *ctx, fd_set *rset,
  951 +static int _modbus_rtu_select(modbus_t *ctx, fd_set *rset,
952 952 struct timeval *tv, int length_to_read)
953 953 {
954 954 int s_rc;
... ... @@ -987,7 +987,7 @@ int _modbus_rtu_select(modbus_t *ctx, fd_set *rset,
987 987 return s_rc;
988 988 }
989 989  
990   -void _modbus_rtu_free(modbus_t *ctx) {
  990 +static void _modbus_rtu_free(modbus_t *ctx) {
991 991 free(((modbus_rtu_t*)ctx->backend_data)->device);
992 992 free(ctx->backend_data);
993 993 free(ctx);
... ...
src/modbus-tcp.c
  View file @0468c30
... ... @@ -16,8 +16,6 @@
16 16 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
17 17 */
18 18  
19   -/* For accept4 when available */
20   -#define _GNU_SOURCE
21 19 #include <stdio.h>
22 20 #include <stdlib.h>
23 21 #include <string.h>
... ... @@ -97,9 +95,9 @@ static int _modbus_set_slave(modbus_t *ctx, int slave)
97 95 }
98 96  
99 97 /* Builds a TCP request header */
100   -int _modbus_tcp_build_request_basis(modbus_t *ctx, int function,
101   - int addr, int nb,
102   - uint8_t *req)
  98 +static int _modbus_tcp_build_request_basis(modbus_t *ctx, int function,
  99 + int addr, int nb,
  100 + uint8_t *req)
103 101 {
104 102 modbus_tcp_t *ctx_tcp = ctx->backend_data;
105 103  
... ... @@ -129,7 +127,7 @@ int _modbus_tcp_build_request_basis(modbus_t *ctx, int function,
129 127 }
130 128  
131 129 /* Builds a TCP response header */
132   -int _modbus_tcp_build_response_basis(sft_t *sft, uint8_t *rsp)
  130 +static int _modbus_tcp_build_response_basis(sft_t *sft, uint8_t *rsp)
133 131 {
134 132 /* Extract from MODBUS Messaging on TCP/IP Implementation
135 133 Guide V1.0b (page 23/46):
... ... @@ -152,12 +150,12 @@ int _modbus_tcp_build_response_basis(sft_t *sft, uint8_t *rsp)
152 150 }
153 151  
154 152  
155   -int _modbus_tcp_prepare_response_tid(const uint8_t *req, int *req_length)
  153 +static int _modbus_tcp_prepare_response_tid(const uint8_t *req, int *req_length)
156 154 {
157 155 return (req[0] << 8) + req[1];
158 156 }
159 157  
160   -int _modbus_tcp_send_msg_pre(uint8_t *req, int req_length)
  158 +static int _modbus_tcp_send_msg_pre(uint8_t *req, int req_length)
161 159 {
162 160 /* Substract the header length to the message length */
163 161 int mbap_length = req_length - 6;
... ... @@ -168,7 +166,7 @@ int _modbus_tcp_send_msg_pre(uint8_t *req, int req_length)
168 166 return req_length;
169 167 }
170 168  
171   -ssize_t _modbus_tcp_send(modbus_t *ctx, const uint8_t *req, int req_length)
  169 +static ssize_t _modbus_tcp_send(modbus_t *ctx, const uint8_t *req, int req_length)
172 170 {
173 171 /* MSG_NOSIGNAL
174 172 Requests not to send SIGPIPE on errors on stream oriented
... ... @@ -177,20 +175,20 @@ ssize_t _modbus_tcp_send(modbus_t *ctx, const uint8_t *req, int req_length)
177 175 return send(ctx->s, (const char*)req, req_length, MSG_NOSIGNAL);
178 176 }
179 177  
180   -int _modbus_tcp_receive(modbus_t *ctx, uint8_t *req) {
  178 +static int _modbus_tcp_receive(modbus_t *ctx, uint8_t *req) {
181 179 return _modbus_receive_msg(ctx, req, MSG_INDICATION);
182 180 }
183 181  
184   -ssize_t _modbus_tcp_recv(modbus_t *ctx, uint8_t *rsp, int rsp_length) {
  182 +static ssize_t _modbus_tcp_recv(modbus_t *ctx, uint8_t *rsp, int rsp_length) {
185 183 return recv(ctx->s, (char *)rsp, rsp_length, 0);
186 184 }
187 185  
188   -int _modbus_tcp_check_integrity(modbus_t *ctx, uint8_t *msg, const int msg_length)
  186 +static int _modbus_tcp_check_integrity(modbus_t *ctx, uint8_t *msg, const int msg_length)
189 187 {
190 188 return msg_length;
191 189 }
192 190  
193   -int _modbus_tcp_pre_check_confirmation(modbus_t *ctx, const uint8_t *req,
  191 +static int _modbus_tcp_pre_check_confirmation(modbus_t *ctx, const uint8_t *req,
194 192 const uint8_t *rsp, int rsp_length)
195 193 {
196 194 /* Check TID */
... ... @@ -398,13 +396,13 @@ static int _modbus_tcp_pi_connect(modbus_t *ctx)
398 396 }
399 397  
400 398 /* Closes the network connection and socket in TCP mode */
401   -void _modbus_tcp_close(modbus_t *ctx)
  399 +static void _modbus_tcp_close(modbus_t *ctx)
402 400 {
403 401 shutdown(ctx->s, SHUT_RDWR);
404 402 close(ctx->s);
405 403 }
406 404  
407   -int _modbus_tcp_flush(modbus_t *ctx)
  405 +static int _modbus_tcp_flush(modbus_t *ctx)
408 406 {
409 407 int rc;
410 408 int rc_sum = 0;
... ... @@ -630,7 +628,7 @@ int modbus_tcp_pi_accept(modbus_t *ctx, int *socket)
630 628 return ctx->s;
631 629 }
632 630  
633   -int _modbus_tcp_select(modbus_t *ctx, fd_set *rset, struct timeval *tv, int length_to_read)
  631 +static int _modbus_tcp_select(modbus_t *ctx, fd_set *rset, struct timeval *tv, int length_to_read)
634 632 {
635 633 int s_rc;
636 634 while ((s_rc = select(ctx->s+1, rset, NULL, NULL, tv)) == -1) {
... ... @@ -654,7 +652,7 @@ int _modbus_tcp_select(modbus_t *ctx, fd_set *rset, struct timeval *tv, int leng
654 652 return s_rc;
655 653 }
656 654  
657   -void _modbus_tcp_free(modbus_t *ctx) {
  655 +static void _modbus_tcp_free(modbus_t *ctx) {
658 656 free(ctx->backend_data);
659 657 free(ctx);
660 658 }
... ...
src/modbus.c
  View file @0468c30
... ... @@ -102,7 +102,7 @@ void _error_print(modbus_t *ctx, const char *context)
102 102 }
103 103 }
104 104  
105   -int _sleep_and_flush(modbus_t *ctx)
  105 +static int _sleep_and_flush(modbus_t *ctx)
106 106 {
107 107 #ifdef _WIN32
108 108 /* usleep doesn't exist on Windows */
... ... @@ -496,7 +496,7 @@ static int check_confirmation(modbus_t *ctx, uint8_t *req,
496 496  
497 497 /* Exception code */
498 498 if (function >= 0x80) {
499   - if (rsp_length == (offset + 2 + ctx->backend->checksum_length) &&
  499 + if (rsp_length == (offset + 2 + (int)ctx->backend->checksum_length) &&
500 500 req[offset] == (rsp[offset] - 0x80)) {
501 501 /* Valid exception code received */
502 502  
... ...
tests/bandwidth-client.c
  View file @0468c30
... ... @@ -29,7 +29,7 @@
29 29  
30 30 #define G_MSEC_PER_SEC 1000
31 31  
32   -uint32_t gettime_ms(void)
  32 +static uint32_t gettime_ms(void)
33 33 {
34 34 struct timeval tv;
35 35 #if !defined(_MSC_VER)
... ...