From bd0b1acf794b2552b13bd4185c8eef91b2d9784c Mon Sep 17 00:00:00 2001
From: Pavel Roskin <plroskin@gmail.com>
Date: Sun, 10 Apr 2016 13:49:00 -0700
Subject: [PATCH] Fix format warnings caused by g_writeln("")

---
 keygen/keygen.c        | 16 ++++++++--------
 tests/tcp_proxy/main.c |  2 +-
 xrdp/xrdpwin.c         | 24 ++++++++++++------------
 3 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/keygen/keygen.c b/keygen/keygen.c
index 1e2dd25d..bafcaf1c 100644
--- a/keygen/keygen.c
+++ b/keygen/keygen.c
@@ -195,11 +195,11 @@ static tui8 g_testkey2048[376] = /* 2048 bit test key */
 static int APP_CC
 out_params(void)
 {
-    g_writeln("");
+    g_writeln("%s", "");
     g_writeln("xrdp rsa key gen utility examples");
     g_writeln("  xrdp-keygen xrdp ['path and file name' | auto] [512 or 2048]");
     g_writeln("  xrdp-keygen test");
-    g_writeln("");
+    g_writeln("%s", "");
     return 0;
 }
 
@@ -351,7 +351,7 @@ save_all(char *e_data, int e_len, char *n_data, int n_len,
     }
 
     g_writeln("saving to %s", filename);
-    g_writeln("");
+    g_writeln("%s", "");
 
     if (g_file_exist(filename))
     {
@@ -411,9 +411,9 @@ key_gen(const char *path_and_file_name)
     d_len = n_len;
     sign_len = 64;
     error = 0;
-    g_writeln("");
+    g_writeln("%s", "");
     g_writeln("Generating %d bit rsa key...", g_key_size_bits);
-    g_writeln("");
+    g_writeln("%s", "");
 
     if (error == 0)
     {
@@ -428,7 +428,7 @@ key_gen(const char *path_and_file_name)
     if (error == 0)
     {
         g_writeln("ssl_gen_key_xrdp1 ok");
-        g_writeln("");
+        g_writeln("%s", "");
         error = sign_key(e_data, e_len, n_data, n_len, sign_data, sign_len);
 
         if (error != 0)
@@ -588,10 +588,10 @@ main(int argc, char **argv)
         }
         else if (g_strcasecmp(argv[1], "test") == 0)
         {
-            g_writeln("");
+            g_writeln("%s", "");
             g_writeln("testing 512 bit key");
             key_test512();
-            g_writeln("");
+            g_writeln("%s", "");
             g_writeln("testing 2048 bit key");
             key_test2048();
             return 0;
diff --git a/tests/tcp_proxy/main.c b/tests/tcp_proxy/main.c
index 26c974cd..3a62c98c 100644
--- a/tests/tcp_proxy/main.c
+++ b/tests/tcp_proxy/main.c
@@ -109,7 +109,7 @@ g_hexdump(char *p, int len)
             g_printf("%c", (line[i] >= 0x20 && line[i] < 0x7f) ? line[i] : '.');
         }
 
-        g_writeln("");
+        g_writeln("%s", "");
         offset += thisline;
         line += thisline;
     }
diff --git a/xrdp/xrdpwin.c b/xrdp/xrdpwin.c
index 95669fa6..224efc0c 100644
--- a/xrdp/xrdpwin.c
+++ b/xrdp/xrdpwin.c
@@ -344,16 +344,16 @@ main(int argc, char **argv)
                 g_strncasecmp(argv[1], "--help", 255) == 0 ||
                 g_strncasecmp(argv[1], "-h", 255) == 0)
         {
-            g_writeln("");
+            g_writeln("%s", "");
             g_writeln("xrdp: A Remote Desktop Protocol server.");
             g_writeln("Copyright (C) Jay Sorg 2004-2011");
             g_writeln("See http://xrdp.sourceforge.net for more information.");
-            g_writeln("");
+            g_writeln("%s", "");
             g_writeln("Usage: xrdp [options]");
             g_writeln("   -h: show help");
             g_writeln("   -install: install service");
             g_writeln("   -remove: remove service");
-            g_writeln("");
+            g_writeln("%s", "");
             g_exit(0);
         }
         else if (g_strncasecmp(argv[1], "-install", 255) == 0 ||
@@ -423,7 +423,7 @@ main(int argc, char **argv)
         {
             g_writeln("Unknown Parameter");
             g_writeln("xrdp -h for help");
-            g_writeln("");
+            g_writeln("%s", "");
             g_exit(0);
         }
     }
@@ -431,7 +431,7 @@ main(int argc, char **argv)
     {
         g_writeln("Unknown Parameter");
         g_writeln("xrdp -h for help");
-        g_writeln("");
+        g_writeln("%s", "");
         g_exit(0);
     }
 
@@ -499,34 +499,34 @@ main(int argc, char **argv)
                  g_strncasecmp(argv[1], "--help", 255) == 0 ||
                  g_strncasecmp(argv[1], "-h", 255) == 0)
         {
-            g_writeln("");
+            g_writeln("%s", "");
             g_writeln("xrdp: A Remote Desktop Protocol server.");
             g_writeln("Copyright (C) Jay Sorg 2004-2011");
             g_writeln("See http://xrdp.sourceforge.net for more information.");
-            g_writeln("");
+            g_writeln("%s", "");
             g_writeln("Usage: xrdp [options]");
             g_writeln("   -h: show help");
             g_writeln("   -nodaemon: don't fork into background");
             g_writeln("   -kill: shut down xrdp");
-            g_writeln("");
+            g_writeln("%s", "");
             g_exit(0);
         }
         else if ((g_strncasecmp(argv[1], "-v", 255) == 0) ||
                  (g_strncasecmp(argv[1], "--version", 255) == 0))
         {
-            g_writeln("");
+            g_writeln("%s", "");
             g_writeln("xrdp: A Remote Desktop Protocol server.");
             g_writeln("Copyright (C) Jay Sorg 2004-2011");
             g_writeln("See http://xrdp.sourceforge.net for more information.");
             g_writeln("Version %s", PACKAGE_VERSION);
-            g_writeln("");
+            g_writeln("%s", "");
             g_exit(0);
         }
         else
         {
             g_writeln("Unknown Parameter");
             g_writeln("xrdp -h for help");
-            g_writeln("");
+            g_writeln("%s", "");
             g_exit(0);
         }
     }
@@ -534,7 +534,7 @@ main(int argc, char **argv)
     {
         g_writeln("Unknown Parameter");
         g_writeln("xrdp -h for help");
-        g_writeln("");
+        g_writeln("%s", "");
         g_exit(0);
     }