Add missing files in previous backport

diff --git a/Makefile.am b/Makefile.am
index b94b906..1b24e37 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -92,12 +92,12 @@ EXAMPLES = \
        src/examples/connman-list-services \
        src/examples/ofono-dial \
        src/examples/banshee \
-       src/examples/complex_types \
-       src/examples/complex_types_server \
+       src/examples/complex-types \
+       src/examples/complex-types_server \
        src/examples/server \
        src/examples/client \
        src/examples/simple-signal-emit \
-       src/examples/complex_types_client_eina_value
+       src/examples/complex-types-client-eina-value
 
 EXAMPLES_LIBS = libeldbus.la @ECORE_LIBS@ @EINA_LIBS@
 
@@ -112,10 +112,10 @@ src_examples_ofono_dial_LDADD = $(EXAMPLES_LIBS)
 src_examples_banshee_SOURCES = src/examples/banshee.c
 src_examples_banshee_LDADD = $(EXAMPLES_LIBS)
 
-src_examples_complex_types_SOURCES = src/examples/complex_types.c
+src_examples_complex_types_SOURCES = src/examples/complex-types.c
 src_examples_complex_types_LDADD = $(EXAMPLES_LIBS)
 
-src_examples_complex_types_server_SOURCES = src/examples/complex_types_server.c
+src_examples_complex_types_server_SOURCES = src/examples/complex-types-server.c
 src_examples_complex_types_server_LDADD = $(EXAMPLES_LIBS)
 
 src_examples_server_SOURCES = src/examples/server.c
@@ -127,7 +127,7 @@ src_examples_client_LDADD = $(EXAMPLES_LIBS)
 src_examples_simple_signal_emit_SOURCES = src/examples/simple-signal-emit.c
 src_examples_simple_signal_emit_LDADD = $(EXAMPLES_LIBS)
 
-src_examples_complex_types_client_eina_value_SOURCES = src/examples/complex_types_client_eina_value.c
+src_examples_complex_types_client_eina_value_SOURCES = src/examples/complex-types-client-eina-value.c
 src_examples_complex_types_client_eina_value_LDADD = $(EXAMPLES_LIBS)
 
 if BUILD_ELDBUS_CODEGEN

diff --git a/src/codegen/dbus.c b/src/codegen/dbus.c
index b05c760..ac9e828 100644 (file)
--- a/src/codegen/dbus.c
+++ b/src/codegen/dbus.c
@@ -62,30 +62,30 @@ arg_free(DBus_Arg *arg)
 DBus_Signal *
 signal_new(DBus_Interface *iface)
 {
-   DBus_Signal *signal = calloc(1, sizeof(DBus_Signal));
-   EINA_SAFETY_ON_NULL_RETURN_VAL(signal, NULL);
-   iface->signals = eina_inlist_append(iface->signals, EINA_INLIST_GET(signal));
-   signal->iface = iface;
-   return signal;
+   DBus_Signal *sig = calloc(1, sizeof(DBus_Signal));
+   EINA_SAFETY_ON_NULL_RETURN_VAL(sig, NULL);
+   iface->signals = eina_inlist_append(iface->signals, EINA_INLIST_GET(sig));
+   sig->iface = iface;
+   return sig;
 }
 
 void
-signal_free(DBus_Signal *signal)
+signal_free(DBus_Signal *sig)
 {
    DBus_Arg *arg;
    Eina_Inlist *inlist;
 
-   EINA_INLIST_FOREACH_SAFE(signal->args, inlist, arg)
+   EINA_INLIST_FOREACH_SAFE(sig->args, inlist, arg)
      arg_free(arg);
-   signal->iface->signals = eina_inlist_remove(signal->iface->signals,
-                                               EINA_INLIST_GET(signal));
-   free(signal->c_name);
-   free(signal->struct_name);
-   free(signal->free_function);
-   free(signal->cb_name);
-   free(signal->name);
-   free(signal->signal_event);
-   free(signal);
+   sig->iface->signals = eina_inlist_remove(sig->iface->signals,
+                                               EINA_INLIST_GET(sig));
+   free(sig->c_name);
+   free(sig->struct_name);
+   free(sig->free_function);
+   free(sig->cb_name);
+   free(sig->name);
+   free(sig->signal_event);
+   free(sig);
 }
 
 DBus_Interface *
@@ -103,9 +103,9 @@ interface_free(DBus_Interface *iface)
 {
    while (iface->signals)
      {
-        DBus_Signal *signal = EINA_INLIST_CONTAINER_GET(iface->signals,
+        DBus_Signal *sig = EINA_INLIST_CONTAINER_GET(iface->signals,
                                                         DBus_Signal);
-        signal_free(signal);
+        signal_free(sig);
      }
    while (iface->methods)
      {

diff --git a/src/codegen/parser.c b/src/codegen/parser.c
index 55bbab8..96a8f9e 100644 (file)
--- a/src/codegen/parser.c
+++ b/src/codegen/parser.c
@@ -46,7 +46,7 @@ obj_attributes_parser(void *data, const char *key, const char *value)
 }
 
 static Eina_Bool
-iface_attributes_parser(void *data, const char *key, const char *value)
+iface_attributes_parser(void *data EINA_UNUSED, const char *key, const char *value)
 {
    if (!strcmp(key, NAME_ATTR))
      iface->name = strdup(value);
@@ -55,7 +55,7 @@ iface_attributes_parser(void *data, const char *key, const char *value)
 }
 
 static Eina_Bool
-signal_attributes_parser(void *data, const char *key, const char *value)
+signal_attributes_parser(void *data EINA_UNUSED, const char *key, const char *value)
 {
    if (!strcmp(key, NAME_ATTR))
      d_signal->name = strdup(value);
@@ -64,7 +64,7 @@ signal_attributes_parser(void *data, const char *key, const char *value)
 }
 
 static Eina_Bool
-arg_attributes_parser(void *data, const char *key, const char *value)
+arg_attributes_parser(void *data EINA_UNUSED, const char *key, const char *value)
 {
    DBus_Arg *arg = data;
    if (!strcmp(key, NAME_ATTR))
@@ -78,7 +78,7 @@ arg_attributes_parser(void *data, const char *key, const char *value)
 }
 
 static Eina_Bool
-method_attributes_parser(void *data, const char *key, const char *value)
+method_attributes_parser(void *data EINA_UNUSED, const char *key, const char *value)
 {
    if (!strcmp(key, NAME_ATTR))
      method->name = strdup(value);
@@ -87,7 +87,7 @@ method_attributes_parser(void *data, const char *key, const char *value)
 }
 
 static Eina_Bool
-property_attributes_parser(void *data, const char *key, const char *value)
+property_attributes_parser(void *data EINA_UNUSED, const char *key, const char *value)
 {
    if (!strcmp(key, NAME_ATTR))
      property->name = strdup(value);
@@ -135,6 +135,15 @@ open_object(const char *content, unsigned length, Eina_Bool is_open_empty, DBus_
    return r;
 }
 
+static void
+interface_close(void)
+{
+   //its not necessary generate code to FreeDesktop interfaces
+   if (!strncmp(iface->name, DBUS_INTERFACE, strlen(DBUS_INTERFACE)))
+     interface_free(iface);
+   iface = NULL;
+}
+
 static Eina_Bool
 open_interface(const char *content, unsigned length, Eina_Bool is_open_empty, DBus_Object *obj)
 {
@@ -156,9 +165,27 @@ open_interface(const char *content, unsigned length, Eina_Bool is_open_empty, DB
    iface->c_name = dbus_name_to_c(tmp_name);
    free(tmp_name);
 
+   if (is_open_empty)
+     interface_close();
+
    return r;
 }
 
+static void
+signal_close(void)
+{
+   DBus_Arg *arg;
+   EINA_INLIST_FOREACH(d_signal->args, arg)
+     {
+        if ((arg->type[1]) || (arg->type[0] == 'v'))
+          {
+             d_signal->complex = EINA_TRUE;
+             break;
+          }
+     }
+   d_signal = NULL;
+}
+
 static Eina_Bool
 open_signal(const char *content, unsigned length, Eina_Bool is_open_empty)
 {
@@ -201,9 +228,12 @@ open_signal(const char *content, unsigned length, Eina_Bool is_open_empty)
         eina_strbuf_append_char(buf, toupper(d_signal->name[i]));
      }
    eina_strbuf_append(buf, "_EVENT");
-   d_signal->signal_event = strdup(eina_strbuf_string_get(buf));
+   d_signal->signal_event = eina_strbuf_string_steal(buf);
    eina_strbuf_free(buf);
 
+   if (is_open_empty)
+     signal_close();
+
    return r;
 }
 
@@ -288,8 +318,30 @@ open_arg(const char *content, unsigned length)
    return r;
 }
 
+static void
+method_close(void)
+{
+   DBus_Arg *arg;
+   EINA_INLIST_FOREACH(method->args, arg)
+     {
+        if ((arg->type[1]) || (arg->type[0] == 'v'))
+          {
+             if (arg->direction == 'o')
+               method->out_complex = EINA_TRUE;
+             else
+               method->in_complex = EINA_TRUE;
+          }
+     }
+   if (method->no_reply)
+     {
+        free(method->cb_name);
+        method->cb_name = strdup("NULL");
+     }
+   method = NULL;
+}
+
 static Eina_Bool
-open_method(const char *content, unsigned lenght)
+open_method(const char *content, unsigned lenght, Eina_Bool is_open_empty)
 {
    Eina_Bool r;
    char *tmp;
@@ -319,11 +371,14 @@ open_method(const char *content, unsigned lenght)
            method->function_cb[i+1] = toupper(method->function_cb[i+1]);
      }
 
+   if (is_open_empty)
+     method_close();
+
    return r;
 }
 
 static Eina_Bool
-open_property(const char *content, unsigned length, Eina_Bool is_open_empty)
+open_property(const char *content, unsigned length)
 {
    Eina_Bool r;
    char *tmp;
@@ -363,9 +418,9 @@ open_tag(const char *content, unsigned length, Eina_Bool is_open_empty, DBus_Obj
    else if (!strncmp(content, ANNOTATION_TAG, ANNOTATION_TAG_LENGHT) && iface)
      return open_annotation(content, length);
    else if (!strncmp(content, METHOD_TAG, METHOD_TAG_LENGHT) && iface)
-     return open_method(content, length);
+     return open_method(content, length, is_open_empty);
    else if (!strncmp(content, PROPERTY_TAG, PROPERTY_TAG_LENGHT) && iface)
-     return open_property(content, length, is_open_empty);
+     return open_property(content, length);
    else if (!strncmp(content, ANNOTATION_TAG, ANNOTATION_TAG_LENGHT) && iface)
      return EINA_TRUE;
 
@@ -377,54 +432,8 @@ open_tag(const char *content, unsigned length, Eina_Bool is_open_empty, DBus_Obj
    return EINA_TRUE;
 }
 
-static void
-interface_close(void)
-{
-   //its not necessary generate code to FreeDesktop interfaces
-   if (!strncmp(iface->name, DBUS_INTERFACE, strlen(DBUS_INTERFACE)))
-     interface_free(iface);
-   iface = NULL;
-}
-
-static void
-signal_close(void)
-{
-   DBus_Arg *arg;
-   EINA_INLIST_FOREACH(d_signal->args, arg)
-     {
-        if ((arg->type[1]) || (arg->type[0] == 'v'))
-          {
-             d_signal->complex = EINA_TRUE;
-             break;
-          }
-     }
-   d_signal = NULL;
-}
-
-static void
-method_close(void)
-{
-   DBus_Arg *arg;
-   EINA_INLIST_FOREACH(method->args, arg)
-     {
-        if ((arg->type[1]) || (arg->type[0] == 'v'))
-          {
-             if (arg->direction == 'o')
-               method->out_complex = EINA_TRUE;
-             else
-               method->in_complex = EINA_TRUE;
-          }
-     }
-   if (method->no_reply)
-     {
-        free(method->cb_name);
-        method->cb_name = strdup("NULL");
-     }
-   method = NULL;
-}
-
 static Eina_Bool
-close_tag(const char *content, unsigned length)
+close_tag(const char *content)
 {
    if (!strncmp(content, INTERFACE_TAG, INTERFACE_TAG_LENGHT))
      interface_close();
@@ -439,7 +448,7 @@ close_tag(const char *content, unsigned length)
 }
 
 Eina_Bool
-parser(void *data, Eina_Simple_XML_Type type, const char *content, unsigned offset, unsigned length)
+parser(void *data, Eina_Simple_XML_Type type, const char *content, unsigned offset EINA_UNUSED, unsigned length)
 {
    Eina_Bool r = EINA_TRUE;
    DBus_Object **obj = data;
@@ -455,7 +464,7 @@ parser(void *data, Eina_Simple_XML_Type type, const char *content, unsigned offs
         }
       case EINA_SIMPLE_XML_CLOSE:
         {
-           r = close_tag(content, length);
+           r = close_tag(content);
            break;
         }
       default:

diff --git a/src/codegen/source_client.c b/src/codegen/source_client.c
index b8787c1..3d0bf43 100644 (file)
--- a/src/codegen/source_client.c
+++ b/src/codegen/source_client.c
@@ -300,7 +300,7 @@ source_client_method_generate(const DBus_Method *method, Eina_Strbuf *c_code, Ei
 }
 
 static void
-source_client_signal_generate(const DBus_Signal *signal, Eina_Strbuf *c_code, Eina_Strbuf * h, Eina_Strbuf *c_init_function, Eina_Strbuf *c_header)
+source_client_signal_generate(const DBus_Signal *sig, Eina_Strbuf *c_code, Eina_Strbuf * h, Eina_Strbuf *c_init_function, Eina_Strbuf *c_header)
 {
    DBus_Arg *arg;
    Eina_Strbuf *full_signature = eina_strbuf_new();
@@ -308,23 +308,23 @@ source_client_signal_generate(const DBus_Signal *signal, Eina_Strbuf *c_code, Ei
    Eina_Strbuf *string_copy = eina_strbuf_new();
    Eina_Strbuf *string_free = eina_strbuf_new();
 
-   eina_strbuf_append_printf(c_init_function, "   eldbus_proxy_signal_handler_add(proxy, \"%s\", %s, proxy);\n", signal->name, signal->cb_name);
-   eina_strbuf_append_printf(c_header, "int %s;\n", signal->signal_event);
-   eina_strbuf_append_printf(h, "extern int %s;\n", signal->signal_event);
-   eina_strbuf_append_printf(c_init_function, "   if (!%s)\n", signal->signal_event);
-   eina_strbuf_append_printf(c_init_function, "     %s = ecore_event_type_new();\n", signal->signal_event);
+   eina_strbuf_append_printf(c_init_function, "   eldbus_proxy_signal_handler_add(proxy, \"%s\", %s, proxy);\n", sig->name, sig->cb_name);
+   eina_strbuf_append_printf(c_header, "int %s;\n", sig->signal_event);
+   eina_strbuf_append_printf(h, "extern int %s;\n", sig->signal_event);
+   eina_strbuf_append_printf(c_init_function, "   if (!%s)\n", sig->signal_event);
+   eina_strbuf_append_printf(c_init_function, "     %s = ecore_event_type_new();\n", sig->signal_event);
 
-   eina_strbuf_append_printf(h, "typedef struct _%s\n", signal->struct_name);
+   eina_strbuf_append_printf(h, "typedef struct _%s\n", sig->struct_name);
    eina_strbuf_append_printf(h, "{\n");
    eina_strbuf_append_printf(h, "   Eldbus_Proxy *proxy;\n");
 
-   if (signal->complex)
+   if (sig->complex)
      {
         eina_strbuf_append_printf(h, "   Eina_Value *value;\n");
         goto jump_simple_stuff;
      }
 
-   EINA_INLIST_FOREACH(signal->args, arg)
+   EINA_INLIST_FOREACH(sig->args, arg)
      {
         eina_strbuf_append(full_signature, arg->type);
         eina_strbuf_append_printf(parameters, ", &s_data->%s", arg->c_name);
@@ -338,12 +338,12 @@ source_client_signal_generate(const DBus_Signal *signal, Eina_Strbuf *c_code, Ei
      }
 
 jump_simple_stuff:
-   eina_strbuf_append_printf(h, "} %s;\n", signal->struct_name);
+   eina_strbuf_append_printf(h, "} %s;\n", sig->struct_name);
 
    //free function
-   eina_strbuf_append_printf(c_code, "\nstatic void\n%s(void *user_data, void *func_data)\n{\n", signal->free_function);
-   eina_strbuf_append_printf(c_code, "   %s *s_data = user_data;\n", signal->struct_name);
-   if (signal->complex)
+   eina_strbuf_append_printf(c_code, "\nstatic void\n%s(void *user_data, void *func_data)\n{\n", sig->free_function);
+   eina_strbuf_append_printf(c_code, "   %s *s_data = user_data;\n", sig->struct_name);
+   if (sig->complex)
      eina_strbuf_append(c_code, "   eina_value_free(s_data->proxy);\n");
    else
      eina_strbuf_append(c_code, eina_strbuf_string_get(string_free));
@@ -351,11 +351,11 @@ jump_simple_stuff:
    eina_strbuf_append_printf(c_code, "}\n");
 
    //cb function
-   eina_strbuf_append_printf(c_code, "\nstatic void\n%s(void *data, const Eldbus_Message *msg)\n{\n", signal->cb_name);
+   eina_strbuf_append_printf(c_code, "\nstatic void\n%s(void *data, const Eldbus_Message *msg)\n{\n", sig->cb_name);
    eina_strbuf_append_printf(c_code, "   Eldbus_Proxy *proxy = data;\n");
-   eina_strbuf_append_printf(c_code, "   %s *s_data = calloc(1, sizeof(%s));\n", signal->struct_name, signal->struct_name);
+   eina_strbuf_append_printf(c_code, "   %s *s_data = calloc(1, sizeof(%s));\n", sig->struct_name, sig->struct_name);
    eina_strbuf_append_printf(c_code, "   s_data->proxy = proxy;\n");
-   if (signal->complex)
+   if (sig->complex)
      {
         eina_strbuf_append_printf(c_code, "   s_data->value = eldbus_message_to_eina_value(msg);\n");
         goto end_signal;
@@ -368,7 +368,7 @@ jump_simple_stuff:
    eina_strbuf_append(c_code, eina_strbuf_string_get(string_copy));
 
 end_signal:
-   eina_strbuf_append_printf(c_code, "   ecore_event_add(%s, s_data, %s, NULL);\n", signal->signal_event, signal->free_function);
+   eina_strbuf_append_printf(c_code, "   ecore_event_add(%s, s_data, %s, NULL);\n", sig->signal_event, sig->free_function);
    eina_strbuf_append_printf(c_code, "}\n");
 
    eina_strbuf_free(full_signature);
@@ -532,7 +532,7 @@ source_client_generate(DBus_Object *path, const char *prefix, const char *interf
      {
         Eina_Strbuf *h, *c_init_function, *c_header, *c_code;
         DBus_Method *method;
-        DBus_Signal *signal;
+        DBus_Signal *sig;
         DBus_Property *prop;
         char *file_name, *aux;
         int i;
@@ -591,8 +591,8 @@ source_client_generate(DBus_Object *path, const char *prefix, const char *interf
         EINA_INLIST_FOREACH(iface->methods, method)
           source_client_method_generate(method, c_code, h);
 
-        EINA_INLIST_FOREACH(iface->signals, signal)
-          source_client_signal_generate(signal, c_code, h, c_init_function, c_header);
+        EINA_INLIST_FOREACH(iface->signals, sig)
+          source_client_signal_generate(sig, c_code, h, c_init_function, c_header);
 
         EINA_INLIST_FOREACH(iface->properties, prop)
           source_client_property_generate(prop, c_code, h);

diff --git a/src/codegen/utils.c b/src/codegen/utils.c
index 1f85891..a020445 100644 (file)
--- a/src/codegen/utils.c
+++ b/src/codegen/utils.c
@@ -5,7 +5,7 @@ Eina_Bool
 file_read(const char *file_name, char **buffer)
 {
    FILE *xml_handler;
-   char data;
+   int data; /* fgetc needs int to detect EOF correctly */
    Eina_Strbuf *buf;
 
    xml_handler = fopen(file_name, "rt");
@@ -17,10 +17,10 @@ file_read(const char *file_name, char **buffer)
    buf = eina_strbuf_new();
 
    while ((data = fgetc(xml_handler)) != EOF)
-     eina_strbuf_append_char(buf, data);
+     eina_strbuf_append_char(buf, (char)data);
 
    fclose(xml_handler);
-   *buffer = strdup(eina_strbuf_string_get(buf));
+   *buffer = eina_strbuf_string_steal(buf);
    eina_strbuf_free(buf);
 
    return EINA_TRUE;
@@ -62,8 +62,7 @@ dbus_name_to_c(const char *dbus)
    while ((pch = strtok(NULL, "/.")))
      eina_strbuf_append_printf(buffer, "_%s",pch);
 
-   ret = strdup(eina_strbuf_string_get(buffer));
-   eina_strbuf_reset(buffer);
+   ret = eina_strbuf_string_steal(buffer);
    for (i = 0; ret[i]; i++)
      {
         if (i > 0 && ret[i-1] != '_' && ret[i] > '@' && ret[i] < '[')//upper case
@@ -72,7 +71,7 @@ dbus_name_to_c(const char *dbus)
           eina_strbuf_append_char(buffer, tolower(ret[i]));
      }
    free(ret);
-   ret = strdup(eina_strbuf_string_get(buffer));
+   ret = eina_strbuf_string_steal(buffer);
 end:
    free(str_cpy);
    eina_strbuf_free(buffer);
@@ -93,7 +92,7 @@ replace_string(const char *string, const char *substr, const char *replacement)
    while ((pch = strtok(NULL, substr)))
      eina_strbuf_append_printf(buffer, "%s%s", replacement, pch);
 
-   ret = strdup(eina_strbuf_string_get(buffer));
+   ret = eina_strbuf_string_steal(buffer);
    free(str_cpy);
    eina_strbuf_free(buffer);
    return ret;
@@ -126,7 +125,7 @@ string_build(const char *fmt, ...)
    eina_strbuf_prepend_vprintf(buffer, fmt, ap);
    va_end(ap);
 
-   ret = strdup(eina_strbuf_string_get(buffer));
+   ret = eina_strbuf_string_steal(buffer);
    eina_strbuf_free(buffer);
 
    return ret;

diff --git a/src/examples/banshee.c b/src/examples/banshee.c
index 5202422..c9d30b5 100644 (file)
--- a/src/examples/banshee.c
+++ b/src/examples/banshee.c
@@ -1,3 +1,6 @@
+//Compile with:
+// gcc -o banshee banshee.c `pkg-config --cflags --libs eldbus ecore eina`
+
 #include "Eldbus.h"
 #include <Ecore.h>
 
@@ -13,7 +16,7 @@
 static Eldbus_Signal_Handler *state_changed2;
 
 static Eina_Bool
-_timeout_application(void *data)
+_timeout_application(void *data EINA_UNUSED)
 {
    printf("\n## ecore_main_loop_quit()\n");
    ecore_main_loop_quit();
@@ -21,7 +24,7 @@ _timeout_application(void *data)
 }
 
 static void
-on_get_playlists(void *data, const Eldbus_Message *msg, Eldbus_Pending *pending)
+on_get_playlists(void *data EINA_UNUSED, const Eldbus_Message *msg, Eldbus_Pending *pending EINA_UNUSED)
 {
    Eldbus_Message_Iter *array, *struct_entry;
    const char *path, *name, *image;
@@ -49,7 +52,7 @@ on_get_playlists(void *data, const Eldbus_Message *msg, Eldbus_Pending *pending)
 }
 
 static void
-iterate_dict(void *data, const void *key, Eldbus_Message_Iter *var)
+iterate_dict(void *data EINA_UNUSED, const void *key, Eldbus_Message_Iter *var)
 {
    const char *skey = key;
 
@@ -58,7 +61,7 @@ iterate_dict(void *data, const void *key, Eldbus_Message_Iter *var)
         unsigned count;
         if (!eldbus_message_iter_arguments_get(var, "u", &count))
           printf("error2\n");
-        printf("PlaylistCount=%d\n", count);
+        printf("PlaylistCount=%u\n", count);
      }
    else if (!strcmp(skey, "Orderings"))
      {
@@ -73,7 +76,7 @@ iterate_dict(void *data, const void *key, Eldbus_Message_Iter *var)
 }
 
 static void
-playlist_get_all_cb(void *data, const Eldbus_Message *msg, Eldbus_Pending *pending)
+playlist_get_all_cb(void *data EINA_UNUSED, const Eldbus_Message *msg, Eldbus_Pending *pending EINA_UNUSED)
 {
    Eldbus_Message_Iter *array;
    EINA_SAFETY_ON_TRUE_RETURN(eldbus_message_error_get(msg, NULL, NULL));
@@ -83,7 +86,7 @@ playlist_get_all_cb(void *data, const Eldbus_Message *msg, Eldbus_Pending *pendi
 }
 
 static void
-on_introspect(void *data, const Eldbus_Message *msg, Eldbus_Pending *pending)
+on_introspect(void *data EINA_UNUSED, const Eldbus_Message *msg, Eldbus_Pending *pending EINA_UNUSED)
 {
    const char *string;
 
@@ -99,7 +102,7 @@ on_introspect(void *data, const Eldbus_Message *msg, Eldbus_Pending *pending)
 }
 
 static void
-on_next_or_pause(void *data, const Eldbus_Message *msg, Eldbus_Pending *pending)
+on_next_or_pause(void *data, const Eldbus_Message *msg, Eldbus_Pending *pending EINA_UNUSED)
 {
    const char *status = data;
 
@@ -109,7 +112,7 @@ on_next_or_pause(void *data, const Eldbus_Message *msg, Eldbus_Pending *pending)
 }
 
 static void
-on_state_changed(void *data, const Eldbus_Message *msg)
+on_state_changed(void *data EINA_UNUSED, const Eldbus_Message *msg)
 {
    const char *status;
    EINA_SAFETY_ON_TRUE_RETURN(eldbus_message_error_get(msg, NULL, NULL));
@@ -124,7 +127,7 @@ on_state_changed(void *data, const Eldbus_Message *msg)
 }
 
 static void
-on_state_changed2(void *data, const Eldbus_Message *msg)
+on_state_changed2(void *data EINA_UNUSED, const Eldbus_Message *msg)
 {
    const char *status;
    EINA_SAFETY_ON_TRUE_RETURN(eldbus_message_error_get(msg, NULL, NULL));
@@ -141,7 +144,7 @@ on_state_changed2(void *data, const Eldbus_Message *msg)
 }
 
 static void
-on_banshee_startup(void *data, const Eldbus_Message *msg)
+on_banshee_startup(void *data EINA_UNUSED, const Eldbus_Message *msg)
 {
    const char *bus, *older_id, *new_id;
 
@@ -156,7 +159,7 @@ on_banshee_startup(void *data, const Eldbus_Message *msg)
 }
 
 static void
-on_name_owner_changed(void *data, const Eldbus_Message *msg)
+on_name_owner_changed(void *data EINA_UNUSED, const Eldbus_Message *msg)
 {
    const char *bus, *older_id, *new_id;
 
@@ -236,4 +239,3 @@ end:
    ecore_shutdown();
    return 0;
 }
-

diff --git a/src/examples/client.c b/src/examples/client.c
index a407847..18a1fcd 100644 (file)
--- a/src/examples/client.c
+++ b/src/examples/client.c
@@ -1,3 +1,6 @@
+//Compile with:
+// gcc -o client client.c `pkg-config --cflags --libs eldbus ecore eina`
+
 #include "Eldbus.h"
 #include <Ecore.h>
 
@@ -10,13 +13,13 @@ static int _client_log_dom = -1;
 #define ERR(...)      EINA_LOG_DOM_ERR(_client_log_dom, __VA_ARGS__)
 
 static void
-_on_alive(void *context, const Eldbus_Message *msg)
+_on_alive(void *context EINA_UNUSED, const Eldbus_Message *msg EINA_UNUSED)
 {
    printf("Alive\n\n");
 }
 
 static void
-_on_hello(void *context, const Eldbus_Message *msg)
+_on_hello(void *context EINA_UNUSED, const Eldbus_Message *msg)
 {
    const char *txt;
    if (eldbus_message_arguments_get(msg, "s", &txt))
@@ -56,7 +59,7 @@ test(void)
 }
 
 static void
-_on_send_bool(void *data, const Eldbus_Message *msg, Eldbus_Pending *pending)
+_on_send_bool(void *data EINA_UNUSED, const Eldbus_Message *msg, Eldbus_Pending *pending EINA_UNUSED)
 {
    const char *errname, *errmsg;
    Eina_Bool b;
@@ -83,7 +86,7 @@ _on_send_bool(void *data, const Eldbus_Message *msg, Eldbus_Pending *pending)
 }
 
 static void
-_on_send_byte(void *data, const Eldbus_Message *msg, Eldbus_Pending *pending)
+_on_send_byte(void *data EINA_UNUSED, const Eldbus_Message *msg, Eldbus_Pending *pending EINA_UNUSED)
 {
    const char *errname, *errmsg;
    uint8_t y;
@@ -110,7 +113,7 @@ _on_send_byte(void *data, const Eldbus_Message *msg, Eldbus_Pending *pending)
 }
 
 static void
-_on_send_uint32(void *data, const Eldbus_Message *msg, Eldbus_Pending *pending)
+_on_send_uint32(void *data EINA_UNUSED, const Eldbus_Message *msg, Eldbus_Pending *pending EINA_UNUSED)
 {
    const char *errname, *errmsg;
    unsigned int u;
@@ -137,7 +140,7 @@ _on_send_uint32(void *data, const Eldbus_Message *msg, Eldbus_Pending *pending)
 }
 
 static void
-_on_send_int32(void *data, const Eldbus_Message *msg, Eldbus_Pending *pending)
+_on_send_int32(void *data EINA_UNUSED, const Eldbus_Message *msg, Eldbus_Pending *pending EINA_UNUSED)
 {
    const char *errname, *errmsg;
    int32_t i;
@@ -164,7 +167,7 @@ _on_send_int32(void *data, const Eldbus_Message *msg, Eldbus_Pending *pending)
 }
 
 static void
-_on_send_int16(void *data, const Eldbus_Message *msg, Eldbus_Pending *pending)
+_on_send_int16(void *data EINA_UNUSED, const Eldbus_Message *msg, Eldbus_Pending *pending EINA_UNUSED)
 {
    const char *errname, *errmsg;
    int16_t n;
@@ -191,7 +194,7 @@ _on_send_int16(void *data, const Eldbus_Message *msg, Eldbus_Pending *pending)
 }
 
 static void
-_on_send_double(void *data, const Eldbus_Message *msg, Eldbus_Pending *pending)
+_on_send_double(void *data EINA_UNUSED, const Eldbus_Message *msg, Eldbus_Pending *pending EINA_UNUSED)
 {
    const char *errname, *errmsg;
    double d;
@@ -218,7 +221,7 @@ _on_send_double(void *data, const Eldbus_Message *msg, Eldbus_Pending *pending)
 }
 
 static void
-_on_send_string(void *data, const Eldbus_Message *msg, Eldbus_Pending *pending)
+_on_send_string(void *data EINA_UNUSED, const Eldbus_Message *msg, Eldbus_Pending *pending EINA_UNUSED)
 {
    const char *errname, *errmsg;
    char *s;
@@ -245,7 +248,7 @@ _on_send_string(void *data, const Eldbus_Message *msg, Eldbus_Pending *pending)
 }
 
 static void
-_on_async_test(void *data, const Eldbus_Message *msg, Eldbus_Pending *pending)
+_on_async_test(void *data EINA_UNUSED, const Eldbus_Message *msg, Eldbus_Pending *pending EINA_UNUSED)
 {
    const char *errname, *errmsg;
 
@@ -259,13 +262,13 @@ _on_async_test(void *data, const Eldbus_Message *msg, Eldbus_Pending *pending)
 }
 
 static void
-on_name_owner_changed(void *data, const char *bus, const char *old_id, const char *new_id)
+on_name_owner_changed(void *data EINA_UNUSED, const char *bus, const char *old_id, const char *new_id EINA_UNUSED)
 {
    printf("Bus=%s | old=%s | new=%s\n", bus, old_id, new_id);
 }
 
 static Eina_Bool
-finish(void *data)
+finish(void *data EINA_UNUSED)
 {
    ecore_main_loop_quit();
    return ECORE_CALLBACK_CANCEL;

diff --git a/src/examples/complex_types_client_eina_value.c b/src/examples/complex-types-client-eina-value.c
similarity index 91%
rename from src/examples/complex_types_client_eina_value.c
rename to src/examples/complex-types-client-eina-value.c
index 1442d06..3d290ae 100644 (file)
--- a/src/examples/complex_types_client_eina_value.c
+++ b/src/examples/complex-types-client-eina-value.c
@@ -1,3 +1,6 @@
+//Compile with:
+// gcc -o complex-types-client-eina-value complex-types-client-eina-value.c `pkg-config --cflags --libs eldbus ecore eina`
+
 #include "Eldbus.h"
 #include <Ecore.h>
 
@@ -90,7 +93,7 @@ _fill_receive_array_of_string_int_with_size(Eldbus_Message *msg, int size, const
 }
 
 static void
-on_send_array(void *data, const Eldbus_Message *msg, Eldbus_Pending *pending)
+on_send_array(void *data EINA_UNUSED, const Eldbus_Message *msg, Eldbus_Pending *pending EINA_UNUSED)
 {
    Eina_Value *v, array;
    const char *txt;
@@ -116,7 +119,7 @@ on_send_array(void *data, const Eldbus_Message *msg, Eldbus_Pending *pending)
 }
 
 static void
-on_receive_array_with_size(void *data, const Eldbus_Message *msg, Eldbus_Pending *pending)
+on_receive_array_with_size(void *data EINA_UNUSED, const Eldbus_Message *msg, Eldbus_Pending *pending EINA_UNUSED)
 {
    const char *errname;
    const char *errmsg;
@@ -129,7 +132,7 @@ on_receive_array_with_size(void *data, const Eldbus_Message *msg, Eldbus_Pending
 }
 
 static void
-on_plus_one(void *data, const Eldbus_Message *msg, Eldbus_Pending *pending)
+on_plus_one(void *data EINA_UNUSED, const Eldbus_Message *msg, Eldbus_Pending *pending EINA_UNUSED)
 {
    Eina_Value *v;
    int num2;
@@ -148,7 +151,7 @@ on_plus_one(void *data, const Eldbus_Message *msg, Eldbus_Pending *pending)
 }
 
 static void
-receive_variant_cb(void *data, const Eldbus_Message *msg, Eldbus_Pending *pending)
+receive_variant_cb(void *data EINA_UNUSED, const Eldbus_Message *msg, Eldbus_Pending *pending EINA_UNUSED)
 {
    Eina_Value *v, variant, array;
    unsigned i;
@@ -177,7 +180,7 @@ receive_variant_cb(void *data, const Eldbus_Message *msg, Eldbus_Pending *pendin
 }
 
 static void
-_property_removed(void *data, Eldbus_Proxy *proxy, void *event_info)
+_property_removed(void *data EINA_UNUSED, Eldbus_Proxy *proxy EINA_UNUSED, void *event_info)
 {
    Eldbus_Proxy_Event_Property_Removed *event = event_info;
 
@@ -185,7 +188,7 @@ _property_removed(void *data, Eldbus_Proxy *proxy, void *event_info)
 }
 
 static void
-_property_changed(void *data, Eldbus_Proxy *proxy, void *event_info)
+_property_changed(void *data EINA_UNUSED, Eldbus_Proxy *proxy EINA_UNUSED, void *event_info)
 {
    Eldbus_Proxy_Event_Property_Changed *event = event_info;
    const char *name;
@@ -291,14 +294,12 @@ main(void)
    msg = eldbus_proxy_method_call_new(proxy, "ReceiveArrayOfStringIntWithSize");
    _fill_receive_array_of_string_int_with_size(msg, size_of_array, array_string);
    eldbus_proxy_send(proxy, msg, on_receive_array_with_size, NULL, -1);
-   eldbus_message_unref(msg);
 
    eldbus_proxy_call(proxy, "SendArray", on_send_array, NULL, -1 , "");
 
    msg = eldbus_proxy_method_call_new(proxy, "PlusOne");
    _fill_plus_one(msg, 14);
    eldbus_proxy_send(proxy, msg, on_plus_one, NULL, -1);
-   eldbus_message_unref(msg);
 
    eldbus_proxy_event_callback_add(proxy,
                                   ELDBUS_PROXY_EVENT_PROPERTY_CHANGED,

diff --git a/src/examples/complex_types_server.c b/src/examples/complex-types-server.c
similarity index 89%
rename from src/examples/complex_types_server.c
rename to src/examples/complex-types-server.c
index 9157636..125fef8 100644 (file)
--- a/src/examples/complex_types_server.c
+++ b/src/examples/complex-types-server.c
@@ -1,3 +1,6 @@
+//Compile with:
+// gcc -o complex-types-server complex-types-server.c `pkg-config --cflags --libs eldbus ecore`
+
 #include "Eldbus.h"
 #include <Ecore.h>
 
@@ -11,7 +14,7 @@ static int int32 = 35;
 static Ecore_Timer *timer;
 
 static Eldbus_Message *
-_receive_array(const Eldbus_Service_Interface *iface, const Eldbus_Message *msg)
+_receive_array(const Eldbus_Service_Interface *iface EINA_UNUSED, const Eldbus_Message *msg)
 {
    Eldbus_Message *reply = eldbus_message_method_return_new(msg);
    Eldbus_Message_Iter *array;
@@ -32,7 +35,7 @@ _receive_array(const Eldbus_Service_Interface *iface, const Eldbus_Message *msg)
 }
 
 static Eldbus_Message *
-_receive_array_of_string_int_with_size(const Eldbus_Service_Interface *iface, const Eldbus_Message *msg)
+_receive_array_of_string_int_with_size(const Eldbus_Service_Interface *iface EINA_UNUSED, const Eldbus_Message *msg)
 {
    Eldbus_Message *reply = eldbus_message_method_return_new(msg);
    Eldbus_Message_Iter *array, *struct_si;
@@ -64,7 +67,7 @@ _receive_array_of_string_int_with_size(const Eldbus_Service_Interface *iface, co
 }
 
 static Eldbus_Message *
-_receive_variant(const Eldbus_Service_Interface *iface, const Eldbus_Message *msg)
+_receive_variant(const Eldbus_Service_Interface *iface EINA_UNUSED, const Eldbus_Message *msg)
 {
    Eldbus_Message *reply = eldbus_message_method_return_new(msg);
    Eldbus_Message_Iter *var, *array, *main_iter;
@@ -84,7 +87,7 @@ _receive_variant(const Eldbus_Service_Interface *iface, const Eldbus_Message *ms
 }
 
 static Eldbus_Message *
-_send_variant(const Eldbus_Service_Interface *iface, const Eldbus_Message *msg)
+_send_variant(const Eldbus_Service_Interface *iface EINA_UNUSED, const Eldbus_Message *msg)
 {
    Eldbus_Message *reply = eldbus_message_method_return_new(msg);
    Eldbus_Message_Iter *variant;
@@ -135,7 +138,7 @@ _send_variant(const Eldbus_Service_Interface *iface, const Eldbus_Message *msg)
 }
 
 static Eldbus_Message *
-_send_array_int(const Eldbus_Service_Interface *iface, const Eldbus_Message *msg)
+_send_array_int(const Eldbus_Service_Interface *iface EINA_UNUSED, const Eldbus_Message *msg)
 {
    Eldbus_Message *reply = eldbus_message_method_return_new(msg);
    Eldbus_Message_Iter *iter, *array;
@@ -153,7 +156,7 @@ _send_array_int(const Eldbus_Service_Interface *iface, const Eldbus_Message *msg
 }
 
 static Eldbus_Message *
-_send_array(const Eldbus_Service_Interface *iface, const Eldbus_Message *msg)
+_send_array(const Eldbus_Service_Interface *iface EINA_UNUSED, const Eldbus_Message *msg)
 {
    Eldbus_Message *reply = eldbus_message_method_return_new(msg);
    Eldbus_Message_Iter *iter, *array;
@@ -172,7 +175,7 @@ _send_array(const Eldbus_Service_Interface *iface, const Eldbus_Message *msg)
 }
 
 static Eldbus_Message *
-_plus_one(const Eldbus_Service_Interface *iface, const Eldbus_Message *msg)
+_plus_one(const Eldbus_Service_Interface *iface EINA_UNUSED, const Eldbus_Message *msg)
 {
    Eldbus_Message *reply = eldbus_message_method_return_new(msg);
    int num;
@@ -190,7 +193,7 @@ _plus_one(const Eldbus_Service_Interface *iface, const Eldbus_Message *msg)
 }
 
 static Eldbus_Message *
-_double_container(const Eldbus_Service_Interface *iface, const Eldbus_Message *msg)
+_double_container(const Eldbus_Service_Interface *iface EINA_UNUSED, const Eldbus_Message *msg)
 {
    Eldbus_Message_Iter *array1, *array2, *structure;
    int num1, num2;
@@ -220,7 +223,7 @@ _double_container(const Eldbus_Service_Interface *iface, const Eldbus_Message *m
 }
 
 static Eina_Bool
-_properties_get(const Eldbus_Service_Interface *iface, const char *propname, Eldbus_Message_Iter *iter, const Eldbus_Message *request_msg, Eldbus_Message **error)
+_properties_get(const Eldbus_Service_Interface *iface EINA_UNUSED, const char *propname, Eldbus_Message_Iter *iter, const Eldbus_Message *request_msg EINA_UNUSED, Eldbus_Message **error EINA_UNUSED)
 {
    printf("Properties_get - %s\n", propname);
    if (!strcmp(propname, "Resp2"))
@@ -243,7 +246,7 @@ _properties_get(const Eldbus_Service_Interface *iface, const char *propname, Eld
 }
 
 static Eldbus_Message *
-_properties_set(const Eldbus_Service_Interface *iface, const char *propname, Eldbus_Message_Iter *iter, const Eldbus_Message *msg)
+_properties_set(const Eldbus_Service_Interface *iface EINA_UNUSED, const char *propname, Eldbus_Message_Iter *iter, const Eldbus_Message *msg)
 {
    char *type;
 
@@ -335,7 +338,7 @@ static Eina_Bool _emit_changed(void *data)
 }
 
 static void
-on_name_request(void *data, const Eldbus_Message *msg, Eldbus_Pending *pending)
+on_name_request(void *data, const Eldbus_Message *msg, Eldbus_Pending *pending EINA_UNUSED)
 {
    unsigned int reply;
    Eldbus_Service_Interface *iface = data;

diff --git a/src/examples/complex_types.c b/src/examples/complex-types.c
similarity index 89%
rename from src/examples/complex_types.c
rename to src/examples/complex-types.c
index d155c22..fc0063a 100644 (file)
--- a/src/examples/complex_types.c
+++ b/src/examples/complex-types.c
@@ -1,3 +1,6 @@
+//Compile with:
+// gcc -o complex-types complex-types.c `pkg-config --cflags --libs eldbus ecore`
+
 #include "Eldbus.h"
 #include <Ecore.h>
 
@@ -8,7 +11,7 @@
 Eldbus_Connection *conn;
 
 static Eina_Bool
-_timer1_cb(void *data)
+_timer1_cb(void *data EINA_UNUSED)
 {
    printf("\nFishing...\n");
    ecore_main_loop_quit();
@@ -16,7 +19,7 @@ _timer1_cb(void *data)
 }
 
 static void
-on_plus_one(void *data, const Eldbus_Message *msg, Eldbus_Pending *pending)
+on_plus_one(void *data EINA_UNUSED, const Eldbus_Message *msg, Eldbus_Pending *pending EINA_UNUSED)
 {
    int num2 = 0;
 
@@ -35,7 +38,7 @@ on_plus_one(void *data, const Eldbus_Message *msg, Eldbus_Pending *pending)
 }
 
 static void
-set_property_resp2(void *data, const Eldbus_Message *msg, Eldbus_Pending *pending)
+set_property_resp2(void *data EINA_UNUSED, const Eldbus_Message *msg, Eldbus_Pending *pending EINA_UNUSED)
 {
    const char *errname;
    const char *errmsg;
@@ -49,7 +52,7 @@ set_property_resp2(void *data, const Eldbus_Message *msg, Eldbus_Pending *pendin
 }
 
 static void
-get_property_resp2(void *data, const Eldbus_Message *msg, Eldbus_Pending *pending)
+get_property_resp2(void *data, const Eldbus_Message *msg, Eldbus_Pending *pending EINA_UNUSED)
 {
    Eldbus_Proxy *proxy = data;
    Eldbus_Message_Iter *variant = NULL;
@@ -94,7 +97,7 @@ get_property_resp2(void *data, const Eldbus_Message *msg, Eldbus_Pending *pendin
 }
 
 static void
-on_send_array_int(void *data, const Eldbus_Message *msg, Eldbus_Pending *pending)
+on_send_array_int(void *data EINA_UNUSED, const Eldbus_Message *msg, Eldbus_Pending *pending EINA_UNUSED)
 {
    Eldbus_Message_Iter *array = NULL;
    int num;
@@ -118,7 +121,7 @@ on_send_array_int(void *data, const Eldbus_Message *msg, Eldbus_Pending *pending
 }
 
 static void
-on_send_array(void *data, const Eldbus_Message *msg, Eldbus_Pending *pending)
+on_send_array(void *data EINA_UNUSED, const Eldbus_Message *msg, Eldbus_Pending *pending EINA_UNUSED)
 {
    Eldbus_Message_Iter *array = NULL;
    char *txt = NULL;
@@ -149,7 +152,7 @@ on_send_array(void *data, const Eldbus_Message *msg, Eldbus_Pending *pending)
 }
 
 static void
-on_receive_array_with_size(void *data, const Eldbus_Message *msg, Eldbus_Pending *pending)
+on_receive_array_with_size(void *data EINA_UNUSED, const Eldbus_Message *msg, Eldbus_Pending *pending EINA_UNUSED)
 {
    const char *errname;
    const char *errmsg;
@@ -162,13 +165,13 @@ on_receive_array_with_size(void *data, const Eldbus_Message *msg, Eldbus_Pending
 }
 
 static void
-on_send_variant(void *data, const Eldbus_Message *msg, Eldbus_Pending *pending)
+on_send_variant(void *data EINA_UNUSED, const Eldbus_Message *msg EINA_UNUSED, Eldbus_Pending *pending EINA_UNUSED)
 {
    printf("on_send_variant()\n\n");
 }
 
 static void
-on_receive_array(void *data, const Eldbus_Message *msg, Eldbus_Pending *pending)
+on_receive_array(void *data EINA_UNUSED, const Eldbus_Message *msg, Eldbus_Pending *pending EINA_UNUSED)
 {
    const char *errname;
    const char *errmsg;
@@ -211,7 +214,6 @@ main(void)
    eldbus_message_iter_container_close(iter, array_of_string);
    pending = eldbus_proxy_send(test2_proxy, msg, on_receive_array, NULL, -1);
    if (!pending) printf("Error in eldbus_proxy_send()\n\n");
-   eldbus_message_unref(msg);
 
    msg = eldbus_proxy_method_call_new(test2_proxy, "ReceiveArrayOfStringIntWithSize");
    iter = eldbus_message_iter_get(msg);
@@ -226,7 +228,6 @@ main(void)
      }
    eldbus_message_iter_container_close(iter, array_of_string);
    pending = eldbus_proxy_send(test2_proxy, msg, on_receive_array_with_size, NULL, -1);
-   eldbus_message_unref(msg);
 
    msg = eldbus_proxy_method_call_new(test2_proxy, "SendVariantData");
    iter = eldbus_message_iter_get(msg);
@@ -234,7 +235,6 @@ main(void)
    eldbus_message_iter_basic_append(variant, 's', "test");
    eldbus_message_iter_container_close(iter, variant);
    pending = eldbus_proxy_send(test2_proxy, msg, on_send_variant, NULL, -1);
-   eldbus_message_unref(msg);
 
    msg = eldbus_proxy_method_call_new(test2_proxy, "DoubleContainner");
    iter = eldbus_message_iter_get(msg);
@@ -260,7 +260,6 @@ main(void)
      }
    eldbus_message_iter_container_close(iter, array_itr);
    eldbus_proxy_send(test2_proxy, msg, NULL, NULL, -1);
-   eldbus_message_unref(msg);
 
    pending = eldbus_proxy_call(test2_proxy, "SendArrayInt", on_send_array_int, NULL,
                                  -1 , "");

diff --git a/src/examples/connman-list-services.c b/src/examples/connman-list-services.c
index aabcb8f..2e98097 100644 (file)
--- a/src/examples/connman-list-services.c
+++ b/src/examples/connman-list-services.c
@@ -1,8 +1,11 @@
+//Compile with:
+// gcc -o connman-list-services connman-list-services.c `pkg-config --cflags --libs eldbus ecore`
+
 #include "Eldbus.h"
 #include <Ecore.h>
 
 static void
-on_services_get(void *data, const Eldbus_Message *msg, Eldbus_Pending *pending)
+on_services_get(void *data EINA_UNUSED, const Eldbus_Message *msg, Eldbus_Pending *pending EINA_UNUSED)
 {
    Eldbus_Message_Iter *array, *entry;
    const char *errname, *errmsg;

diff --git a/src/examples/ofono-dial.c b/src/examples/ofono-dial.c
index 9fc68c4..a672102 100644 (file)
--- a/src/examples/ofono-dial.c
+++ b/src/examples/ofono-dial.c
@@ -1,8 +1,11 @@
+//Compile with:
+// gcc -o ofono-dial ofono-dial.c `pkg-config --cflags --libs eldbus ecore`
+
 #include "Eldbus.h"
 #include <Ecore.h>
 
 static void
-on_dial(void *data, const Eldbus_Message *msg, Eldbus_Pending *pending)
+on_dial(void *data EINA_UNUSED, const Eldbus_Message *msg, Eldbus_Pending *pending EINA_UNUSED)
 {
    const char *errname, *errmsg;
    const char *call_path;

diff --git a/src/examples/server.c b/src/examples/server.c
index 3190ab7..532ce42 100644 (file)
--- a/src/examples/server.c
+++ b/src/examples/server.c
@@ -1,3 +1,6 @@
+//Compile with:
+// gcc -o server server.c `pkg-config --cflags --libs eldbus ecore`
+
 #include "Eldbus.h"
 #include <Ecore.h>
 
@@ -9,7 +12,7 @@
 static Eldbus_Connection *conn;
 
 static Eldbus_Message *
-_hello(const Eldbus_Service_Interface *iface, const Eldbus_Message *message)
+_hello(const Eldbus_Service_Interface *iface EINA_UNUSED, const Eldbus_Message *message)
 {
    Eldbus_Message *reply = eldbus_message_method_return_new(message);
    eldbus_message_arguments_append(reply, "s", "Hello World");
@@ -18,7 +21,7 @@ _hello(const Eldbus_Service_Interface *iface, const Eldbus_Message *message)
 }
 
 static Eldbus_Message *
-_quit(const Eldbus_Service_Interface *iface, const Eldbus_Message *message)
+_quit(const Eldbus_Service_Interface *iface EINA_UNUSED, const Eldbus_Message *message)
 {
    printf("Quit\n");
    ecore_main_loop_quit();
@@ -48,7 +51,7 @@ send_signal_hello(void *data)
 }
 
 static Eldbus_Message *
-_send_bool(const Eldbus_Service_Interface *iface, const Eldbus_Message *msg)
+_send_bool(const Eldbus_Service_Interface *iface EINA_UNUSED, const Eldbus_Message *msg)
 {
    Eldbus_Message *reply = eldbus_message_method_return_new(msg);
    Eina_Bool bool;
@@ -59,7 +62,7 @@ _send_bool(const Eldbus_Service_Interface *iface, const Eldbus_Message *msg)
 }
 
 static Eldbus_Message *
-_send_byte(const Eldbus_Service_Interface *iface, const Eldbus_Message *msg)
+_send_byte(const Eldbus_Service_Interface *iface EINA_UNUSED, const Eldbus_Message *msg)
 {
    Eldbus_Message *reply = eldbus_message_method_return_new(msg);
    unsigned char byte;
@@ -70,7 +73,7 @@ _send_byte(const Eldbus_Service_Interface *iface, const Eldbus_Message *msg)
 }
 
 static Eldbus_Message *
-_send_uint32(const Eldbus_Service_Interface *iface, const Eldbus_Message *msg)
+_send_uint32(const Eldbus_Service_Interface *iface EINA_UNUSED, const Eldbus_Message *msg)
 {
    Eldbus_Message *reply = eldbus_message_method_return_new(msg);
    unsigned int uint32;
@@ -81,7 +84,7 @@ _send_uint32(const Eldbus_Service_Interface *iface, const Eldbus_Message *msg)
 }
 
 static Eldbus_Message *
-_send_int32(const Eldbus_Service_Interface *iface, const Eldbus_Message *msg)
+_send_int32(const Eldbus_Service_Interface *iface EINA_UNUSED, const Eldbus_Message *msg)
 {
    Eldbus_Message *reply = eldbus_message_method_return_new(msg);
    int int32;
@@ -92,7 +95,7 @@ _send_int32(const Eldbus_Service_Interface *iface, const Eldbus_Message *msg)
 }
 
 static Eldbus_Message *
-_send_int16(const Eldbus_Service_Interface *iface, const Eldbus_Message *msg)
+_send_int16(const Eldbus_Service_Interface *iface EINA_UNUSED, const Eldbus_Message *msg)
 {
    Eldbus_Message *reply = eldbus_message_method_return_new(msg);
    short int int16;
@@ -103,7 +106,7 @@ _send_int16(const Eldbus_Service_Interface *iface, const Eldbus_Message *msg)
 }
 
 static Eldbus_Message *
-_send_double(const Eldbus_Service_Interface *iface, const Eldbus_Message *msg)
+_send_double(const Eldbus_Service_Interface *iface EINA_UNUSED, const Eldbus_Message *msg)
 {
    Eldbus_Message *reply = eldbus_message_method_return_new(msg);
    double d;
@@ -114,7 +117,7 @@ _send_double(const Eldbus_Service_Interface *iface, const Eldbus_Message *msg)
 }
 
 static Eldbus_Message *
-_send_string(const Eldbus_Service_Interface *iface, const Eldbus_Message *msg)
+_send_string(const Eldbus_Service_Interface *iface EINA_UNUSED, const Eldbus_Message *msg)
 {
    Eldbus_Message *reply = eldbus_message_method_return_new(msg);
    const char *txt;
@@ -130,12 +133,11 @@ _resp_async(void *data)
    Eldbus_Message *msg = data;
    eldbus_message_arguments_append(msg, "s", "Async test ok");
    eldbus_connection_send(conn, msg, NULL, NULL, -1);
-   eldbus_message_unref(msg);
    return ECORE_CALLBACK_CANCEL;
 }
 
 static Eldbus_Message *
-_async_test(const Eldbus_Service_Interface *iface, const Eldbus_Message *msg)
+_async_test(const Eldbus_Service_Interface *iface EINA_UNUSED, const Eldbus_Message *msg)
 {
    Eldbus_Message *reply = eldbus_message_method_return_new(msg);
    printf("Received a call to AsyncTest.\n");
@@ -191,7 +193,7 @@ static const Eldbus_Service_Interface_Desc iface_desc = {
 };
 
 static void
-on_name_request(void *data, const Eldbus_Message *msg, Eldbus_Pending *pending)
+on_name_request(void *data, const Eldbus_Message *msg, Eldbus_Pending *pending EINA_UNUSED)
 {
    Eldbus_Service_Interface *iface;
    unsigned int reply;

diff --git a/src/examples/simple-signal-emit.c b/src/examples/simple-signal-emit.c
index 6f2ca55..8b0bf89 100644 (file)
--- a/src/examples/simple-signal-emit.c
+++ b/src/examples/simple-signal-emit.c
@@ -1,3 +1,6 @@
+//Compile with:
+// gcc -o simple-signal-emit simple-signal-emit.c `pkg-config --cflags --libs eldbus`
+
 #include <Eldbus.h>
 
 enum {