Fix format warnings caused by g_writeln("")

ulab-next-nosound
Pavel Roskin 9 years ago
parent 55e12a09d8
commit bd0b1acf79

@ -195,11 +195,11 @@ static tui8 g_testkey2048[376] = /* 2048 bit test key */
static int APP_CC static int APP_CC
out_params(void) out_params(void)
{ {
g_writeln(""); g_writeln("%s", "");
g_writeln("xrdp rsa key gen utility examples"); 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 xrdp ['path and file name' | auto] [512 or 2048]");
g_writeln(" xrdp-keygen test"); g_writeln(" xrdp-keygen test");
g_writeln(""); g_writeln("%s", "");
return 0; 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("saving to %s", filename);
g_writeln(""); g_writeln("%s", "");
if (g_file_exist(filename)) if (g_file_exist(filename))
{ {
@ -411,9 +411,9 @@ key_gen(const char *path_and_file_name)
d_len = n_len; d_len = n_len;
sign_len = 64; sign_len = 64;
error = 0; error = 0;
g_writeln(""); g_writeln("%s", "");
g_writeln("Generating %d bit rsa key...", g_key_size_bits); g_writeln("Generating %d bit rsa key...", g_key_size_bits);
g_writeln(""); g_writeln("%s", "");
if (error == 0) if (error == 0)
{ {
@ -428,7 +428,7 @@ key_gen(const char *path_and_file_name)
if (error == 0) if (error == 0)
{ {
g_writeln("ssl_gen_key_xrdp1 ok"); 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); error = sign_key(e_data, e_len, n_data, n_len, sign_data, sign_len);
if (error != 0) if (error != 0)
@ -588,10 +588,10 @@ main(int argc, char **argv)
} }
else if (g_strcasecmp(argv[1], "test") == 0) else if (g_strcasecmp(argv[1], "test") == 0)
{ {
g_writeln(""); g_writeln("%s", "");
g_writeln("testing 512 bit key"); g_writeln("testing 512 bit key");
key_test512(); key_test512();
g_writeln(""); g_writeln("%s", "");
g_writeln("testing 2048 bit key"); g_writeln("testing 2048 bit key");
key_test2048(); key_test2048();
return 0; return 0;

@ -109,7 +109,7 @@ g_hexdump(char *p, int len)
g_printf("%c", (line[i] >= 0x20 && line[i] < 0x7f) ? line[i] : '.'); g_printf("%c", (line[i] >= 0x20 && line[i] < 0x7f) ? line[i] : '.');
} }
g_writeln(""); g_writeln("%s", "");
offset += thisline; offset += thisline;
line += thisline; line += thisline;
} }

@ -344,16 +344,16 @@ main(int argc, char **argv)
g_strncasecmp(argv[1], "--help", 255) == 0 || g_strncasecmp(argv[1], "--help", 255) == 0 ||
g_strncasecmp(argv[1], "-h", 255) == 0) g_strncasecmp(argv[1], "-h", 255) == 0)
{ {
g_writeln(""); g_writeln("%s", "");
g_writeln("xrdp: A Remote Desktop Protocol server."); g_writeln("xrdp: A Remote Desktop Protocol server.");
g_writeln("Copyright (C) Jay Sorg 2004-2011"); g_writeln("Copyright (C) Jay Sorg 2004-2011");
g_writeln("See http://xrdp.sourceforge.net for more information."); g_writeln("See http://xrdp.sourceforge.net for more information.");
g_writeln(""); g_writeln("%s", "");
g_writeln("Usage: xrdp [options]"); g_writeln("Usage: xrdp [options]");
g_writeln(" -h: show help"); g_writeln(" -h: show help");
g_writeln(" -install: install service"); g_writeln(" -install: install service");
g_writeln(" -remove: remove service"); g_writeln(" -remove: remove service");
g_writeln(""); g_writeln("%s", "");
g_exit(0); g_exit(0);
} }
else if (g_strncasecmp(argv[1], "-install", 255) == 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("Unknown Parameter");
g_writeln("xrdp -h for help"); g_writeln("xrdp -h for help");
g_writeln(""); g_writeln("%s", "");
g_exit(0); g_exit(0);
} }
} }
@ -431,7 +431,7 @@ main(int argc, char **argv)
{ {
g_writeln("Unknown Parameter"); g_writeln("Unknown Parameter");
g_writeln("xrdp -h for help"); g_writeln("xrdp -h for help");
g_writeln(""); g_writeln("%s", "");
g_exit(0); g_exit(0);
} }
@ -499,34 +499,34 @@ main(int argc, char **argv)
g_strncasecmp(argv[1], "--help", 255) == 0 || g_strncasecmp(argv[1], "--help", 255) == 0 ||
g_strncasecmp(argv[1], "-h", 255) == 0) g_strncasecmp(argv[1], "-h", 255) == 0)
{ {
g_writeln(""); g_writeln("%s", "");
g_writeln("xrdp: A Remote Desktop Protocol server."); g_writeln("xrdp: A Remote Desktop Protocol server.");
g_writeln("Copyright (C) Jay Sorg 2004-2011"); g_writeln("Copyright (C) Jay Sorg 2004-2011");
g_writeln("See http://xrdp.sourceforge.net for more information."); g_writeln("See http://xrdp.sourceforge.net for more information.");
g_writeln(""); g_writeln("%s", "");
g_writeln("Usage: xrdp [options]"); g_writeln("Usage: xrdp [options]");
g_writeln(" -h: show help"); g_writeln(" -h: show help");
g_writeln(" -nodaemon: don't fork into background"); g_writeln(" -nodaemon: don't fork into background");
g_writeln(" -kill: shut down xrdp"); g_writeln(" -kill: shut down xrdp");
g_writeln(""); g_writeln("%s", "");
g_exit(0); g_exit(0);
} }
else if ((g_strncasecmp(argv[1], "-v", 255) == 0) || else if ((g_strncasecmp(argv[1], "-v", 255) == 0) ||
(g_strncasecmp(argv[1], "--version", 255) == 0)) (g_strncasecmp(argv[1], "--version", 255) == 0))
{ {
g_writeln(""); g_writeln("%s", "");
g_writeln("xrdp: A Remote Desktop Protocol server."); g_writeln("xrdp: A Remote Desktop Protocol server.");
g_writeln("Copyright (C) Jay Sorg 2004-2011"); g_writeln("Copyright (C) Jay Sorg 2004-2011");
g_writeln("See http://xrdp.sourceforge.net for more information."); g_writeln("See http://xrdp.sourceforge.net for more information.");
g_writeln("Version %s", PACKAGE_VERSION); g_writeln("Version %s", PACKAGE_VERSION);
g_writeln(""); g_writeln("%s", "");
g_exit(0); g_exit(0);
} }
else else
{ {
g_writeln("Unknown Parameter"); g_writeln("Unknown Parameter");
g_writeln("xrdp -h for help"); g_writeln("xrdp -h for help");
g_writeln(""); g_writeln("%s", "");
g_exit(0); g_exit(0);
} }
} }
@ -534,7 +534,7 @@ main(int argc, char **argv)
{ {
g_writeln("Unknown Parameter"); g_writeln("Unknown Parameter");
g_writeln("xrdp -h for help"); g_writeln("xrdp -h for help");
g_writeln(""); g_writeln("%s", "");
g_exit(0); g_exit(0);
} }

Loading…
Cancel
Save