Changeset 6c91e6e

Timestamp:

2008-02-15T00:45:21Z (16 years ago)

Author:

Sven Moritz Hallberg <sm@…>

Branches:

master

Children:

522a00f

Parents:

f3597a1

Message:

otr_load error handling + stonedcoder copyright notice

Files:

• otr.c (modified) (4 diffs)
• otr.h (modified) (1 diff)

otr.c

@@ -7 +7 @@
 /*
   OTR support (cf. http://www.cypherpunks.ca/otr/)
+  
   2008, Sven Moritz Hallberg <pesco@khjk.org>
+  (c) and funded by stonedcoder.org
     
   files used to store OTR data:
@@ -215 +217 @@
         account_t *a;
         gcry_error_t e;
+        int eno;
 
         log_message(LOGLVL_DEBUG, "otr_load '%s'", irc->nick);
@@ -220 +223 @@
         g_snprintf(s, 511, "%s%s.otr_keys", global.conf->configdir, irc->nick);
         e = otrl_privkey_read(irc->otr_us, s);
-        if(e && e!=ENOENT) {
+        eno = gcry_error_code_to_errno(e);
+        if(e && eno!=ENOENT) {
                 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) {
+        eno = gcry_error_code_to_errno(e);
+        if(e && eno!=ENOENT) {
                 log_message(LOGLVL_ERROR, "otr load: %s: %s", s, strerror(e));
         }
@@ -1472 +1477 @@
         }
 
-    irc_usermsg(irc, "  fingerprints: (bold=active)");  
+        irc_usermsg(irc, "  fingerprints: (bold=active)");      
         show_fingerprints(irc, ctx);
 }

otr.h

@@ -7 +7 @@
 /*
   OTR support (cf. http://www.cypherpunks.ca/otr/)
+  
   2008, Sven Moritz Hallberg <pesco@khjk.org>
+  (c) and funded by stonedcoder.org
 */