Changeset 05adccf for functions.c
- Timestamp:
- Jan 13, 2013, 9:09:41 AM (12 years ago)
- Branches:
- master, release-1.10
- Children:
- 946bc37, 35a9ec7
- Parents:
- c068c03
- git-author:
- David Benjamin <davidben@mit.edu> (01/10/13 14:29:33)
- git-committer:
- David Benjamin <davidben@mit.edu> (01/13/13 09:09:41)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
functions.c
r06470d7 r05adccf 871 871 void owl_function_loadsubs(const char *file) 872 872 { 873 int ret, ret2; 874 const char *foo; 873 int ret, ret2, ret3; 875 874 char *path; 876 875 … … 884 883 885 884 /* for backwards compatibility for now */ 886 ret2=owl_zephyr_loaddefaultsubs(); 885 ret2 = owl_zephyr_loaddefaultsubs(); 886 ret3 = owl_zephyr_loadbarnowldefaultsubs(); 887 887 888 888 if (!owl_context_is_interactive(owl_global_get_context(&g))) return; 889 889 890 foo=file?file:"file"; 891 if (ret==0 && ret2==0) { 890 if (ret == 0 && ret2 == 0 && ret3 == 0) { 892 891 if (!file) { 893 892 owl_function_makemsg("Subscribed to messages."); … … 895 894 owl_function_makemsg("Subscribed to messages from %s", file); 896 895 } 897 } else if (ret ==-1) {898 owl_function_error("Could not read %s", f oo);899 } else {896 } else if (ret == -1) { 897 owl_function_error("Could not read %s", file ? file : "file"); 898 } else if (ret2 == -1) { 900 899 owl_function_error("Error subscribing to messages"); 900 } else { 901 owl_function_error("Error subscribing to instanced personals"); 901 902 } 902 903 }
Note: See TracChangeset
for help on using the changeset viewer.