CVS shishi/lib

[shishi-commit]

Update of /home/cvs/shishi/lib
In directory dopio:/tmp/cvs-serv3472/lib

Modified Files:
        aprep.c apreq.c authenticator.c cfg.c diskio.c encapreppart.c 
        error.c kdcrep.c kdcreq.c krberror.c priv.c safe.c shishi.h.in 
        tkts.c 
Log Message:
Rename SHISHI_FCLOSE_ERROR to SHISHI_IO_ERROR, and alter semantics slightly.


--- /home/cvs/shishi/lib/aprep.c        2004/10/14 20:28:13     1.41
+++ /home/cvs/shishi/lib/aprep.c        2004/12/02 02:37:59     1.42
@@ -164,7 +164,7 @@
 
   res = fclose (fh);
   if (res != 0)
-    return SHISHI_FCLOSE_ERROR;
+    return SHISHI_IO_ERROR;
 
   if (VERBOSE (handle))
     printf (_("Writing AP-REP to %s...done\n"), filename);
@@ -244,7 +244,7 @@
 
   res = fclose (fh);
   if (res != 0)
-    return SHISHI_FCLOSE_ERROR;
+    return SHISHI_IO_ERROR;
 
   if (VERBOSE (handle))
     printf (_("Reading AP-REP from %s...done\n"), filename);
--- /home/cvs/shishi/lib/apreq.c        2004/11/09 19:46:11     1.50
+++ /home/cvs/shishi/lib/apreq.c        2004/12/02 02:37:59     1.51
@@ -226,7 +226,7 @@
 
   res = fclose (fh);
   if (res != 0)
-    return SHISHI_FCLOSE_ERROR;
+    return SHISHI_IO_ERROR;
 
   if (VERBOSE (handle))
     printf (_("Writing AP-REQ to %s...done\n"), filename);
@@ -306,7 +306,7 @@
 
   res = fclose (fh);
   if (res != 0)
-    return SHISHI_FCLOSE_ERROR;
+    return SHISHI_IO_ERROR;
 
   if (VERBOSE (handle))
     printf (_("Reading AP-REQ from %s...done\n"), filename);
--- /home/cvs/shishi/lib/authenticator.c        2004/10/15 11:05:57     1.70
+++ /home/cvs/shishi/lib/authenticator.c        2004/12/02 02:37:59     1.71
@@ -210,7 +210,7 @@
 
   res = fclose (fh);
   if (res != 0)
-    return SHISHI_FCLOSE_ERROR;
+    return SHISHI_IO_ERROR;
 
   if (VERBOSE (handle))
     printf (_("Writing Authenticator to %s...done\n"), filename);
@@ -293,7 +293,7 @@
 
   res = fclose (fh);
   if (res != 0)
-    return SHISHI_FCLOSE_ERROR;
+    return SHISHI_IO_ERROR;
 
   if (VERBOSE (handle))
     printf (_("Reading Authenticator from %s...done\n"), filename);
--- /home/cvs/shishi/lib/cfg.c  2004/11/09 19:39:20     1.59
+++ /home/cvs/shishi/lib/cfg.c  2004/12/02 02:37:59     1.60
@@ -397,7 +397,7 @@
     shishi_error_printf (handle, "Error reading configuration file");
 
   if (fclose (fh) != 0)
-    return SHISHI_FCLOSE_ERROR;
+    return SHISHI_IO_ERROR;
 
   return SHISHI_OK;
 }
--- /home/cvs/shishi/lib/diskio.c       2004/12/02 02:30:46     1.43
+++ /home/cvs/shishi/lib/diskio.c       2004/12/02 02:37:59     1.44
@@ -87,24 +87,16 @@
 {
   char *der;
   size_t derlen;
-  int res;
   size_t i;
+  int res;
 
   res = shishi_asn1_to_der_field (handle, asn1, asn1type, &der, &derlen);
   if (res != SHISHI_OK)
-    {
-      shishi_error_printf (handle, "Could not DER encode %s: %s\n",
-                          asn1type, shishi_strerror (res));
-      return SHISHI_ASN1_ERROR;
-    }
+    return res;
 
   i = fwrite (der, sizeof (der[0]), derlen, fh);
   if (i != derlen)
-    {
-      shishi_error_printf (handle, "Short write to file (wrote %d of %d)\n",
-                          i, derlen);
-      return !SHISHI_OK;
-    }
+    return SHISHI_IO_ERROR;
 
   return SHISHI_OK;
 }
@@ -974,7 +966,7 @@
 
   res = fclose (fh);
   if (res != 0)
-    return SHISHI_FCLOSE_ERROR;
+    return SHISHI_IO_ERROR;
 
   if (VERBOSE (handle))
     printf (_("Writing KEY to %s...done\n"), filename);
--- /home/cvs/shishi/lib/encapreppart.c 2004/09/10 10:00:00     1.39
+++ /home/cvs/shishi/lib/encapreppart.c 2004/12/02 02:37:59     1.40
@@ -168,7 +168,7 @@
 
   res = fclose (fh);
   if (res != 0)
-    return SHISHI_FCLOSE_ERROR;
+    return SHISHI_IO_ERROR;
 
   if (VERBOSE (handle))
     printf (_("Writing EncAPRepPart to %s...done\n"), filename);
@@ -250,7 +250,7 @@
 
   res = fclose (fh);
   if (res != 0)
-    return SHISHI_FCLOSE_ERROR;
+    return SHISHI_IO_ERROR;
 
   if (VERBOSE (handle))
     printf (_("Reading EncAPRepPart from %s...done\n"), filename);
--- /home/cvs/shishi/lib/error.c        2004/11/12 01:20:42     1.37
+++ /home/cvs/shishi/lib/error.c        2004/12/02 02:37:59     1.38
@@ -34,8 +34,8 @@
    "Error in ASN.1 data, probably due to corrupt data."},
   {SHISHI_FOPEN_ERROR,
    "Could not open file."},
-  {SHISHI_FCLOSE_ERROR,
-   "Could not close file."},
+  {SHISHI_IO_ERROR,
+   "File input/output error."},
   {SHISHI_MALLOC_ERROR,
    "Memory allocation error in shishi library."},
   {SHISHI_BASE64_ERROR,
--- /home/cvs/shishi/lib/kdcrep.c       2004/09/10 10:00:00     1.45
+++ /home/cvs/shishi/lib/kdcrep.c       2004/12/02 02:37:59     1.46
@@ -171,7 +171,7 @@
 
   res = fclose (fh);
   if (res != 0)
-    return SHISHI_FCLOSE_ERROR;
+    return SHISHI_IO_ERROR;
 
   if (VERBOSE (handle))
     printf (_("Writing KDC-REP to %s...done\n"), filename);
@@ -251,7 +251,7 @@
 
   res = fclose (fh);
   if (res != 0)
-    return SHISHI_FCLOSE_ERROR;
+    return SHISHI_IO_ERROR;
 
   if (VERBOSE (handle))
     printf (_("Reading KDC-REP from %s...done\n"), filename);
--- /home/cvs/shishi/lib/kdcreq.c       2004/09/17 13:09:48     1.72
+++ /home/cvs/shishi/lib/kdcreq.c       2004/12/02 02:37:59     1.73
@@ -242,7 +242,7 @@
 
   res = fclose (fh);
   if (res != 0)
-    return SHISHI_FCLOSE_ERROR;
+    return SHISHI_IO_ERROR;
 
   if (VERBOSE (handle))
     printf (_("Writing KDC-REQ to %s...done\n"), filename);
@@ -322,7 +322,7 @@
 
   res = fclose (fh);
   if (res != 0)
-    return SHISHI_FCLOSE_ERROR;
+    return SHISHI_IO_ERROR;
 
   if (VERBOSE (handle))
     printf (_("Reading KDC-REQ from %s...done\n"), filename);
--- /home/cvs/shishi/lib/krberror.c     2004/11/09 19:39:20     1.42
+++ /home/cvs/shishi/lib/krberror.c     2004/12/02 02:37:59     1.43
@@ -154,7 +154,7 @@
 
   res = fclose (fh);
   if (res != 0)
-    return SHISHI_FCLOSE_ERROR;
+    return SHISHI_IO_ERROR;
 
   if (VERBOSE (handle))
     printf (_("Writing KRB-ERROR to %s...done\n"), filename);
@@ -234,7 +234,7 @@
 
   res = fclose (fh);
   if (res != 0)
-    return SHISHI_FCLOSE_ERROR;
+    return SHISHI_IO_ERROR;
 
   if (VERBOSE (handle))
     printf (_("Reading KRB-ERROR from %s...done\n"), filename);
--- /home/cvs/shishi/lib/priv.c 2004/11/09 19:39:20     1.9
+++ /home/cvs/shishi/lib/priv.c 2004/12/02 02:37:59     1.10
@@ -392,7 +392,7 @@
 
   res = fclose (fh);
   if (res != 0)
-    return SHISHI_FCLOSE_ERROR;
+    return SHISHI_IO_ERROR;
 
   if (VERBOSE (handle))
     printf (_("Writing PRIV to %s...done\n"), filename);
@@ -472,7 +472,7 @@
 
   res = fclose (fh);
   if (res != 0)
-    return SHISHI_FCLOSE_ERROR;
+    return SHISHI_IO_ERROR;
 
   if (VERBOSE (handle))
     printf (_("Reading PRIV from %s...done\n"), filename);
--- /home/cvs/shishi/lib/safe.c 2004/11/09 19:39:20     1.31
+++ /home/cvs/shishi/lib/safe.c 2004/12/02 02:37:59     1.32
@@ -299,7 +299,7 @@
 
   res = fclose (fh);
   if (res != 0)
-    return SHISHI_FCLOSE_ERROR;
+    return SHISHI_IO_ERROR;
 
   if (VERBOSE (handle))
     printf (_("Writing SAFE to %s...done\n"), filename);
@@ -379,7 +379,7 @@
 
   res = fclose (fh);
   if (res != 0)
-    return SHISHI_FCLOSE_ERROR;
+    return SHISHI_IO_ERROR;
 
   if (VERBOSE (handle))
     printf (_("Reading SAFE from %s...done\n"), filename);
--- /home/cvs/shishi/lib/shishi.h.in    2004/11/09 20:32:40     1.259
+++ /home/cvs/shishi/lib/shishi.h.in    2004/12/02 02:37:59     1.260
@@ -35,7 +35,7 @@
   SHISHI_OK = 0,
   SHISHI_ASN1_ERROR = 1,
   SHISHI_FOPEN_ERROR = 2,
-  SHISHI_FCLOSE_ERROR = 3,
+  SHISHI_IO_ERROR = 3,
   SHISHI_MALLOC_ERROR = 4,
   SHISHI_BASE64_ERROR = 5,
   SHISHI_REALM_MISMATCH = 6,
--- /home/cvs/shishi/lib/tkts.c 2004/11/09 19:39:20     1.43
+++ /home/cvs/shishi/lib/tkts.c 2004/12/02 02:37:59     1.44
@@ -380,7 +380,7 @@
 
   res = fclose (fh);
   if (res != 0)
-    return SHISHI_FCLOSE_ERROR;
+    return SHISHI_IO_ERROR;
 
   return SHISHI_OK;
 }
@@ -499,7 +499,7 @@
 
   res = fclose (fh);
   if (res != 0)
-    return SHISHI_FCLOSE_ERROR;
+    return SHISHI_IO_ERROR;
 
   return SHISHI_OK;
 }