commit a02cd54c61e19df89ac13623fbee595b740cf0c0
author Brad Bishop <bradleyb@fuzziesquirrel.com> Tue Oct 12 19:12:42 2021 -0400
committer Brad Bishop <bradleyb@fuzziesquirrel.com> Tue Oct 12 19:12:42 2021 -0400
tree 97f69965cae71127cf2165b3d95c367c7fa4e676
parent bedd41655ed9641a9f6c47079e811797869ad8f3

meson.build: drop config.h

These DBus things (service, interface, path) are not intended to be
configurable in any way.  Try to discourage them from being changed by
removing them from meson.build just in case that suggests that perhaps
they are meant to be overriden.

As the DBus names are the only content in config.h, config.h can be
removed completely.

Change-Id: I654473333932a8626a0ace5ee5a865dd14aaf296
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>

libmapper/mapper.c

diff --git a/libmapper/mapper.c b/libmapper/mapper.c
index 3c43eb9..4a38790 100644
--- a/libmapper/mapper.c
+++ b/libmapper/mapper.c
@@ -13,8 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include "config.h"
-
 #include "mapper.h"
 
 #include <errno.h>
@@ -160,10 +158,11 @@
     mapper_async_wait* wait = data->wait;
 
     sd_event_source_unref(data->event_source);
-    r = sd_bus_call_method_async(wait->conn, NULL, MAPPER_BUSNAME, MAPPER_PATH,
-                                 MAPPER_INTERFACE, "GetObject",
-                                 async_wait_getobject_callback, data, "sas",
-                                 data->path, 0, NULL);
+    r = sd_bus_call_method_async(
+        wait->conn, NULL, "xyz.openbmc_project.ObjectMapper",
+        "/xyz/openbmc_project/object_mapper",
+        "xyz.openbmc_project.ObjectMapper", "GetObject",
+        async_wait_getobject_callback, data, "sas", data->path, 0, NULL);
     if (r < 0)
     {
         async_wait_done(r, wait);
@@ -250,10 +249,11 @@
         data->path = wait->objs[i];
         data->retry = 0;
         data->event_source = NULL;
-        r = sd_bus_call_method_async(wait->conn, NULL, MAPPER_BUSNAME,
-                                     MAPPER_PATH, MAPPER_INTERFACE, "GetObject",
-                                     async_wait_getobject_callback, data, "sas",
-                                     wait->objs[i], 0, NULL);
+        r = sd_bus_call_method_async(
+            wait->conn, NULL, "xyz.openbmc_project.ObjectMapper",
+            "/xyz/openbmc_project/object_mapper",
+            "xyz.openbmc_project.ObjectMapper", "GetObject",
+            async_wait_getobject_callback, data, "sas", wait->objs[i], 0, NULL);
         if (r < 0)
         {
             free(data);
@@ -406,9 +406,11 @@
 
     sd_event_source_unref(subtree->event_source);
     r = sd_bus_call_method_async(
-        subtree->conn, NULL, MAPPER_BUSNAME, MAPPER_PATH, MAPPER_INTERFACE,
-        "GetSubTreePaths", async_subtree_getpaths_callback, subtree, "sias",
-        subtree->namespace, 0, 1, subtree->interface);
+        subtree->conn, NULL, "xyz.openbmc_project.ObjectMapper",
+        "/xyz/openbmc_project/object_mapper",
+        "xyz.openbmc_project.ObjectMapper", "GetSubTreePaths",
+        async_subtree_getpaths_callback, subtree, "sias", subtree->namespace, 0,
+        1, subtree->interface);
     if (r < 0)
         async_subtree_done(r, subtree);
 
@@ -499,9 +501,11 @@
     subtree->retry = 0;
     subtree->event_source = NULL;
     r = sd_bus_call_method_async(
-        subtree->conn, NULL, MAPPER_BUSNAME, MAPPER_PATH, MAPPER_INTERFACE,
-        "GetSubTreePaths", async_subtree_getpaths_callback, subtree, "sias",
-        subtree->namespace, 0, 1, subtree->interface);
+        subtree->conn, NULL, "xyz.openbmc_project.ObjectMapper",
+        "/xyz/openbmc_project/object_mapper",
+        "xyz.openbmc_project.ObjectMapper", "GetSubTreePaths",
+        async_subtree_getpaths_callback, subtree, "sias", subtree->namespace, 0,
+        1, subtree->interface);
     if (r < 0)
     {
         fprintf(stderr, "Error invoking method: %s\n", strerror(-r));
@@ -602,9 +606,10 @@
     sd_bus_message* request = NULL;
     int r, retry = 0;
 
-    r = sd_bus_message_new_method_call(conn, &request, MAPPER_BUSNAME,
-                                       MAPPER_PATH, MAPPER_INTERFACE,
-                                       "GetObject");
+    r = sd_bus_message_new_method_call(
+        conn, &request, "xyz.openbmc_project.ObjectMapper",
+        "/xyz/openbmc_project/object_mapper",
+        "xyz.openbmc_project.ObjectMapper", "GetObject");
     if (r < 0)
         goto exit;