Changes in zephyr.c [e440602:c79a047]

File:

• zephyr.c (modified) (13 diffs)

zephyr.c

@@ -15 +15 @@
 } owl_sub_list;
 
-Code_t ZResetAuthentication();
+Code_t ZResetAuthentication(void);
 #endif
 
@@ -21 +21 @@
 
 #ifdef HAVE_LIBZEPHYR
-void owl_zephyr_initialize()
+void owl_zephyr_initialize(void)
 {
   int ret;
@@ -127 +127 @@
 }
 
-void owl_zephyr_load_initial_subs() {
+void owl_zephyr_load_initial_subs(void) {
   int ret_sd, ret_bd, ret_u;
 
@@ -154 +154 @@
 }
 #else
-void owl_zephyr_initialize()
-{
-}
-#endif
-
-
-int owl_zephyr_shutdown()
+void owl_zephyr_initialize(void)
+{
+}
+#endif
+
+
+int owl_zephyr_shutdown(void)
 {
 #ifdef HAVE_LIBZEPHYR
@@ -171 +171 @@
 }
 
-int owl_zephyr_zpending()
+int owl_zephyr_zpending(void)
 {
 #ifdef HAVE_LIBZEPHYR
@@ -183 +183 @@
 }
 
-const char *owl_zephyr_get_realm()
+const char *owl_zephyr_get_realm(void)
 {
 #ifdef HAVE_LIBZEPHYR
@@ -192 +192 @@
 }
 
-const char *owl_zephyr_get_sender()
+const char *owl_zephyr_get_sender(void)
 {
 #ifdef HAVE_LIBZEPHYR
@@ -316 +316 @@
  * Return -2 if there is a failure from zephyr to load the subscriptions.
  */
-int owl_zephyr_loadbarnowldefaultsubs()
+int owl_zephyr_loadbarnowldefaultsubs(void)
 {
 #ifdef HAVE_LIBZEPHYR
@@ -340 +340 @@
 }
 
-int owl_zephyr_loaddefaultsubs()
+int owl_zephyr_loaddefaultsubs(void)
 {
 #ifdef HAVE_LIBZEPHYR
@@ -415 +415 @@
 }
 
-void unsuball()
+void unsuball(void)
 {
 #if HAVE_LIBZEPHYR
@@ -993 +993 @@
 #ifdef HAVE_LIBZEPHYR
   char *line, *subsfile;
+  int linesdeleted;
   
   line=owl_zephyr_makesubline(class, inst, recip);
@@ -1003 +1004 @@
   }
   
-  owl_util_file_deleteline(subsfile, line, 1);
+  linesdeleted = owl_util_file_deleteline(subsfile, line, 1);
+  if (linesdeleted > 0) {
+    owl_function_makemsg("Subscription removed");
+  } else {
+    owl_function_error("No subscription present in %s", subsfile);
+  }
   owl_free(subsfile);
   owl_free(line);
-  owl_function_makemsg("Subscription removed");
 #endif
 }
@@ -1119 +1124 @@
  * free the return.
  */
-char *owl_zephyr_getsubs()
+char *owl_zephyr_getsubs(void)
 {
 #ifdef HAVE_LIBZEPHYR