Changes in functions.c [007081e:06470d7]

File:

• functions.c (modified) (3 diffs)

functions.c

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