[784] in BarnOwl Developers
[D-O-H] r789 - trunk/owl
daemon@ATHENA.MIT.EDU (chmrr@MIT.EDU)
Thu Oct 29 18:09:41 2009
Resent-From: nelhage@mit.edu
Resent-To: barnowl-dev-mtg@charon.mit.edu
To: dirty-owl-hackers@mit.edu
From: chmrr@MIT.EDU
Reply-To: dirty-owl-hackers@MIT.EDU
Date: Sun, 30 Dec 2007 20:53:07 -0500
Author: chmrr
Date: 2007-12-30 20:53:07 -0500 (Sun, 30 Dec 2007)
New Revision: 789
Modified:
trunk/owl/
trunk/owl/commands.c
trunk/owl/functions.c
Log:
r1823@utwig: chmrr | 2007-12-30 20:52:12 -0500
* Don't conceal subscription errors with the "ok, we added it to the
.zephyr.subs file" message, by not doing the latter if the former
fails.
Property changes on: trunk/owl
___________________________________________________________________
Name: svk:merge
- 06e3988a-d725-0410-af47-c5dd11e74598:/local/barnowl:1806
8baf6839-b125-0410-9df9-922793c80423:/local/barnowl:20981
8baf6839-b125-0410-9df9-922793c80423:/local/owl:15641
bb873fd7-8e23-0410-944a-99ec44c633eb:/local/d-o-h/branches/par:19594
fe09232e-8620-0410-8e36-e6b4839e121d:/branches/par:688
+ 06e3988a-d725-0410-af47-c5dd11e74598:/local/barnowl:1823
8baf6839-b125-0410-9df9-922793c80423:/local/barnowl:20981
8baf6839-b125-0410-9df9-922793c80423:/local/owl:15641
bb873fd7-8e23-0410-944a-99ec44c633eb:/local/d-o-h/branches/par:19594
fe09232e-8620-0410-8e36-e6b4839e121d:/branches/par:688
Modified: trunk/owl/commands.c
===================================================================
--- trunk/owl/commands.c 2007-12-29 07:55:43 UTC (rev 788)
+++ trunk/owl/commands.c 2007-12-31 01:53:07 UTC (rev 789)
@@ -1767,6 +1767,7 @@
{
char *recip="";
int temp=0;
+ int ret=0;
if (argc<3) {
owl_function_makemsg("Not enough arguments to the subscribe command");
@@ -1796,8 +1797,8 @@
recip=argv[2];
}
- owl_function_subscribe(argv[0], argv[1], recip);
- if (!temp) {
+ ret = owl_function_subscribe(argv[0], argv[1], recip);
+ if (!temp && !ret) {
owl_zephyr_addsub(NULL, argv[0], argv[1], recip);
}
return(NULL);
Modified: trunk/owl/functions.c
===================================================================
--- trunk/owl/functions.c 2007-12-29 07:55:43 UTC (rev 788)
+++ trunk/owl/functions.c 2007-12-31 01:53:07 UTC (rev 789)
@@ -1337,7 +1337,7 @@
}
}
-void owl_function_subscribe(char *class, char *inst, char *recip)
+int owl_function_subscribe(char *class, char *inst, char *recip)
{
int ret;
@@ -1347,6 +1347,7 @@
} else {
owl_function_makemsg("Subscribed.");
}
+ return(ret);
}
void owl_function_unsubscribe(char *class, char *inst, char *recip)
