From 8a259a2310d269a86c603262e8f2c5f69f2a9c9d Mon Sep 17 00:00:00 2001
From: Ulrich Drepper <drepper@redhat.com>
Date: Wed, 20 Jul 2005 17:51:14 +0000
Subject: * include/stdio.h (__fxprintf): Remove wfmt argument.

	* stdio-common/fxprintf.c: Include assert.h, ctype.h and wchar.h.
	(__fxprintf): Remove wfmt argument, create wfmt format string on
	the fly from fmt.
	* argp/argp-fmtstream.c: Adjust all __fxprintf callers.
	* argp/argp-help.c: Likewise.
	* assert/assert-perr.c: Likewise.
	* assert/assert.c: Likewise.
	* gmon/gmon.c: Likewise.
	* inet/rcmd.c: Likewise.
	* malloc/obstack.c: Likewise.
	* misc/error.c: Likewise.
	* misc/getpass.c: Likewise.
	* posix/getopt.c: Likewise.
	* resolv/res_hconf.c: Likewise.
	* stdio-common/perror.c: Likewise.
	* stdio-common/psignal.c: Likewise.
	* stdlib/fmtmsg.c: Likewise.
	* sunrpc/auth_unix.c: Likewise.
	* sunrpc/clnt_perr.c: Likewise.
	* sunrpc/clnt_tcp.c: Likewise.
	* sunrpc/clnt_udp.c: Likewise.
	* sunrpc/clnt_unix.c: Likewise.
	* sunrpc/svc_simple.c: Likewise.
	* sunrpc/svc_tcp.c: Likewise.
	* sunrpc/svc_udp.c: Likewise.
	* sunrpc/svc_unix.c: Likewise.
	* sunrpc/xdr.c: Likewise.
	* sunrpc/xdr_array.c: Likewise.
	* sunrpc/xdr_rec.c: Likewise.
	* sunrpc/xdr_ref.c: Likewise.
	* sysdeps/generic/wordexp.c: Likewise.
---
 resolv/res_hconf.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'resolv')

diff --git a/resolv/res_hconf.c b/resolv/res_hconf.c
index d3de4be..9beb881 100644
--- a/resolv/res_hconf.c
+++ b/resolv/res_hconf.c
@@ -150,7 +150,7 @@ arg_service_list (const char *fname, int line_num, const char *args,
 			  fname, line_num, start) < 0)
 	    return 0;
 
-	  __fxprintf (NULL, "%s", L"%s", buf);
+	  __fxprintf (NULL, "%s", buf);
 
 	  free (buf);
 	  return 0;
@@ -164,7 +164,7 @@ arg_service_list (const char *fname, int line_num, const char *args,
 			  fname, line_num, SERVICE_MAX) < 0)
 	    return 0;
 
-	  __fxprintf (NULL, "%s", L"%s", buf);
+	  __fxprintf (NULL, "%s", buf);
 
 	  free (buf);
 	  return 0;
@@ -187,7 +187,7 @@ arg_service_list (const char *fname, int line_num, const char *args,
 			      fname, line_num) < 0)
 		return 0;
 
-	      __fxprintf (NULL, "%s", L"%s", buf);
+	      __fxprintf (NULL, "%s", buf);
 
 	      free (buf);
 	      return 0;
@@ -223,7 +223,7 @@ arg_trimdomain_list (const char *fname, int line_num, const char *args,
 			  fname, line_num, TRIMDOMAINS_MAX) < 0)
 	    return 0;
 
-	  __fxprintf (NULL, "%s", L"%s", buf);
+	  __fxprintf (NULL, "%s", buf);
 
 	  free (buf);
 	  return 0;
@@ -244,7 +244,7 @@ arg_trimdomain_list (const char *fname, int line_num, const char *args,
 			      fname, line_num) < 0)
 		return 0;
 
-	      __fxprintf (NULL, "%s", L"%s", buf);
+	      __fxprintf (NULL, "%s", buf);
 
 	      free (buf);
 	      return 0;
@@ -302,7 +302,7 @@ arg_bool (const char *fname, int line_num, const char *args, unsigned flag)
 		      fname, line_num, args) < 0)
 	return 0;
 
-      __fxprintf (NULL, "%s", L"%s", buf);
+      __fxprintf (NULL, "%s", buf);
 
       free (buf);
       return 0;
@@ -345,7 +345,7 @@ parse_line (const char *fname, int line_num, const char *str)
 		      fname, line_num, start) < 0)
 	return;
 
-      __fxprintf (NULL, "%s", L"%s", buf);
+      __fxprintf (NULL, "%s", buf);
 
       free (buf);
       return;
@@ -370,7 +370,7 @@ parse_line (const char *fname, int line_num, const char *str)
 			    fname, line_num, str) < 0)
 	      break;
 
-	    __fxprintf (NULL, "%s", L"%s", buf);
+	    __fxprintf (NULL, "%s", buf);
 
 	    free (buf);
 	  }
-- 
cgit v1.1