Merge pull request #131 from adafruit/fix-gcc-warnings

Fix gcc warnings

Author: pdp7

setup.py

@@ -18,7 +18,7 @@
 else:
     kernel41 = None
 
-CFLAGS = ['-Wall', '-Werror', '-Wno-format-security']
+CFLAGS = ['-Wall', '-Werror', '-Wextra', '-Wno-missing-field-initializers' ]
 
 classifiers = ['Development Status :: 3 - Alpha',
                'Operating System :: POSIX :: Linux',

source/c_pwm.c

@@ -272,7 +272,7 @@ BBIO_err pwm_set_duty_cycle(const char *key, float duty) {
     return BBIO_OK;
 }
 
-BBIO_err pwm_setup(const char *key, float duty, float freq, int polarity)
+BBIO_err pwm_setup(const char *key, __attribute__ ((unused)) float duty, __attribute__ ((unused)) float freq, __attribute__ ((unused)) int polarity)
 {
     BBIO_err err;
     struct pwm_exp *new_pwm;
@@ -489,7 +489,7 @@ BBIO_err pwm_start(const char *key, float duty, float freq, int polarity)
 {
     BBIO_err err;
     char buffer[20];
-    int len;
+    ssize_t len;
 
     struct pwm_exp *pwm = lookup_exported_pwm(key);
     if (pwm == NULL) {
@@ -518,7 +518,7 @@ BBIO_err pwm_start(const char *key, float duty, float freq, int polarity)
     len = read(pwm->period_fd, buffer, sizeof(buffer));
     if (len < 0) {
         return BBIO_SYSFS;
-    } else if (len >= sizeof(buffer)) {
+    } else if (len >= (ssize_t)sizeof(buffer)) {
         // If this is the case, there's more in the file.
         // This should never happen, as it would mean that
         // the period is 10^8 seconds
@@ -534,7 +534,7 @@ BBIO_err pwm_start(const char *key, float duty, float freq, int polarity)
     len = read(pwm->duty_fd, buffer, sizeof(buffer));
     if (len < 0) {
         return BBIO_SYSFS;
-    } else if (len >= sizeof(buffer)) {
+    } else if (len >= (ssize_t)sizeof(buffer)) {
         // If this is the case, there's more in the file.
         // This should never happen, as it would mean that
         // the period is 10^8 seconds

source/common.c

@@ -337,7 +337,9 @@ BBIO_err get_pwm_key(const char *input, char *key)
     return BBIO_INVARG;
 }
 
-BBIO_err get_adc_ain(const char *key, unsigned int *ain)
+// TODO: fix warning
+// source/common.c:344:14: error: comparison between signed and unsigned integer expressions [-Werror=sign-compare]
+BBIO_err get_adc_ain(const char *key, int *ain)
 {
     *ain = lookup_ain_by_key(key);
 
@@ -451,7 +453,7 @@ BBIO_err load_device_tree(const char *name)
     }
 
     //if the device isn't already loaded, load it, and return
-    fprintf(file, name);
+    fprintf(file, "%s", name);
     fclose(file);
 
     //0.2 second delay

source/common.h

@@ -79,7 +79,7 @@ int gpio_direction[120];
 
 BBIO_err get_gpio_number(const char *key, unsigned int *gpio);
 BBIO_err get_pwm_key(const char *input, char *key);
-BBIO_err get_adc_ain(const char *key, unsigned int *ain);
+BBIO_err get_adc_ain(const char *key, int *ain);
 BBIO_err get_uart_device_tree_name(const char *name, char *dt);
 BBIO_err build_path(const char *partial_path, const char *prefix, char *full_path, size_t full_path_len);
 int get_spi_bus_path_number(unsigned int spi);

source/event_gpio.c

@@ -471,7 +471,7 @@ int gpio_initial(unsigned int gpio)
     return 0;
 }
 
-void *poll_thread(void *threadarg)
+void *poll_thread(__attribute__ ((unused)) void *threadarg)
 {
     struct epoll_event events;
     char buf;

source/py_adc.c

@@ -39,7 +39,7 @@ SOFTWARE.
 //}
 
 // python function setup()
-static PyObject *py_setup_adc(PyObject *self, PyObject *args)
+static PyObject *py_setup_adc(__attribute__ ((unused)) PyObject *self, __attribute__ ((unused)) PyObject *args)
 {
     BBIO_err err;
 
@@ -55,9 +55,9 @@ static PyObject *py_setup_adc(PyObject *self, PyObject *args)
 }
 
 // python function read(channel)
-static PyObject *py_read(PyObject *self, PyObject *args)
+static PyObject *py_read(__attribute__ ((unused)) PyObject *self, PyObject *args)
 {
-    unsigned int ain;
+    int ain;
     float value;
     char *channel;
     PyObject *py_value;
@@ -98,9 +98,9 @@ static PyObject *py_read(PyObject *self, PyObject *args)
 }
 
 // python function read(channel)
-static PyObject *py_read_raw(PyObject *self, PyObject *args)
+static PyObject *py_read_raw(__attribute__ ((unused)) PyObject *self, PyObject *args)
 {
-    unsigned int ain;
+    int ain;
     float value;
     char *channel;
     PyObject *py_value;

source/py_gpio.c

@@ -61,7 +61,7 @@ static int init_module(void)
 }
 
 // python function cleanup()
-static PyObject *py_cleanup(PyObject *self, PyObject *args)
+static PyObject *py_cleanup(__attribute__ ((unused)) PyObject *self, __attribute__ ((unused)) PyObject *args)
 {
     // clean up any exports
     event_cleanup();
@@ -70,7 +70,7 @@ static PyObject *py_cleanup(PyObject *self, PyObject *args)
 }
 
 // python function setup(channel, direction, pull_up_down=PUD_OFF, initial=None, delay=0)
-static PyObject *py_setup_channel(PyObject *self, PyObject *args, PyObject *kwargs)
+static PyObject *py_setup_channel(__attribute__ ((unused)) PyObject *self, PyObject *args, PyObject *kwargs)
 {
    unsigned int gpio;
    char *channel;
@@ -151,7 +151,7 @@ static PyObject *py_setup_channel(PyObject *self, PyObject *args, PyObject *kwar
 }
 
 // python function output(channel, value)
-static PyObject *py_output_gpio(PyObject *self, PyObject *args)
+static PyObject *py_output_gpio(__attribute__ ((unused)) PyObject *self, PyObject *args)
 {
     unsigned int gpio;
     int value;
@@ -177,7 +177,7 @@ static PyObject *py_output_gpio(PyObject *self, PyObject *args)
 }
 
 // python function value = input(channel)
-static PyObject *py_input_gpio(PyObject *self, PyObject *args)
+static PyObject *py_input_gpio(__attribute__ ((unused)) PyObject *self, PyObject *args)
 {
     unsigned int gpio;
     char *channel;
@@ -276,7 +276,7 @@ static int add_py_callback(char *channel, unsigned int gpio, unsigned int bounce
 }
 
 // python function add_event_callback(gpio, callback, bouncetime=0)
-static PyObject *py_add_event_callback(PyObject *self, PyObject *args, PyObject *kwargs)
+static PyObject *py_add_event_callback(__attribute__ ((unused)) PyObject *self, PyObject *args, PyObject *kwargs)
 {
    unsigned int gpio;
    char *channel;
@@ -318,7 +318,7 @@ static PyObject *py_add_event_callback(PyObject *self, PyObject *args, PyObject
 }
 
 // python function add_event_detect(gpio, edge, callback=None, bouncetime=0
-static PyObject *py_add_event_detect(PyObject *self, PyObject *args, PyObject *kwargs)
+static PyObject *py_add_event_detect(__attribute__ ((unused)) PyObject *self, PyObject *args, PyObject *kwargs)
 {
    unsigned int gpio;
    char *channel;
@@ -375,7 +375,7 @@ static PyObject *py_add_event_detect(PyObject *self, PyObject *args, PyObject *k
 }
 
 // python function remove_event_detect(gpio)
-static PyObject *py_remove_event_detect(PyObject *self, PyObject *args)
+static PyObject *py_remove_event_detect(__attribute__ ((unused)) PyObject *self, PyObject *args)
 {
    unsigned int gpio;
    char *channel;
@@ -416,7 +416,7 @@ static PyObject *py_remove_event_detect(PyObject *self, PyObject *args)
 }
 
 // python function value = event_detected(channel)
-static PyObject *py_event_detected(PyObject *self, PyObject *args)
+static PyObject *py_event_detected(__attribute__ ((unused)) PyObject *self, PyObject *args)
 {
    unsigned int gpio;
    char *channel;
@@ -436,7 +436,7 @@ static PyObject *py_event_detected(PyObject *self, PyObject *args)
 }
 
 // python function py_wait_for_edge(gpio, edge, timeout = -1)
-static PyObject *py_wait_for_edge(PyObject *self, PyObject *args)
+static PyObject *py_wait_for_edge(__attribute__ ((unused)) PyObject *self, PyObject *args)
 {
    unsigned int gpio;
    int edge, result, timeout;
@@ -490,7 +490,7 @@ static PyObject *py_wait_for_edge(PyObject *self, PyObject *args)
 }
 
 // python function value = gpio_function(gpio)
-static PyObject *py_gpio_function(PyObject *self, PyObject *args)
+static PyObject *py_gpio_function(__attribute__ ((unused)) PyObject *self, PyObject *args)
 {
     unsigned int gpio;
     unsigned int value;
@@ -517,7 +517,7 @@ static PyObject *py_gpio_function(PyObject *self, PyObject *args)
 }
 
 // python function setwarnings(state)
-static PyObject *py_setwarnings(PyObject *self, PyObject *args)
+static PyObject *py_setwarnings(__attribute__ ((unused)) PyObject *self, __attribute__ ((unused)) PyObject *args)
 {
    if (!PyArg_ParseTuple(args, "i", &gpio_warnings))
       return NULL;

source/py_pwm.c

@@ -27,7 +27,7 @@ SOFTWARE.
 #include "c_pwm.h"
 
 // python function cleanup()
-static PyObject *py_cleanup(PyObject *self, PyObject *args)
+static PyObject *py_cleanup(__attribute__ ((unused)) PyObject *self, __attribute__ ((unused)) PyObject *args)
 {
     // unexport the PWM
     pwm_cleanup();
@@ -36,7 +36,7 @@ static PyObject *py_cleanup(PyObject *self, PyObject *args)
 }
 
 // python function start(channel, duty_cycle, freq)
-static PyObject *py_start_channel(PyObject *self, PyObject *args, PyObject *kwargs)
+static PyObject *py_start_channel(__attribute__ ((unused)) PyObject *self, PyObject *args, PyObject *kwargs)
 {
     char key[8];
     char *channel;
@@ -106,7 +106,7 @@ static PyObject *py_start_channel(PyObject *self, PyObject *args, PyObject *kwar
 }
 
 // python function stop(channel)
-static PyObject *py_stop_channel(PyObject *self, PyObject *args, PyObject *kwargs)
+static PyObject *py_stop_channel(__attribute__ ((unused)) PyObject *self, PyObject *args, __attribute__ ((unused)) PyObject *kwargs)
 {
     char key[8];
     char *channel;
@@ -138,7 +138,7 @@ static PyObject *py_stop_channel(PyObject *self, PyObject *args, PyObject *kwarg
 }
 
 // python method PWM.set_duty_cycle(channel, duty_cycle)
-static PyObject *py_set_duty_cycle(PyObject *self, PyObject *args, PyObject *kwargs)
+static PyObject *py_set_duty_cycle(__attribute__ ((unused)) PyObject *self, PyObject *args, PyObject *kwargs)
 {
     char key[8];
     char *channel;
@@ -172,7 +172,7 @@ static PyObject *py_set_duty_cycle(PyObject *self, PyObject *args, PyObject *kwa
 }
 
 // python method PWM.set_frequency(channel, frequency)
-static PyObject *py_set_frequency(PyObject *self, PyObject *args, PyObject *kwargs)
+static PyObject *py_set_frequency(__attribute__ ((unused)) PyObject *self, PyObject *args, PyObject *kwargs)
 {
     char key[8];
     char *channel;
@@ -257,4 +257,4 @@ PyMODINIT_FUNC initPWM(void)
 #else
     return;
 #endif
-}
+}

source/py_uart.c

@@ -29,7 +29,7 @@ SOFTWARE.
 const char *valid_uarts[4] = {"UART1", "UART2", "UART4", "UART5"};
 
 // python function cleanup()
-static PyObject *py_cleanup(PyObject *self, PyObject *args)
+static PyObject *py_cleanup(__attribute__ ((unused)) PyObject *self, __attribute__ ((unused)) PyObject *args)
 {
     // unexport the UART
     uart_cleanup();
@@ -38,7 +38,7 @@ static PyObject *py_cleanup(PyObject *self, PyObject *args)
 }
 
 // python function setup()
-static PyObject *py_setup_uart(PyObject *self, PyObject *args)
+static PyObject *py_setup_uart(__attribute__ ((unused)) PyObject *self, PyObject *args)
 {
     char dt[FILENAME_BUFFER_SIZE];
     char *channel;
@@ -107,4 +107,4 @@ PyMODINIT_FUNC initUART(void)
 #else
     return;
 #endif
-}
+}