From: Peter Howkins <flibble@users.sourceforge.net>
Date: Thu, 30 Aug 2012 21:19:49 +0000 (+0100)
Subject: dtlogin: Resolve all -Wformat-security warnings
X-Git-Tag: 2.2.0b~24
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=89e76b2e9bfe4375ecbedf8464906f08b4493b56;p=oweals%2Fcde.git

dtlogin: Resolve all -Wformat-security warnings
---

diff --git a/cde/programs/dtlogin/dm.c b/cde/programs/dtlogin/dm.c
index 31635dcd..52bcb902 100644
--- a/cde/programs/dtlogin/dm.c
+++ b/cde/programs/dtlogin/dm.c
@@ -1623,17 +1623,17 @@ GettyMessage( struct display *d, int msgnum )
 	switch (msgnum) {
 	case 1:
 	
-	  fprintf(tf,(char *)ReadCatalog(MC_LABEL_SET,MC_SUS1_LABEL,MC_DEF_SUS1_LABEL));
+	  fprintf(tf, "%s", (char *)ReadCatalog(MC_LABEL_SET,MC_SUS1_LABEL,MC_DEF_SUS1_LABEL));
 
-	  fprintf(tf,(char *)ReadCatalog(MC_LABEL_SET,MC_SUS2_LABEL,MC_DEF_SUS2_LABEL));
+	  fprintf(tf, "%s", (char *)ReadCatalog(MC_LABEL_SET,MC_SUS2_LABEL,MC_DEF_SUS2_LABEL));
 
-	  fprintf(tf,(char *)ReadCatalog(MC_LABEL_SET,MC_SUS3_LABEL,MC_DEF_SUS3_LABEL));
+	  fprintf(tf, "%s", (char *)ReadCatalog(MC_LABEL_SET,MC_SUS3_LABEL,MC_DEF_SUS3_LABEL));
 
 	  break;
 	  
 	case 2:
 	
-	  fprintf(tf,(char *)ReadCatalog(MC_LABEL_SET,MC_RES_LABEL,MC_DEF_RES_LABEL));
+	  fprintf(tf, "%s", (char *)ReadCatalog(MC_LABEL_SET,MC_RES_LABEL,MC_DEF_RES_LABEL));
 
 	  break;
 	  
@@ -1643,7 +1643,7 @@ GettyMessage( struct display *d, int msgnum )
 		(char *)ReadCatalog(MC_LABEL_SET,MC_START_LBLDPY,MC_DEF_START_LBLDPY),
 		d->name);
 
-	  fprintf(tf,(char *)ReadCatalog(MC_LABEL_SET,MC_WAIT_LABEL,MC_DEF_WAIT_LABEL));
+	  fprintf(tf, "%s", (char *)ReadCatalog(MC_LABEL_SET,MC_WAIT_LABEL,MC_DEF_WAIT_LABEL));
 
 	  break;
 	  
diff --git a/cde/programs/dtlogin/error.c b/cde/programs/dtlogin/error.c
index 65be7445..1ddfe2ef 100644
--- a/cde/programs/dtlogin/error.c
+++ b/cde/programs/dtlogin/error.c
@@ -330,7 +330,7 @@ LogOutOfMem( unsigned char *fmt, ...)
     Va_start(args,fmt);
 
     if ( SyncErrorFile(1) ) {
-	fprintf(stderr,(char *)ReadCatalog(MC_ERROR_SET,MC_NO_MEMORY,MC_DEF_NO_MEMORY));
+	fprintf(stderr, "%s", (char *)ReadCatalog(MC_ERROR_SET,MC_NO_MEMORY,MC_DEF_NO_MEMORY));
 	vfprintf (stderr, (char *)fmt, args);
 	fflush (stderr);
     }