altos: Stop doing pointer arith on void *
authorKeith Packard <keithp@keithp.com>
Tue, 5 Feb 2019 06:33:32 +0000 (22:33 -0800)
committerKeith Packard <keithp@keithp.com>
Mon, 18 Feb 2019 21:08:23 +0000 (13:08 -0800)
Switch to uint8_t * instead.

Signed-off-by: Keith Packard <keithp@keithp.com>
src/kernel/ao_storage.c

index 132431e..cfd116f 100644 (file)
 #include <ao_storage.h>
 
 uint8_t
-ao_storage_read(ao_pos_t pos, void *buf, uint16_t len) 
+ao_storage_read(ao_pos_t pos, void *v_buf, uint16_t len) 
 {
-#ifdef CC1111
-       return ao_storage_device_read(pos, buf, len);
-#else
+       uint8_t *buf = v_buf;
        uint16_t this_len;
        uint16_t this_off;
 
@@ -50,15 +48,12 @@ ao_storage_read(ao_pos_t pos, void *buf, uint16_t len)
                pos += this_len;
        }
        return 1;
-#endif
 }
 
 uint8_t
-ao_storage_write(ao_pos_t pos, void *buf, uint16_t len) 
+ao_storage_write(ao_pos_t pos, void *v_buf, uint16_t len) 
 {
-#ifdef CC1111
-       return ao_storage_device_write(pos, buf, len);
-#else
+       uint8_t *buf = v_buf;
        uint16_t this_len;
        uint16_t this_off;
 
@@ -84,7 +79,6 @@ ao_storage_write(ao_pos_t pos, void *buf, uint16_t len)
                pos += this_len;
        }
        return 1;
-#endif
 }
 
 static uint8_t storage_data[128];