Switched to automake 1.9.libassuan-0-6-9

2 files changed, 8 insertions, 21 deletions

diff --git a/src/assuan-pipe-connect.c b/src/assuan-pipe-connect.c
index 5162dcf..1ca6948 100644
--- a/src/assuan-pipe-connect.c
+++ b/src/assuan-pipe-connect.c
@@ -344,8 +344,7 @@ assuan_pipe_connect2 (assuan_context_t *ctx,
                        NULL, OPEN_EXISTING, 0, NULL);
       if (nullfd == INVALID_HANDLE_VALUE)
         {
-          _assuan_log_printf ("can't open `/dev/nul': %s\n",
-                              w32_strerror (-1));
+          _assuan_log_printf ("can't open `nul': %s\n", w32_strerror (-1));
           CloseHandle (fd_to_handle (rp[0]));
           CloseHandle (fd_to_handle (rp[1]));
           CloseHandle (fd_to_handle (wp[0]));
@@ -363,8 +362,8 @@ assuan_pipe_connect2 (assuan_context_t *ctx,
   /* Note: We inherit all handles flagged as inheritable.  This seems
      to be a security flaw but there seems to be no way of selecting
      handles to inherit. */
-  _assuan_log_printf ("CreateProcess, path=`%s' cmdline=`%s'\n",
-                      name, cmdline);
+/*   _assuan_log_printf ("CreateProcess, path=`%s' cmdline=`%s'\n", */
+/*                       name, cmdline); */
   if (!CreateProcess (name,                 /* Program to start.  */
                       cmdline,              /* Command line arguments.  */
                       &sec_attr,            /* Process security attributes.  */
@@ -401,10 +400,10 @@ assuan_pipe_connect2 (assuan_context_t *ctx,
   CloseHandle (fd_to_handle (rp[1]));
   CloseHandle (fd_to_handle (wp[0]));
 
-  _assuan_log_printf ("CreateProcess ready: hProcess=%p hThread=%p"
-                      " dwProcessID=%d dwThreadId=%d\n",
-                      pi.hProcess, pi.hThread,
-                      (int) pi.dwProcessId, (int) pi.dwThreadId);
+/*   _assuan_log_printf ("CreateProcess ready: hProcess=%p hThread=%p" */
+/*                       " dwProcessID=%d dwThreadId=%d\n", */
+/*                       pi.hProcess, pi.hThread, */
+/*                       (int) pi.dwProcessId, (int) pi.dwThreadId); */
 
   ResumeThread (pi.hThread);
   CloseHandle (pi.hThread); 
diff --git a/src/assuan-socket-connect.c b/src/assuan-socket-connect.c
index 75e99ac..9937c7a 100644
--- a/src/assuan-socket-connect.c
+++ b/src/assuan-socket-connect.c
@@ -87,10 +87,6 @@ assuan_socket_connect (ASSUAN_CONTEXT *r_ctx,
   size_t len;
   const char *s;
 
-#ifdef HAVE_W32_SYSTEM
-  _assuan_log_printf ("%s: name =`%s'\n", __FUNCTION__, name);
-#endif
-
   if (!r_ctx || !name)
     return ASSUAN_Invalid_Value;
   *r_ctx = NULL;
@@ -112,9 +108,7 @@ assuan_socket_connect (ASSUAN_CONTEXT *r_ctx,
       return err;
   ctx->deinit_handler = do_deinit;
   ctx->finish_handler = do_finish;
-#ifdef HAVE_W32_SYSTEM
-  _assuan_log_printf ("%s: got context\n", __FUNCTION__ );
-#endif
+
 
   fd = _assuan_sock_new (PF_LOCAL, SOCK_STREAM, 0);
   if (fd == -1)
@@ -130,9 +124,6 @@ assuan_socket_connect (ASSUAN_CONTEXT *r_ctx,
   srvr_addr.sun_path[sizeof (srvr_addr.sun_path) - 1] = 0;
   len = SUN_LEN (&srvr_addr);
 
-#ifdef HAVE_W32_SYSTEM
-  _assuan_log_printf ("%s: about to connect\n", __FUNCTION__ );
-#endif
 
   if (_assuan_sock_connect (fd, (struct sockaddr *) &srvr_addr, len) == -1)
     {
@@ -142,9 +133,6 @@ assuan_socket_connect (ASSUAN_CONTEXT *r_ctx,
       _assuan_close (fd);
       return ASSUAN_Connect_Failed;
     }
-#ifdef HAVE_W32_SYSTEM
-  _assuan_log_printf ("%s: connected\n", __FUNCTION__ );
-#endif
 
   ctx->inbound.fd = fd;
   ctx->outbound.fd = fd;