From 9e79a15f74c428624b0049a3f6a077c1bc7c731d Mon Sep 17 00:00:00 2001
From: "Neal H. Walfield" <neal@g10code.de>
Date: Fri, 13 Mar 2015 13:44:18 +0100
Subject: [PATCH] Move copy_stream function to misc.c.

* dirmngr/ks-action.c (copy_stream): Move function from here...
* dirmngr/misc.c (copy_stream): ... to here and drop the static
qualifier.
* dirmngr/misc.h (copy_stream): Add declaration.

--
Signed-off-by: Neal H. Walfield <neal@g10code.de>
---
 dirmngr/ks-action.c | 19 -------------------
 dirmngr/misc.c      | 18 ++++++++++++++++++
 dirmngr/misc.h      |  2 ++
 3 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/dirmngr/ks-action.c b/dirmngr/ks-action.c
index e4cd8f165..8e2f520c2 100644
--- a/dirmngr/ks-action.c
+++ b/dirmngr/ks-action.c
@@ -31,25 +31,6 @@
 #include "ks-action.h"
 
 
-/* Copy all data from IN to OUT.  */
-static gpg_error_t
-copy_stream (estream_t in, estream_t out)
-{
-  char buffer[512];
-  size_t nread;
-
-  while (!es_read (in, buffer, sizeof buffer, &nread))
-    {
-      if (!nread)
-        return 0; /* EOF */
-      if (es_write (out, buffer, nread, NULL))
-        break;
-
-    }
-  return gpg_error_from_syserror ();
-}
-
-
 /* Called by the engine's help functions to print the actual help.  */
 gpg_error_t
 ks_print_help (ctrl_t ctrl, const char *text)
diff --git a/dirmngr/misc.c b/dirmngr/misc.c
index 53d0099d2..93f051c1a 100644
--- a/dirmngr/misc.c
+++ b/dirmngr/misc.c
@@ -619,3 +619,21 @@ armor_data (char **r_string, const void *data, size_t datalen)
   *r_string = buffer;
   return 0;
 }
+
+/* Copy all data from IN to OUT.  */
+gpg_error_t
+copy_stream (estream_t in, estream_t out)
+{
+  char buffer[512];
+  size_t nread;
+
+  while (!es_read (in, buffer, sizeof buffer, &nread))
+    {
+      if (!nread)
+        return 0; /* EOF */
+      if (es_write (out, buffer, nread, NULL))
+        break;
+
+    }
+  return gpg_error_from_syserror ();
+}
diff --git a/dirmngr/misc.h b/dirmngr/misc.h
index e98b79162..d8c53d30a 100644
--- a/dirmngr/misc.h
+++ b/dirmngr/misc.h
@@ -85,5 +85,7 @@ gpg_error_t create_estream_ksba_reader (ksba_reader_t *r_reader, estream_t fp);
    responsible for freeing *R_STRING.  */
 gpg_error_t armor_data (char **r_string, const void *data, size_t datalen);
 
+/* Copy all data from IN to OUT.  */
+gpg_error_t copy_stream (estream_t in, estream_t out);
 
 #endif /* MISC_H */