Changeset 3c80a9d

Timestamp:

2008-02-03T22:28:13Z (17 years ago)

Author:

Sven Moritz Hallberg <sm@…>

Branches:

master

Children:

a13855a

Parents:

764c7d1

Message:

otr: check some error conditions

File:

• otr.c (modified) (5 diffs)

otr.c

@@ -164 +164 @@
         e = otrl_privkey_read(irc->otr_us, s);
         if(e && e!=ENOENT) {
-                log_message(LOGLVL_ERROR, "%s: %s", s, strerror(e));
+                log_message(LOGLVL_ERROR, "otr load: %s: %s", s, strerror(e));
         }
         g_snprintf(s, 511, "%s%s.otr_fprints", global.conf->configdir, irc->nick);
         e = otrl_privkey_read_fingerprints(irc->otr_us, s, NULL, NULL);
         if(e && e!=ENOENT) {
-                log_message(LOGLVL_ERROR, "%s: %s", s, strerror(e));
+                log_message(LOGLVL_ERROR, "otr load: %s: %s", s, strerror(e));
         }
         
@@ -181 +181 @@
 {
         char s[512];
+        gcry_error_t e;
 
         log_message(LOGLVL_DEBUG, "otr_save '%s'", irc->nick);
 
         g_snprintf(s, 511, "%s%s.otr_fprints", global.conf->configdir, irc->nick);
-        otrl_privkey_write_fingerprints(irc->otr_us, s);
+        e = otrl_privkey_write_fingerprints(irc->otr_us, s);
+        if(e) {
+                log_message(LOGLVL_ERROR, "otr save: %s: %s", s, strerror(e));
+        }
 }
 
@@ -537 +541 @@
                 u->ic->acc->user, u->ic->acc->prpl->name, 1, NULL, NULL, NULL);
         if(!ctx) {
+                /* huh? out of memory or what? */
                 return;
         }
@@ -686 +691 @@
         context = otrl_context_find(us, handle,
                 ic->acc->user, ic->acc->prpl->name, 1, NULL, NULL, NULL);
-        if(!context) return;
+        if(!context) {
+                /* huh? out of memory or what? */
+                return;
+        }
         nextMsg = context->smstate->nextExpected;
 
@@ -915 +923 @@
         if(kg->done) {
                 if(kg->result) {
-                        irc_usermsg(kg->irc, "otr keygen failed: libgcrypt error"); /* TODO: diagnostics */
+                        irc_usermsg(kg->irc, "otr keygen: %s", strerror(kg->result));
                 } else {
                         irc_usermsg(kg->irc, "otr keygen for %s/%s complete", kg->handle, kg->protocol);