Changeset 990772c

Timestamp:

Nov 17, 2013, 3:44:13 AM (10 years ago)

Author:

Anders Kaseorg <andersk@mit.edu>

Branches:

release-1.9

Children:

14515f6

Parents:

1cefe5f

git-author:

David Benjamin <davidben@mit.edu> (01/10/13 14:29:33)

git-committer:

Anders Kaseorg <andersk@mit.edu> (11/17/13 03:44:13)

Message:

Make :loadsubs reload instanced personals too

Right now if your subs get lost because something falls over, you have
to manually sub to instanced personals to get them back. :loadsubs
doesn't work.

(Supposedly that code is for "backwards compatibility", but... it dates
back to kretch. Probably because it's odd that :loadsubs [file] will
also automatically load the default subs. But given that everyone runs
:loadsubs with no argument to mean "oops zephyr fell over reload my subs
please", I'm okay with adding more code to the "backwards compatibility"
path. I doubt anyone actually runs :loadsubs with an argument anyway.)

Also, while I'm here, get rid of that 'foo' variable. (Really? Really?!
foo?!?)

(cherry picked from commit 05adccf169f26130f56cd69a12829a9d80043a75)

File:

• functions.c (modified) (3 diffs)

functions.c

@@ -871 +871 @@
 void owl_function_loadsubs(const char *file)
 {
-  int ret, ret2;
-  const char *foo;
+  int ret, ret2, ret3;
   char *path;
 
@@ -884 +883 @@
 
   /* for backwards compatibility for now */
-  ret2=owl_zephyr_loaddefaultsubs();
+  ret2 = owl_zephyr_loaddefaultsubs();
+  ret3 = owl_zephyr_loadbarnowldefaultsubs();
 
   if (!owl_context_is_interactive(owl_global_get_context(&g))) return;
 
-  foo=file?file:"file";
-  if (ret==0 && ret2==0) {
+  if (ret == 0 && ret2 == 0 && ret3 == 0) {
     if (!file) {
       owl_function_makemsg("Subscribed to messages.");
@@ -895 +894 @@
       owl_function_makemsg("Subscribed to messages from %s", file);
     }
-  } else if (ret==-1) {
-    owl_function_error("Could not read %s", foo);
-  } else {
+  } else if (ret == -1) {
+    owl_function_error("Could not read %s", file ? file : "file");
+  } else if (ret2 == -1) {
     owl_function_error("Error subscribing to messages");
+  } else {
+    owl_function_error("Error subscribing to instanced personals");
   }
 }