Changeset 3617286

Timestamp:

Dec 30, 2007, 8:53:07 PM (17 years ago)

Author:

Alex Vandiver <alexmv@mit.edu>

Branches:

master, barnowl_perlaim, debian, release-1.10, release-1.4, release-1.5, release-1.6, release-1.7, release-1.8, release-1.9

Children:

b38b0b2, 61abb18

Parents:

9aba27b

git-author:

Alex Vandiver <alexmv@mit.edu> (12/30/07 20:52:12)

git-committer:

Alex Vandiver <alexmv@mit.edu> (12/30/07 20:53:07)

Message:

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.

Files:

• commands.c (modified) (2 diffs)
• functions.c (modified) (2 diffs)

commands.c

@@ -1768 +1768 @@
   char *recip="";
   int temp=0;
+  int ret=0;
   
   if (argc<3) {
@@ -1797 +1798 @@
   }
 
-  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);
   }

functions.c

@@ -1338 +1338 @@
 }
 
-void owl_function_subscribe(char *class, char *inst, char *recip)
+int owl_function_subscribe(char *class, char *inst, char *recip)
 {
   int ret;
@@ -1348 +1348 @@
     owl_function_makemsg("Subscribed.");
   }
+  return(ret);
 }