Attempt merging from 6.3.24.

[~andy/fetchmail] / libesmtp / gethostbyname.c

diff --git a/libesmtp/gethostbyname.c b/libesmtp/gethostbyname.c
index d151606d722f1c9e47e1477e19f72f6e80f74b83..af5da953a92a0805c055c1aa1827884c3f03b1b5 100644 (file)
--- a/libesmtp/gethostbyname.c
+++ b/libesmtp/gethostbyname.c
@@ -34,36 +34,7 @@
 
 #include "gethostbyname.h"
 
-#if HAVE_GETIPNODEBYNAME
-
-void
-free_ghbnctx (struct ghbnctx *ctx)
-{
-  assert (ctx != NULL);
-
-  if (ctx->hostent != NULL)
-    freehostent (ctx->hostent);
-}
-
-struct hostent *
-gethostbyname_ctx (const char *host, struct ghbnctx *ctx)
-{
-  assert (ctx != NULL);
-
-  memset (ctx, 0, sizeof (struct ghbnctx));
-  ctx->hostent = getipnodebyname (host, AF_UNSPEC, AI_ADDRCONFIG, &ctx->h_err);
-  return ctx->hostent;
-}
-
-int
-h_error_ctx (struct ghbnctx *ctx)
-{
-  assert (ctx != NULL);
-
-  return ctx->h_err;
-}
-
-#elif HAVE_GETHOSTBYNAME_R == 6
+#if HAVE_GETHOSTBYNAME_R == 6
 
 void
 free_ghbnctx (struct ghbnctx *ctx)
@@ -85,7 +56,7 @@ gethostbyname_ctx (const char *host, struct ghbnctx *ctx)
 
   memset (ctx, 0, sizeof (struct ghbnctx));
   ctx->hostbuf_len = 2048;
-  if ((ctx->hostbuf = malloc (ctx->hostbuf_len)) == NULL)
+  if ((ctx->hostbuf = (char *)malloc (ctx->hostbuf_len)) == NULL)
     {
       errno = ENOMEM;
       return NULL;
@@ -95,7 +66,7 @@ gethostbyname_ctx (const char *host, struct ghbnctx *ctx)
                                 &hp, &ctx->h_err)) == ERANGE)
     {
       ctx->hostbuf_len += 1024;
-      if ((tmp = realloc (ctx->hostbuf, ctx->hostbuf_len)) == NULL)
+      if ((tmp = (char *)realloc (ctx->hostbuf, ctx->hostbuf_len)) == NULL)
        {
          errno = ENOMEM;
          return NULL;
@@ -201,7 +172,7 @@ h_error_ctx (struct ghbnctx *ctx)
 #else
 
 void
-free_ghbnctx (struct ghbnctx *ctx __attribute__ ((unused)))
+free_ghbnctx (struct ghbnctx *ctx )
 {
   assert (ctx != NULL);
 }