Changeset ec6ff52 for zephyr.c

Timestamp:

Oct 17, 2003, 5:16:25 PM (21 years ago)

Author:

James M. Kretchmar <kretch@mit.edu>

Branches:

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

Children:

836ea3a3

Parents:

a053de8

Message:

Added the 'show errors' command
Added the error queue
Converted most makemsg's to error instead
Started writing an internal VT style (far from done)

File:

• zephyr.c (modified) (8 diffs)

zephyr.c

@@ -381 +381 @@
   ZFreeNotice(&notice);
   if (ret!=ZERR_NONE) {
-    owl_function_makemsg("Error sending zephyr");
+    owl_function_error("Error sending zephyr");
     return(ret);
   }
@@ -413 +413 @@
 
   if (retnotice->z_kind == SERVNAK) {
-    owl_function_makemsg("Authorization failure sending zephyr");
+    owl_function_error("Authorization failure sending zephyr");
   } else if ((retnotice->z_kind != SERVACK) || !retnotice->z_message_len) {
-    owl_function_makemsg("Detected server failure while receiving acknowledgement");
+    owl_function_error("Detected server failure while receiving acknowledgement");
   } else if (!strcmp(retnotice->z_message, ZSRVACK_SENT)) {
     if (!strcasecmp(retnotice->z_opcode, "ping")) {
@@ -422 +422 @@
                !strcasecmp(retnotice->z_class_inst, "personal")) {
       tmp=short_zuser(retnotice->z_recipient);
-      owl_function_makemsg("Message sent to %s.", tmp);
+      owl_function_error("Message sent to %s.", tmp);
       free(tmp);
     } else {
-      owl_function_makemsg("Message sent to -c %s -i %s\n", retnotice->z_class, retnotice->z_class_inst);
+      owl_function_error("Message sent to -c %s -i %s\n", retnotice->z_class, retnotice->z_class_inst);
     }
   } else if (!strcmp(retnotice->z_message, ZSRVACK_NOTSENT)) {
     if (strcasecmp(retnotice->z_class, "message")) {
-      owl_function_makemsg("Not logged in or not subscribing to class %s, instance %s",
+      owl_function_error("Not logged in or not subscribing to class %s, instance %s",
                            retnotice->z_class, retnotice->z_class_inst);
     } else {
       tmp = short_zuser(retnotice->z_recipient);
-      owl_function_makemsg("%s: Not logged in or subscribing to messages.", 
+      owl_function_error("%s: Not logged in or subscribing to messages.", 
                            tmp);
       owl_free(tmp);
     }
   } else {
-    owl_function_makemsg("Internal error on ack (%s)", retnotice->z_message);
+    owl_function_error("Internal error on ack (%s)", retnotice->z_message);
   }
 }
@@ -532 +532 @@
   ret=ZLocateUser(user,&numlocs,auth?ZAUTH:ZNOAUTH);
   if (ret != ZERR_NONE) {
-    owl_function_makemsg("Error locating user");
+    owl_function_error("Error locating user %s", user);
   }
 
@@ -568 +568 @@
   file=fopen(subsfile, "r");
   if (!file) {
-    owl_function_makemsg("Error opening file %s", subsfile);
+    owl_function_error("Error opening file %s", subsfile);
     owl_free(line);
     return;
@@ -574 +574 @@
   while (fgets(buff, LINE, file)!=NULL) {
     if (!strcasecmp(buff, line)) {
-      owl_function_makemsg("Subscription already present in %s", subsfile);
+      owl_function_error("Subscription already present in %s", subsfile);
       owl_free(line);
       return;
@@ -584 +584 @@
   file=fopen(subsfile, "a");
   if (!file) {
-    owl_function_makemsg("Error opening file %s for writing", subsfile);
+    owl_function_error("Error opening file %s for writing", subsfile);
     owl_free(line);
     return;
@@ -691 +691 @@
   owl_free(filename);
   if (!file) {
-    owl_function_makemsg("Error opening zephyr buddy file for append");
+    owl_function_error("Error opening zephyr buddy file for append");
     return;
   }