From da6da894aa10af5e7ad3bbf40a960b7ef749999a Mon Sep 17 00:00:00 2001
From: perry.werneck@gmail.com <perry.werneck@gmail.com@d25448e0-c022-0410-b998-a785f7053de0>
Date: Tue, 15 May 2012 19:59:43 +0000
Subject: [PATCH] Android - Work in progress

---
 ft_cut.c    | 2 +-
 ft_dft.c    | 2 +-
 resources.c | 2 +-
 util.c      | 8 ++++----
 utilc.h     | 2 --
 5 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/ft_cut.c b/ft_cut.c
index 769bc36..c4d091f 100644
--- a/ft_cut.c
+++ b/ft_cut.c
@@ -532,7 +532,7 @@ static void cut_abort(unsigned short reason, const char *fmt, ...)
 
 	/* Save the error message. */
 	va_start(args, fmt);
-	saved_errmsg = xs_vsprintf(fmt, args);
+	saved_errmsg = lib3270_vsprintf(fmt, args);
 	va_end(args);
 
 	/* Send the abort sequence. */
diff --git a/ft_dft.c b/ft_dft.c
index 9e619f2..8f51db3 100644
--- a/ft_dft.c
+++ b/ft_dft.c
@@ -497,7 +497,7 @@ static void dft_abort(unsigned short code, const char *fmt, ...)
 		lib3270_free(abort_string);
 
 	va_start(args, fmt);
-	abort_string = xs_vsprintf(fmt, args);
+	abort_string = lib3270_vsprintf(fmt, args);
 	va_end(args);
 
 	trace_ds("> WriteStructuredField FileTransferData Error\n");
diff --git a/resources.c b/resources.c
index 3577406..06f82e6 100644
--- a/resources.c
+++ b/resources.c
@@ -172,7 +172,7 @@ const char * get_fresource(const char *fmt, ...)
 	const char *r;
 
 	va_start(args, fmt);
-	name = xs_vsprintf(fmt, args);
+	name = lib3270_vsprintf(fmt, args);
 	va_end(args);
 	r = get_resource(name);
 	lib3270_free(name);
diff --git a/util.c b/util.c
index d3a7111..4dd8355 100644
--- a/util.c
+++ b/util.c
@@ -166,7 +166,7 @@ const char * win32_strerror(int e)
 /*
  * Cheesy internal version of sprintf that allocates its own memory.
  */
-char * xs_vsprintf(const char *fmt, va_list args)
+char * lib3270_vsprintf(const char *fmt, va_list args)
 {
 	char *r;
 #if defined(HAVE_VASPRINTF) /*[*/
@@ -198,7 +198,7 @@ xs_buffer(const char *fmt, ...)
 	char *r;
 
 	va_start(args, fmt);
-	r = xs_vsprintf(fmt, args);
+	r = lib3270_vsprintf(fmt, args);
 	va_end(args);
 	return r;
 }
@@ -211,7 +211,7 @@ xs_warning(const char *fmt, ...)
 	char *r;
 
 	va_start(args, fmt);
-	r = xs_vsprintf(fmt, args);
+	r = lib3270_vsprintf(fmt, args);
 	va_end(args);
 	Warning(NULL,r);
 	lib3270_free(r);
@@ -224,7 +224,7 @@ xs_error(const char *fmt, ...)
 	char *r;
 
 	va_start(args, fmt);
-	r = xs_vsprintf(fmt, args);
+	r = lib3270_vsprintf(fmt, args);
 	va_end(args);
 	Error(NULL,r);
 	lib3270_free(r);
diff --git a/utilc.h b/utilc.h
index a527a52..4de1292 100644
--- a/utilc.h
+++ b/utilc.h
@@ -35,8 +35,6 @@ LIB3270_INTERNAL char *strip_whitespace(const char *s);
 LIB3270_INTERNAL char *xs_buffer(const char *fmt, ...) printflike(1, 2);
 LIB3270_INTERNAL void xs_error(const char *fmt, ...) printflike(1, 2);
 LIB3270_INTERNAL void xs_warning(const char *fmt, ...) printflike(1, 2);
-LIB3270_INTERNAL char * xs_vsprintf(const char *fmt, va_list args);
-
 
 LIB3270_INTERNAL void * AddInput(int, H3270 *session, void (*fn)(H3270 *session));
 LIB3270_INTERNAL void * AddExcept(int, H3270 *session, void (*fn)(H3270 *session));
--
libgit2 0.21.2