From 797b318a608c482ccd4b4aa63f4dc30e0b183221 Mon Sep 17 00:00:00 2001
From: Vincent Povirk <madewokherd+d41d@gmail.com>
Date: Thu, 4 Dec 2008 21:40:28 -0600
Subject: [PATCH] msxml3/tests: fix string format warnings

---
 dlls/msxml3/tests/xmldoc.c  |   21 +++++++--------------
 dlls/msxml3/tests/xmlelem.c |   21 +++++++--------------
 2 files changed, 14 insertions(+), 28 deletions(-)

diff --git a/dlls/msxml3/tests/xmldoc.c b/dlls/msxml3/tests/xmldoc.c
index 2058d7d..5c1c4f8 100644
--- a/dlls/msxml3/tests/xmldoc.c
+++ b/dlls/msxml3/tests/xmldoc.c
@@ -31,27 +31,20 @@
 /* Deprecated Error Code */
 #define XML_E_INVALIDATROOTLEVEL    0xc00ce556
 
-static void append_str(char **str, const char *data)
-{
-    sprintf(*str, data);
-    *str += strlen(*str);
-}
-
 static void create_xml_file(LPCSTR filename)
 {
-    char data[1024];
-    char *ptr = data;
     DWORD dwNumberOfBytesWritten;
     HANDLE hf = CreateFile(filename, GENERIC_WRITE, 0, NULL,
                            CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL);
 
-    append_str(&ptr, "<?xml version=\"1.0\" ?>\n");
-    append_str(&ptr, "<BankAccount>\n");
-    append_str(&ptr, "  <Number>1234</Number>\n");
-    append_str(&ptr, "  <Name>Captain Ahab</Name>\n");
-    append_str(&ptr, "</BankAccount>");
+    static const char data[] =
+        "<?xml version=\"1.0\" ?>\n"
+        "<BankAccount>\n"
+        "  <Number>1234</Number>\n"
+        "  <Name>Captain Ahab</Name>\n"
+        "</BankAccount>";
 
-    WriteFile(hf, data, ptr - data, &dwNumberOfBytesWritten, NULL);
+    WriteFile(hf, data, sizeof(data) - 1, &dwNumberOfBytesWritten, NULL);
     CloseHandle(hf);
 }
 
diff --git a/dlls/msxml3/tests/xmlelem.c b/dlls/msxml3/tests/xmlelem.c
index 27c09c7..30e1671 100644
--- a/dlls/msxml3/tests/xmlelem.c
+++ b/dlls/msxml3/tests/xmlelem.c
@@ -228,27 +228,20 @@ static void test_xmlelem(void)
     IXMLDocument_Release(doc);
 }
 
-static void append_str(char **str, const char *data)
-{
-    sprintf(*str, data);
-    *str += strlen(*str);
-}
-
 static void create_xml_file(LPCSTR filename)
 {
-    char data[1024];
-    char *ptr = data;
     DWORD dwNumberOfBytesWritten;
     HANDLE hf = CreateFile(filename, GENERIC_WRITE, 0, NULL,
                            CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL);
 
-    append_str(&ptr, "<?xml version=\"1.0\" ?>\n");
-    append_str(&ptr, "<BankAccount>\n");
-    append_str(&ptr, "  <Number>1234</Number>\n");
-    append_str(&ptr, "  <Name>Captain Ahab</Name>\n");
-    append_str(&ptr, "</BankAccount>\n");
+    static const char data[] = 
+        "<?xml version=\"1.0\" ?>\n"
+        "<BankAccount>\n"
+        "  <Number>1234</Number>\n"
+        "  <Name>Captain Ahab</Name>\n"
+        "</BankAccount>\n";
 
-    WriteFile(hf, data, ptr - data, &dwNumberOfBytesWritten, NULL);
+    WriteFile(hf, data, sizeof(data) - 1, &dwNumberOfBytesWritten, NULL);
     CloseHandle(hf);
 }
 
-- 
1.6.0.4