Remove ath.h and ath.c.
* src/Makefile.am (system_components): We don't use ath.h any more. (main_sources): Remove ath.h and ath.c. -- Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
This commit is contained in:
NIIBE Yutaka
parent
9c276e762a
commit
8b4171680c
@ -55,7 +55,7 @@ if HAVE_DOSISH_SYSTEM
|
|||||||
system_components = w32-util.c
|
system_components = w32-util.c
|
||||||
system_components_not_extra = w32-io.c
|
system_components_not_extra = w32-io.c
|
||||||
else
|
else
|
||||||
system_components = ath.h posix-util.c posix-io.c
|
system_components = posix-util.c posix-io.c
|
||||||
system_components_not_extra =
|
system_components_not_extra =
|
||||||
endif
|
endif
|
||||||
|
|
||||||
@ -94,8 +94,7 @@ main_sources = \
|
|||||||
engine-spawn.c \
|
engine-spawn.c \
|
||||||
gpgconf.c queryswdb.c \
|
gpgconf.c queryswdb.c \
|
||||||
sema.h priv-io.h $(system_components) sys-util.h dirinfo.c \
|
sema.h priv-io.h $(system_components) sys-util.h dirinfo.c \
|
||||||
debug.c debug.h gpgme.c version.c error.c \
|
debug.c debug.h gpgme.c version.c error.c
|
||||||
ath.h ath.c
|
|
||||||
|
|
||||||
libgpgme_la_SOURCES = $(main_sources) $(system_components_not_extra)
|
libgpgme_la_SOURCES = $(main_sources) $(system_components_not_extra)
|
||||||
|
|
||||||
|
|||||||
161
src/ath.c
161
src/ath.c
@ -1,161 +0,0 @@
|
|||||||
/* ath.c - Thread-safeness library.
|
|
||||||
* Copyright (C) 2002, 2003, 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, see <https://gnu.org/licenses/>.
|
|
||||||
* SPDX-License-Identifier: LGPL-2.1-or-later
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifdef HAVE_CONFIG_H
|
|
||||||
#include <config.h>
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#include <assert.h>
|
|
||||||
#ifdef HAVE_UNISTD_H
|
|
||||||
# include <unistd.h>
|
|
||||||
#endif
|
|
||||||
#ifdef HAVE_POLL_H
|
|
||||||
# include <poll.h>
|
|
||||||
#else
|
|
||||||
# ifdef HAVE_SYS_SELECT_H
|
|
||||||
# include <sys/select.h>
|
|
||||||
# else
|
|
||||||
# ifdef HAVE_SYS_TIME_H
|
|
||||||
# include <sys/time.h>
|
|
||||||
# endif
|
|
||||||
# endif
|
|
||||||
#endif
|
|
||||||
#ifdef HAVE_SYS_TYPES_H
|
|
||||||
# include <sys/types.h>
|
|
||||||
#endif
|
|
||||||
#ifndef HAVE_W32_SYSTEM
|
|
||||||
#include <sys/wait.h>
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#include "gpgme.h"
|
|
||||||
|
|
||||||
#ifdef _MSC_VER
|
|
||||||
typedef int pid_t;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#include "ath.h"
|
|
||||||
|
|
||||||
|
|
||||||
#ifdef HAVE_W32_SYSTEM
|
|
||||||
#include <windows.h>
|
|
||||||
uintptr_t
|
|
||||||
ath_self (void)
|
|
||||||
{
|
|
||||||
return (uintptr_t) GetCurrentThreadId ();
|
|
||||||
}
|
|
||||||
#else
|
|
||||||
# ifdef __linux
|
|
||||||
#include <sys/syscall.h>
|
|
||||||
uintptr_t
|
|
||||||
ath_self (void)
|
|
||||||
{
|
|
||||||
/* Just to catch users who don't use gpgme-pthread. */
|
|
||||||
return (uintptr_t) syscall (__NR_gettid);
|
|
||||||
}
|
|
||||||
# else
|
|
||||||
uintptr_t
|
|
||||||
ath_self (void)
|
|
||||||
{
|
|
||||||
return (uintptr_t) getpid ();
|
|
||||||
}
|
|
||||||
# endif
|
|
||||||
#endif
|
|
||||||
|
|
||||||
|
|
||||||
gpgme_ssize_t
|
|
||||||
ath_read (int fd, void *buf, size_t nbytes)
|
|
||||||
{
|
|
||||||
return read (fd, buf, nbytes);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
gpgme_ssize_t
|
|
||||||
ath_write (int fd, const void *buf, size_t nbytes)
|
|
||||||
{
|
|
||||||
return write (fd, buf, nbytes);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
#if !defined(HAVE_POLL_H)
|
|
||||||
gpgme_ssize_t
|
|
||||||
ath_select (int nfd, fd_set *rset, fd_set *wset, fd_set *eset,
|
|
||||||
struct timeval *timeout)
|
|
||||||
{
|
|
||||||
#ifdef HAVE_W32_SYSTEM
|
|
||||||
return -1; /* Not supported. */
|
|
||||||
#else
|
|
||||||
return select (nfd, rset, wset, eset, timeout);
|
|
||||||
#endif
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
gpgme_ssize_t
|
|
||||||
ath_waitpid (pid_t pid, int *status, int options)
|
|
||||||
{
|
|
||||||
#ifdef HAVE_W32_SYSTEM
|
|
||||||
return -1; /* Not supported. */
|
|
||||||
#else
|
|
||||||
return waitpid (pid, status, options);
|
|
||||||
#endif
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
int
|
|
||||||
ath_accept (int s, struct sockaddr *addr, socklen_t *length_ptr)
|
|
||||||
{
|
|
||||||
#ifdef HAVE_W32_SYSTEM
|
|
||||||
return -1; /* Not supported. */
|
|
||||||
#else
|
|
||||||
return accept (s, addr, length_ptr);
|
|
||||||
#endif
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
int
|
|
||||||
ath_connect (int s, const struct sockaddr *addr, socklen_t length)
|
|
||||||
{
|
|
||||||
#ifdef HAVE_W32_SYSTEM
|
|
||||||
return -1; /* Not supported. */
|
|
||||||
#else
|
|
||||||
return connect (s, addr, length);
|
|
||||||
#endif
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
int
|
|
||||||
ath_sendmsg (int s, const struct msghdr *msg, int flags)
|
|
||||||
{
|
|
||||||
#ifdef HAVE_W32_SYSTEM
|
|
||||||
return -1; /* Not supported. */
|
|
||||||
#else
|
|
||||||
return sendmsg (s, msg, flags);
|
|
||||||
#endif
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
int
|
|
||||||
ath_recvmsg (int s, struct msghdr *msg, int flags)
|
|
||||||
{
|
|
||||||
#ifdef HAVE_W32_SYSTEM
|
|
||||||
return -1; /* Not supported. */
|
|
||||||
#else
|
|
||||||
return recvmsg (s, msg, flags);
|
|
||||||
#endif
|
|
||||||
}
|
|
||||||
88
src/ath.h
88
src/ath.h
@ -1,88 +0,0 @@
|
|||||||
/* ath.h - Interfaces for thread-safeness library.
|
|
||||||
Copyright (C) 2002, 2003, 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. */
|
|
||||||
|
|
||||||
#ifndef ATH_H
|
|
||||||
#define ATH_H
|
|
||||||
|
|
||||||
#ifdef HAVE_STDINT_H
|
|
||||||
#include <stdint.h>
|
|
||||||
#endif
|
|
||||||
#ifdef HAVE_W32_SYSTEM
|
|
||||||
/* fixme: Check how we did it in libgcrypt. */
|
|
||||||
struct msghdr { int dummy; };
|
|
||||||
typedef int socklen_t;
|
|
||||||
# include <windows.h>
|
|
||||||
# include <io.h>
|
|
||||||
|
|
||||||
#else /*!HAVE_W32_SYSTEM*/
|
|
||||||
# ifdef HAVE_POLL_H
|
|
||||||
# include <poll.h>
|
|
||||||
# else
|
|
||||||
# ifdef HAVE_SYS_SELECT_H
|
|
||||||
# include <sys/select.h>
|
|
||||||
# else
|
|
||||||
# ifdef HAVE_SYS_TIME_H
|
|
||||||
# include <sys/time.h>
|
|
||||||
# endif
|
|
||||||
# endif
|
|
||||||
# endif
|
|
||||||
# ifdef HAVE_SYS_TYPES_H
|
|
||||||
# include <sys/types.h>
|
|
||||||
# endif
|
|
||||||
# include <sys/socket.h>
|
|
||||||
|
|
||||||
#endif /*!HAVE_W32_SYSTEM*/
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
/* Define _ATH_EXT_SYM_PREFIX if you want to give all external symbols
|
|
||||||
a prefix. */
|
|
||||||
#define _ATH_EXT_SYM_PREFIX _gpgme_
|
|
||||||
|
|
||||||
#ifdef _ATH_EXT_SYM_PREFIX
|
|
||||||
#define _ATH_PREFIX1(x,y) x ## y
|
|
||||||
#define _ATH_PREFIX2(x,y) _ATH_PREFIX1(x,y)
|
|
||||||
#define _ATH_PREFIX(x) _ATH_PREFIX2(_ATH_EXT_SYM_PREFIX,x)
|
|
||||||
#define ath_read _ATH_PREFIX(ath_read)
|
|
||||||
#define ath_write _ATH_PREFIX(ath_write)
|
|
||||||
#define ath_select _ATH_PREFIX(ath_select)
|
|
||||||
#define ath_waitpid _ATH_PREFIX(ath_waitpid)
|
|
||||||
#define ath_connect _ATH_PREFIX(ath_connect)
|
|
||||||
#define ath_accept _ATH_PREFIX(ath_accept)
|
|
||||||
#define ath_sendmsg _ATH_PREFIX(ath_sendmsg)
|
|
||||||
#define ath_recvmsg _ATH_PREFIX(ath_recvmsg)
|
|
||||||
#endif
|
|
||||||
|
|
||||||
|
|
||||||
uintptr_t ath_self (void);
|
|
||||||
|
|
||||||
/* Replacement for the POSIX functions, which can be used to allow
|
|
||||||
other (user-level) threads to run. */
|
|
||||||
gpgme_ssize_t ath_read (int fd, void *buf, size_t nbytes);
|
|
||||||
gpgme_ssize_t ath_write (int fd, const void *buf, size_t nbytes);
|
|
||||||
gpgme_ssize_t ath_select (int nfd, fd_set *rset, fd_set *wset, fd_set *eset,
|
|
||||||
struct timeval *timeout);
|
|
||||||
gpgme_ssize_t ath_waitpid (pid_t pid, int *status, int options);
|
|
||||||
int ath_accept (int s, struct sockaddr *addr, socklen_t *length_ptr);
|
|
||||||
int ath_connect (int s, const struct sockaddr *addr, socklen_t length);
|
|
||||||
int ath_sendmsg (int s, const struct msghdr *msg, int flags);
|
|
||||||
int ath_recvmsg (int s, struct msghdr *msg, int flags);
|
|
||||||
|
|
||||||
#endif /* ATH_H */
|
|
||||||
Loading…
Reference in New Issue
Block a user