Changeset 836ea3a3

Timestamp:

Oct 17, 2003, 5:20:48 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:

6a50af2

Parents:

ec6ff52

Message:

Converted more error messages to use the error queue

Files:

• ChangeLog (modified) (1 diff)
• aim.c (modified) (2 diffs)
• logging.c (modified) (6 diffs)
• util.c (modified) (3 diffs)
• variable.c (modified) (1 diff)
• zwrite.c (modified) (2 diffs)

ChangeLog

@@ -1 +1 @@
 $Id$
 
+2.0.9-pre-1
+        Added errqueue.
+        Added command "show errors".
+        
 2.0.8
         Increased size of screen name field in buddy listing

aim.c

@@ -225 +225 @@
 {
   if (message) {
-    owl_function_makemsg(message);
+    owl_function_error(message);
   } else {
-    owl_function_makemsg("Authentication error on login");
+    owl_function_error("Authentication error on login");
   }
   owl_function_beep();
@@ -1596 +1596 @@
   
   /* printf("snac threw error (reason 0x%04x: %s)\n", reason, (reason<msgerrreasonslen)?msgerrreasons[reason]:"unknown"); */
-  owl_function_makemsg(msgerrreasons[reason]);
   
   return 1;

logging.c

@@ -28 +28 @@
   file=fopen(filename, "a");
   if (!file) {
-    owl_function_makemsg("Unable to open file for outgoing logging");
+    owl_function_error("Unable to open file for outgoing logging");
     owl_free(logpath);
     return;
@@ -42 +42 @@
   file=fopen(filename, "a");
   if (!file) {
-    owl_function_makemsg("Unable to open file for outgoing logging");
+    owl_function_error("Unable to open file for outgoing logging");
     return;
   }
@@ -68 +68 @@
   file=fopen(filename, "a");
   if (!file) {
-    owl_function_makemsg("Unable to open file for outgoing logging");
+    owl_function_error("Unable to open file for outgoing logging");
     owl_free(logpath);
     return;
@@ -82 +82 @@
   file=fopen(filename, "a");
   if (!file) {
-    owl_function_makemsg("Unable to open file for outgoing logging");
+    owl_function_error("Unable to open file for outgoing logging");
     return;
   }
@@ -179 +179 @@
   file=fopen(filename, "a");
   if (!file) {
-    owl_function_makemsg("Unable to open file for incoming logging");
+    owl_function_error("Unable to open file for incoming logging");
     return;
   }
@@ -187 +187 @@
     allfile=fopen(allfilename, "a");
     if (!allfile) {
-      owl_function_makemsg("Unable to open file for incoming logging");
+      owl_function_error("Unable to open file for incoming logging");
       fclose(file);
       return;

util.c

@@ -726 +726 @@
   file=fopen(filename, "r");
   if (!file) {
-    owl_function_makemsg("Error opening file %s", filename);
+    owl_function_error("Error opening file %s", filename);
     return;
   }
@@ -735 +735 @@
     backupfile=fopen(backupfilename, "w");
     if (!backupfile) {
-      owl_function_makemsg("Error opening file %s for writing", backupfilename);
+      owl_function_error("Error opening file %s for writing", backupfilename);
       owl_free(backupfilename);
       return;
@@ -773 +773 @@
   file=fopen(filename, "w");
   if (!file) {
-    owl_function_makemsg("WARNING: Error opening %s for writing.  Use %s to restore.", filename, backupfilename);
+    owl_function_error("WARNING: Error opening %s for writing.  Use %s to restore.", filename, backupfilename);
     owl_function_beep();
     owl_free(line);

variable.c

@@ -477 +477 @@
   v = owl_dict_find_element(d, name);
   if (v == NULL) {
-    if (msg) owl_function_makemsg("Unknown variable %s", name);
+    if (msg) owl_function_error("Unknown variable %s", name);
     return -1;
   }
   if (!v->set_fromstring_fn) {
-    if (msg) owl_function_makemsg("Variable %s is read-only", name);
+    if (msg) owl_function_error("Variable %s is read-only", name);
     return -1;   
   }
   if (requirebool && v->type!=OWL_VARIABLE_BOOL) {
-    if (msg) owl_function_makemsg("Variable %s is not a boolean", name);
+    if (msg) owl_function_error("Variable %s is not a boolean", name);
     return -1;   
   }
   if (0 != v->set_fromstring_fn(v, value)) {
-    if (msg) owl_function_makemsg("Unable to set %s (must be %s)", name, 
+    if (msg) owl_function_error("Unable to set %s (must be %s)", name, 
                                   owl_variable_get_validsettings(v));
     return -1;

zwrite.c

@@ -30 +30 @@
   argv=myargv=owl_parseline(line, &argc);
   if (argc<0) {
-    owl_function_makemsg("Unbalanced quotes");
+    owl_function_error("Unbalanced quotes in zwrite");
     return(-1);
   }
@@ -135 +135 @@
       !strcasecmp(z->inst, "personal") &&
       owl_list_get_size(&(z->recips))==0) {
-    owl_function_makemsg("You must specify a recipient");
+    owl_function_error("You must specify a recipient for zwrite");
     return(-1);
   }