build: remove some warnings

diff --git a/augment/module-augment-properties.c b/augment/module-augment-properties.c
index 05ba2c2..8c29ecf 100644 (file)
--- a/augment/module-augment-properties.c
+++ b/augment/module-augment-properties.c
@@ -216,8 +216,10 @@ static int catch_all(
 }
 
 static void parse_file(struct rule *r, const char *fn, pa_config_item *table, pa_bool_t first) {
-    char *application_name, *icon_name, *role;
-    pa_proplist *p;
+    char *application_name = NULL;
+    char *icon_name = NULL;
+    char *role = NULL;
+    pa_proplist *p = NULL;
 
     if (first) {
         /* clean up before update */

diff --git a/murphy/discover.c b/murphy/discover.c
index f1dfe33..c583f18 100644 (file)
--- a/murphy/discover.c
+++ b/murphy/discover.c
@@ -2201,8 +2201,8 @@ static void set_bluetooth_profile(struct userdata *u, mir_node *node)
             else {
                 nport++;
 
-                if (node->direction == mir_input  && prof->n_sources > 0 ||
-                    node->direction == mir_output && prof->n_sinks   > 0   ) {
+                if ((node->direction == mir_input  && prof->n_sources > 0) ||
+                    (node->direction == mir_output && prof->n_sinks   > 0)   ) {
                     if (make_active && prof->priority < make_active->priority)
                         pa_log_debug("   ruling out %s (low priority)", prof->name);
                     else {

diff --git a/murphy/extapi.c b/murphy/extapi.c
index 4fefc37..566c6b5 100644 (file)
--- a/murphy/extapi.c
+++ b/murphy/extapi.c
@@ -58,11 +58,13 @@ static const char *mir_direction_names[] = {
     [mir_output] = "output"
 };
 
+#if 0
 static const char *mir_implement_names[] = {
     [mir_implementation_unknown] = "unknown",
     [mir_device] = "device",
     [mir_stream] = "stream"
 };
+#endif
 
 static const char *mir_location_names[] = {
     [mir_location_unknown] = "unknown",
@@ -251,7 +253,7 @@ int extension_cb(pa_native_protocol *p, pa_module *m, pa_native_connection *c, u
             !pa_tagstruct_eof(t))
             goto fail;
 
-        pa_log_debug("got id in disconnect %d and hash %d", id, conn_hash(id));
+        pa_log_debug("got id in disconnect %d and hash %ld", id, (long)conn_hash(id));
 
         /* get conn from somewhere with id */
 
@@ -308,7 +310,7 @@ void extapi_signal_node_change(struct userdata *u) {
     uint32_t idx;
     pa_extapi *ap;
 
-    if (ap = u->extapi) {
+    if ((ap = u->extapi)) {
 
         pa_log_debug("signalling node change to extapi subscribers");
 

diff --git a/murphy/murphy-config.c b/murphy/murphy-config.c
index fc84b86..d211d42 100644 (file)
--- a/murphy/murphy-config.c
+++ b/murphy/murphy-config.c
@@ -104,8 +104,10 @@ static mir_volume_suppress_arg suppress = {
 
 
 static pa_bool_t use_default_configuration(struct userdata *);
-static pa_bool_t parse_config_file(struct userdata *, FILE *);
 
+#if 0
+static pa_bool_t parse_config_file(struct userdata *, FILE *);
+#endif
 
 pa_mir_config *pa_mir_config_init(struct userdata *u)
 {
@@ -181,11 +183,13 @@ static pa_bool_t use_default_configuration(struct userdata *u)
     return TRUE;
 }
 
+#if 0
 static pa_bool_t parse_config_file(struct userdata *u, FILE *f)
 {
     return TRUE;
 }
-                                  
+#endif
+                             
 /*
  * Local Variables:
  * c-basic-offset: 4

diff --git a/murphy/scripting.c b/murphy/scripting.c
index 4b7aa85..3b3c250 100644 (file)
--- a/murphy/scripting.c
+++ b/murphy/scripting.c
@@ -191,7 +191,10 @@ static pa_value *array_create(lua_State *, int, mrp_lua_strarray_t *);
 static int  array_getfield(lua_State *);
 static int  array_setfield(lua_State *);
 static int  array_getlength(lua_State *);
+
+#if 0
 static void array_destroy(void *);
+#endif
 
 static int  node_create(lua_State *);
 static int  node_getfield(lua_State *);
@@ -238,7 +241,11 @@ static bool calculate_bridge(lua_State *, void *, const char *,
                              mrp_funcbridge_value_t *);
 
 static limit_data_t *limit_data_check(lua_State *, int);
+
+#if 0
 static int limit_data_push(lua_State *, limit_data_t *);
+#endif
+
 static void limit_data_destroy(limit_data_t *);
 
 static intarray_t *intarray_check(lua_State *, int, int, int);
@@ -595,7 +602,6 @@ static int import_link(lua_State *L)
     scripting_import *imp;
     mrp_lua_strarray_t *columns;
     pa_value *values;
-    const char *table;
     const char *colnam;
     int rowidx;
     size_t colidx;
@@ -896,7 +902,7 @@ static int array_getlength(lua_State *L)
     MRP_LUA_LEAVE(1);
 }
 
-
+#if 0
 static void array_destroy(void *data)
 {
     pa_value *value = (pa_value *)data; 
@@ -910,7 +916,7 @@ static void array_destroy(void *data)
 
     MRP_LUA_LEAVE_NOARG;
 }
-
+#endif
 
 scripting_node *pa_scripting_node_create(struct userdata *u, mir_node *node)
 {
@@ -1575,7 +1581,7 @@ static int vollim_create(lua_State *L)
     pa_bool_t suppress = FALSE;
     pa_bool_t correct = FALSE;
     size_t arglgh = 0;
-    size_t i, n;
+    size_t i;
     int class;
     uint32_t mask, clmask;
     char id[256];
@@ -1691,7 +1697,9 @@ static int vollim_create(lua_State *L)
         }
     }
     else if (correct) {
-        *(double **)vlim->args = limit->value;
+        /* *(double **)vlim->args = limit->value; */
+    
+        memcpy(vlim->args, &limit->value, sizeof(limit->value));
     }
 
     if (type == vollim_generic)
@@ -1789,7 +1797,6 @@ static double vollim_calculate(struct userdata *u, int class, mir_node *node,
     pa_assert(!class || (class >= mir_application_class_begin &&
                          class <  mir_application_class_end)     );
     pa_assert(node);
-    pa_assert(args);
 
     vlim = (scripting_vollim *)(data - offset);
 
@@ -1898,6 +1905,7 @@ static limit_data_t *limit_data_check(lua_State *L, int idx)
     return ld;
 }
 
+#if 0
 static int limit_data_push(lua_State *L, limit_data_t *ld)
 {
     if (ld)
@@ -1907,6 +1915,7 @@ static int limit_data_push(lua_State *L, limit_data_t *ld)
 
     return 1;
 }
+#endif
 
 static void limit_data_destroy(limit_data_t *ld)
 {
@@ -2232,7 +2241,6 @@ static void setup_murphy_interface(struct userdata *u)
 
 static char *comma_separated_list(mrp_lua_strarray_t *arr, char *buf, int len)
 {
-    char *list;
     char *p, *e;
     size_t i;
 
@@ -2341,7 +2349,6 @@ static bool register_methods(lua_State *L)
     };
 
     funcbridge_def_t *d;
-    mrp_funcbridge_t *f;
     bool success = true;
 
     for (d = funcbridge_defs;   d->name;    d++) {

diff --git a/murphy/volume.c b/murphy/volume.c
index 8306045..6009b28 100644 (file)
--- a/murphy/volume.c
+++ b/murphy/volume.c
@@ -184,8 +184,6 @@ double mir_volume_apply_limits(struct userdata *u,
     double devlim, classlim;
     vlim_table *tbl;
     uint32_t clmask;
-    size_t i;
-    int c;
 
     pa_assert(u);
     pa_assert_se((volume = u->volume));
@@ -329,7 +327,6 @@ static void reset_volume_limit(struct userdata *u,
     pa_sink       *sink;
     pa_sink_input *sinp;
     int            class;
-    uint32_t       mask;
     uint32_t       i;
 
     pa_assert(u);