Revert "Add mapper-wait-until-removed"
This reverts commit 9f4c3c7c408a5f84a52416da99d0dd8035f1ae5a.
After further design discussions, the new wait until
removed implementation should be a new API. Reverting this
change to put back the original wait interfaces since new
ones will be created instead of modifying the existing ones.
Change-Id: I605439dcb24c6dca7f394325afc6587eacf417f1
Signed-off-by: Adriana Kobylak <anoo@us.ibm.com>
diff --git a/libmapper/app.c b/libmapper/app.c
index aa42461..7efc08c 100644
--- a/libmapper/app.c
+++ b/libmapper/app.c
@@ -119,10 +119,7 @@
goto finish;
}
- if (!strcmp(argv[1], "wait"))
- r = mapper_wait_async(conn, loop, argv+2, quit, loop, &wait, true);
- else if (!strcmp(argv[1], "wait-until-removed"))
- r = mapper_wait_async(conn, loop, argv+2, quit, loop, &wait, false);
+ r = mapper_wait_async(conn, loop, argv+2, quit, loop, &wait);
if(r < 0) {
fprintf(stderr, "Error configuring waitlist: %s\n",
strerror(-r));
@@ -181,8 +178,6 @@
"\nCOMMANDS:\n"
" call invoke the specified method\n"
" wait wait for the specified objects to appear on the DBus\n"
- " wait-until-removed"
- " wait until the specified objects are not present in the DBus\n"
" get-service return the service identifier for input path\n";
if(argc < 2) {
@@ -192,8 +187,7 @@
if(!strcmp(argv[1], "call"))
call_main(argc, argv);
- if(!strcmp(argv[1], "wait") ||
- !strcmp(argv[1], "wait-until-removed"))
+ if(!strcmp(argv[1], "wait"))
wait_main(argc, argv);
if(!strcmp(argv[1], "get-service"))
get_service_main(argc, argv);