commit 36eb1e52265f2c765d0f0c56914841a1e2f54fe5
author Brad Bishop <bradleyb@fuzziesquirrel.com> Tue Nov 01 15:18:36 2016 -0400
committer Brad Bishop <bradleyb@fuzziesquirrel.com> Wed Nov 02 14:42:27 2016 -0400
tree f7866265d0aebbded96ee27c39e9dfd17d8551ee
parent 4b3c0558ea428d0cf65f205dd243b97d44ab6e63

Use config.h defines for path, bus, and interface

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

libmapper/mapper.c

diff --git a/libmapper/mapper.c b/libmapper/mapper.c
index b1aec6b..74326ea 100644
--- a/libmapper/mapper.c
+++ b/libmapper/mapper.c
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+#include "config.h"
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
@@ -128,9 +129,9 @@
 	r = sd_bus_call_method_async(
 			wait->conn,
 			NULL,
-			"org.openbmc.ObjectMapper",
-			"/org/openbmc/ObjectMapper",
-			"org.openbmc.ObjectMapper",
+			MAPPER_BUSNAME,
+			MAPPER_PATH,
+			MAPPER_INTERFACE,
 			"GetObject",
 			async_wait_getobject_callback,
 			data,
@@ -220,9 +221,9 @@
 		r = sd_bus_call_method_async(
 				wait->conn,
 				NULL,
-				"org.openbmc.ObjectMapper",
-				"/org/openbmc/ObjectMapper",
-				"org.openbmc.ObjectMapper",
+				MAPPER_BUSNAME,
+				MAPPER_PATH,
+				MAPPER_INTERFACE,
 				"GetObject",
 				async_wait_getobject_callback,
 				data,
@@ -410,9 +411,9 @@
 	r = sd_bus_message_new_method_call(
 			conn,
 			&request,
-			"org.openbmc.ObjectMapper",
-			"/org/openbmc/ObjectMapper",
-			"org.openbmc.ObjectMapper",
+			MAPPER_BUSNAME,
+			MAPPER_PATH,
+			MAPPER_INTERFACE,
 			"GetObject");
 	if (r < 0)
 		goto exit;