gpgme (6 files)

[cvs user marcus]

    Date: Thursday, March 24, 2005 @ 14:09:54
  Author: marcus
    Path: /cvs/gpgme/gpgme

Modified: ChangeLog configure.ac gpgme/ChangeLog gpgme/data-compat.c
          gpgme/data.c gpgme/data.h

2005-03-24  Marcus Brinkmann  <marcus at g10code.de>

	* configure.ac (AH_BOTTOM): Removed.

gpgme/
2005-03-24  Marcus Brinkmann  <marcus at g10code.de>

	* data.h (EOPNOTSUPP) [_WIN32]: Remove definition.
	* data.c (EOPNOTSUPP) [HAVE_W32_SYSTEM]: Remove definition.
	(gpgme_data_read, gpgme_data_write, gpgme_data_seek): Return
	ENOSYS instead EOPNOTSUPP.
	* data-compat.c (EOPNOTSUPP) [HAVE_W32_SYSTEM]: Remove definition.
	(gpgme_error_to_errno): Map GPG_ERR_NOT_SUPPORTED
	to ENOSYS.


---------------------+
 ChangeLog           |    4 ++++
 configure.ac        |   11 -----------
 gpgme/ChangeLog     |   10 ++++++++++
 gpgme/data-compat.c |    7 +------
 gpgme/data.c        |   11 +++--------
 gpgme/data.h        |    4 ----
 6 files changed, 18 insertions(+), 29 deletions(-)


Index: gpgme/ChangeLog
diff -u gpgme/ChangeLog:1.112 gpgme/ChangeLog:1.113
--- gpgme/ChangeLog:1.112	Wed Mar  9 17:03:05 2005
+++ gpgme/ChangeLog	Thu Mar 24 14:09:54 2005
@@ -1,3 +1,7 @@
+2005-03-24  Marcus Brinkmann  <marcus at g10code.de>
+
+	* configure.ac (AH_BOTTOM): Removed.
+
 2005-03-09  Werner Koch  <wk at g10code.com>
 
 	* acinclude.m4 (GNUPG_CHECK_VA_COPY): Assume no when cross-compiling.
Index: gpgme/configure.ac
diff -u gpgme/configure.ac:1.97 gpgme/configure.ac:1.98
--- gpgme/configure.ac:1.97	Wed Mar  9 17:03:05 2005
+++ gpgme/configure.ac	Thu Mar 24 14:09:54 2005
@@ -68,17 +68,6 @@
 # define _REENTRANT 1
 #endif])
 
-AH_BOTTOM([
-/* Some environments miss the definition for EOPNOTSUPP.  We provide
-   the error code here and test where neded whether it should be
-   defined.  Can't do the test here due to the order of includes.  */
-#ifdef HAVE_W32_SYSTEM
-#define VALUE_FOR_EOPNOTSUPP 95
-#endif /*!HAVE_W32_SYSTEM*/
-
-])
-
-
 AC_PROG_CC
 
 
Index: gpgme/gpgme/ChangeLog
diff -u gpgme/gpgme/ChangeLog:1.393 gpgme/gpgme/ChangeLog:1.394
--- gpgme/gpgme/ChangeLog:1.393	Thu Mar 24 14:05:12 2005
+++ gpgme/gpgme/ChangeLog	Thu Mar 24 14:09:54 2005
@@ -1,5 +1,15 @@
 2005-03-24  Marcus Brinkmann  <marcus at g10code.de>
 
+	* data.h (EOPNOTSUPP) [_WIN32]: Remove definition.
+	* data.c (EOPNOTSUPP) [HAVE_W32_SYSTEM]: Remove definition.
+	(gpgme_data_read, gpgme_data_write, gpgme_data_seek): Return
+	ENOSYS instead EOPNOTSUPP.
+	* data-compat.c (EOPNOTSUPP) [HAVE_W32_SYSTEM]: Remove definition.
+	(gpgme_error_to_errno): Map GPG_ERR_NOT_SUPPORTED
+	to ENOSYS.
+
+2005-03-24  Marcus Brinkmann  <marcus at g10code.de>
+
 	* io.h: Rename to ...
 	* priv-io.h: ... this.
 	* Makefile.am (libgpgme_real_la_SOURCES): Change io.h to priv-io.h.
Index: gpgme/gpgme/data-compat.c
diff -u gpgme/gpgme/data-compat.c:1.10 gpgme/gpgme/data-compat.c:1.11
--- gpgme/gpgme/data-compat.c:1.10	Wed Mar  9 17:03:04 2005
+++ gpgme/gpgme/data-compat.c	Thu Mar 24 14:09:54 2005
@@ -30,11 +30,6 @@
 #include "data.h"
 #include "util.h"
 
-#if defined(HAVE_W32_SYSTEM) && !defined(EOPNOTSUPP)
-#define EOPNOTSUPP VALUE_FOR_EOPNOTSUPP
-#endif
-
-
 
 /* Create a new data buffer filled with LENGTH bytes starting from
    OFFSET within the file FNAME or stream STREAM (exactly one must be
@@ -145,7 +140,7 @@
       errno = EINVAL;
       return -1;
     case GPG_ERR_NOT_SUPPORTED:
-      errno = EOPNOTSUPP;
+      errno = ENOSYS;
       return -1;
     default:
       /* FIXME: Yeah, well.  */
Index: gpgme/gpgme/data.c
diff -u gpgme/gpgme/data.c:1.44 gpgme/gpgme/data.c:1.45
--- gpgme/gpgme/data.c:1.44	Thu Mar 24 14:05:12 2005
+++ gpgme/gpgme/data.c	Thu Mar 24 14:09:54 2005
@@ -33,11 +33,6 @@
 #include "ops.h"
 #include "priv-io.h"
 
-#if defined(HAVE_W32_SYSTEM) && !defined(EOPNOTSUPP)
-#define EOPNOTSUPP VALUE_FOR_EOPNOTSUPP
-#endif
-
-
 
 gpgme_error_t
 _gpgme_data_new (gpgme_data_t *r_dh, struct _gpgme_data_cbs *cbs)
@@ -80,7 +75,7 @@
     }
   if (!dh->cbs->read)
     {
-      errno = EOPNOTSUPP;
+      errno = ENOSYS;
       return -1;
     }
   return (*dh->cbs->read) (dh, buffer, size);
@@ -100,7 +95,7 @@
     }
   if (!dh->cbs->write)
     {
-      errno = EOPNOTSUPP;
+      errno = ENOSYS;
       return -1;
     }
   return (*dh->cbs->write) (dh, buffer, size);
@@ -120,7 +115,7 @@
     }
   if (!dh->cbs->seek)
     {
-      errno = EOPNOTSUPP;
+      errno = ENOSYS;
       return -1;
     }
 
Index: gpgme/gpgme/data.h
diff -u gpgme/gpgme/data.h:1.7 gpgme/gpgme/data.h:1.8
--- gpgme/gpgme/data.h:1.7	Wed Mar  9 12:47:21 2005
+++ gpgme/gpgme/data.h	Thu Mar 24 14:09:54 2005
@@ -30,10 +30,6 @@
 
 #include "gpgme.h"
 
-#ifdef _WIN32
-# define EOPNOTSUPP      95
-#endif
-
 
 /* Read up to SIZE bytes into buffer BUFFER from the data object with
    the handle DH.  Return the number of characters read, 0 on EOF and