Merge remote-tracking branch 'mdblack/master'

ether6/ether6.c

@@ -155,7 +155,7 @@ static int ether_rot_get_position(ROT *rot, azimuth_t *az, elevation_t *el)
     int ret, len, sval, speed, adv;
     char cmd[CMD_MAX];
     char buf[BUF_MAX];
-    char mv[BUF_MAX];
+    char mv[5];
 
     rig_debug(RIG_DEBUG_VERBOSE, "%s called\n", __func__);
 

flexradio/dttsp.c

@@ -357,8 +357,8 @@ static int fetch_meter(RIG *rig, int *label, float *data, int npts)
         }
 
         /* copy payload back to client space */
-        memcpy((char *) label, buf, sizeof(int));
-        memcpy((char *) data,  buf + sizeof(int), npts * sizeof(float));
+        memcpy((void *) label, buf, sizeof(int));
+        memcpy((void *) data,  buf + sizeof(int), npts * sizeof(float));
 
     }
     else
@@ -378,7 +378,11 @@ static int fetch_meter(RIG *rig, int *label, float *data, int npts)
         }
 
         buf_len = sizeof(float) * npts;
-        ret = read_block(&priv->meter_port, (char *)data, buf_len);
+        if (sizeof(float)!=4) {
+            rig_debug(RIG_DEBUG_ERR,"%s: sizeof(float)!=4, instead = %ld\n",__func__, sizeof(float));
+            return -RIG_EINTERNAL;
+        }
+        ret = read_block(&priv->meter_port, (char *)(void*)data, buf_len);
 
         if (ret != buf_len)
         {

include/hamlib/rig.h

@@ -92,8 +92,6 @@
 #define CONSTANT_64BIT_FLAG(BIT) (1ull << (BIT))
 #endif
 
-#include <time.h>
-
 __BEGIN_DECLS
 
 extern HAMLIB_EXPORT_VAR(const char) hamlib_version[];

src/sleep.c

@@ -37,7 +37,7 @@
  */
 #include <unistd.h>
 #include <errno.h>
-#include "hamlib/rig.h"
+#include <time.h>
 
 unsigned int sleep(unsigned int secs)
 {