Merge branch 'Wshadow' into collectd-5.4

diff --combined src/ntpd.c
index 7ecd889,a8f6c31..67fff22
--- 1/src/ntpd.c
--- 2/src/ntpd.c
+++ b/src/ntpd.c
@@@ -19,7 -19,6 +19,7 @@@
   *   Florian octo Forster <octo at collectd.org>
   **/
  
 +#define _DEFAULT_SOURCE
  #define _BSD_SOURCE /* For NI_MAXHOST */
  
  #include "collectd.h"
@@@ -161,16 -160,16 +161,16 @@@ struct resp_pk
  /* l_fp to double */
  #define M_LFPTOD(r_i, r_uf, d) \
        do { \
-               register int32_t  i; \
-               register uint32_t f; \
+               register int32_t  ri; \
+               register uint32_t rf; \
                \
-               i = (r_i); \
-               f = (r_uf); \
-               if (i < 0) { \
-                       M_NEG(i, f); \
-                       (d) = -((double) i + ((double) f) / 4294967296.0); \
+               ri = (r_i); \
+               rf = (r_uf); \
+               if (ri < 0) { \
+                       M_NEG(ri, rf); \
+                       (d) = -((double) ri + ((double) rf) / 4294967296.0); \
                } else { \
-                       (d) = (double) i + ((double) f) / 4294967296.0; \
+                       (d) = (double) ri + ((double) rf) / 4294967296.0; \
                } \
        } while (0)
  
@@@ -482,7 -481,7 +482,7 @@@ static int ntpd_receive_response (int *
                poll_s.fd      = sd;
                poll_s.events  = POLLIN | POLLPRI;
                poll_s.revents = 0;
 -              
 +
                DEBUG ("Polling for %ims", timeout);
                status = poll (&poll_s, 1, timeout);
  
@@@ -522,7 -521,7 +522,7 @@@
  
                DEBUG ("recv'd %i bytes", status);
  
 -              /* 
 +              /*
                 * Do some sanity checks first
                 */
                if (status < RESP_HEADER_SIZE)
@@@ -731,7 -730,7 +731,7 @@@ static int ntpd_send_request (int req_c
  
        req.err_nitems   = ERR_NITEMS (0, req_items);
        req.mbz_itemsize = MBZ_ITEMSIZE (req_size);
 -      
 +
        if (req_data != NULL)
                memcpy ((void *) req.data, (const void *) req_data, req_data_len);