[Pkg-gnupg-commit] [gnupg2] 180/292: common: Remove debug output from gnupg_get_socket_name.
Daniel Kahn Gillmor
dkg at fifthhorseman.net
Mon Nov 21 06:31:39 UTC 2016
This is an automated email from the git hooks/post-receive script.
dkg pushed a commit to branch master
in repository gnupg2.
commit a9c8b5fbe7ae241bf45bdee15884abc7891aedf9
Author: Werner Koch <wk at gnupg.org>
Date: Thu Oct 27 09:13:36 2016 +0200
common: Remove debug output from gnupg_get_socket_name.
* common/sysutils.c (gnupg_get_socket_name): Remove debug message and
use my_error_from_syserror.
Signed-off-by: Werner Koch <wk at gnupg.org>
---
common/sysutils.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/common/sysutils.c b/common/sysutils.c
index 0f87a42..6eea90e 100644
--- a/common/sysutils.c
+++ b/common/sysutils.c
@@ -1105,7 +1105,7 @@ gnupg_get_socket_name (int fd)
if (getsockname (fd, (struct sockaddr*)&un, &len) != 0)
log_error ("could not getsockname(%d): %s\n", fd,
- gpg_strerror (gpg_error_from_syserror ()));
+ gpg_strerror (my_error_from_syserror ()));
else if (un.sun_family != AF_UNIX)
log_error ("file descriptor %d is not a unix-domain socket\n", fd);
else if (len <= offsetof (struct sockaddr_un, sun_path))
@@ -1117,12 +1117,12 @@ gnupg_get_socket_name (int fd)
{
size_t namelen = len - offsetof (struct sockaddr_un, sun_path);
- log_debug ("file descriptor %d has path %s (%zu octets)\n", fd,
- un.sun_path, namelen);
+ /* log_debug ("file descriptor %d has path %s (%zu octets)\n", fd, */
+ /* un.sun_path, namelen); */
name = xtrymalloc (namelen + 1);
if (!name)
log_error ("failed to allocate memory for name of fd %d: %s\n",
- fd, gpg_strerror (gpg_error_from_syserror ()));
+ fd, gpg_strerror (my_error_from_syserror ()));
else
{
memcpy (name, un.sun_path, namelen);
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gnupg/gnupg2.git
More information about the Pkg-gnupg-commit
mailing list