[Pkg-gnupg-commit] [gpgme] 49/132: core: Remove unused check for funopen/fopencookie.

[Daniel Kahn Gillmor]

This is an automated email from the git hooks/post-receive script.

dkg pushed a commit to branch experimental
in repository gpgme.

commit 563420a88f8a4f561a2faea4d2b4a1c58b375fd8
Author: Werner Koch <wk at gnupg.org>
Date:   Thu Feb 2 12:28:39 2017 +0100

    core: Remove unused check for funopen/fopencookie.
    
    * configure.ac (funopen): Remove check.
    * src/funopen.c: Remove file.
    
    Signed-off-by: Werner Koch <wk at gnupg.org>
---
 configure.ac  | 15 --------------
 src/funopen.c | 63 -----------------------------------------------------------
 2 files changed, 78 deletions(-)

diff --git a/configure.ac b/configure.ac
index 7109194..1cad7b5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -698,21 +698,6 @@ fi
 # Other checks
 #
 
-# Check for funopen
-AC_CHECK_FUNCS(funopen)
-if test $ac_cv_func_funopen != yes; then
-    # No funopen but we can implement that in terms of fopencookie.
-    AC_CHECK_FUNCS(fopencookie)
-    if test $ac_cv_func_fopencookie = yes; then
-        AC_REPLACE_FUNCS(funopen)
-    else
-        AC_MSG_WARN([
-***
-*** No implementation of fopencookie or funopen available
-***])
-    fi
-fi
-
 # Check for getgid etc
 AC_CHECK_FUNCS(getgid getegid)
 
diff --git a/src/funopen.c b/src/funopen.c
deleted file mode 100644
index b722020..0000000
--- a/src/funopen.c
+++ /dev/null
@@ -1,63 +0,0 @@
-/* funopen.c - Replacement for funopen.
-   Copyright (C) 2004 g10 Code GmbH
-
-   This file is part of GPGME
-
-   GPGME is free software; you can redistribute it and/or modify it
-   under the terms of the GNU Lesser General Public License as
-   published by the Free Software Foundation; either version 2.1 of
-   the License, or (at your option) any later version.
-
-   GPGME is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-   02111-1307, USA.  */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <stdio.h>
-
-
-/* Replacement for the *BSD function:
-
-  FILE *funopen (void *cookie,
-                 int (*readfn)(void *, char *, int),
-                 int (*writefn)(void *, const char *, int),
-                 fpos_t (*seekfn)(void *, fpos_t, int),
-                 int (*closefn)(void *));
-
-  The functions to provide my either be NULL if not required or
-  similar to the unistd function with the exception of using the
-  cookie instead of the file descriptor.
-*/
-
-
-#ifdef HAVE_FOPENCOOKIE
-FILE *
-_gpgme_funopen(void *cookie,
-                cookie_read_function_t *readfn,
-                cookie_write_function_t *writefn,
-                cookie_seek_function_t *seekfn,
-                cookie_close_function_t *closefn)
-{
-  cookie_io_functions_t io = { NULL };
-
-  io.read = readfn;
-  io.write = writefn;
-  io.seek = seekfn;
-  io.close = closefn;
-
-  return fopencookie (cookie,
-		      readfn ? ( writefn ? "rw" : "r" )
-		      : ( writefn ? "w" : ""), io);
-}
-#else
-#error No known way to implement funopen.
-#endif

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gnupg/gpgme.git