[janitor] programs/wcmd -Wwrite-strings cleanup
Daniel Marmier
d.marmier at bluewin.ch
Wed Oct 8 14:56:29 CDT 2003
Fixed warnings with gcc option "-Wwrite-strings".
-------------- next part --------------
Index: programs/wcmd/builtins.c
===================================================================
RCS file: /home/wine/wine/programs/wcmd/builtins.c,v
retrieving revision 1.19
diff -u -r1.19 builtins.c
--- programs/wcmd/builtins.c 11 Jul 2003 03:49:19 -0000 1.19
+++ programs/wcmd/builtins.c 8 Oct 2003 19:41:07 -0000
@@ -101,7 +101,7 @@
WIN32_FIND_DATA fd;
HANDLE hff;
BOOL force, status;
-static char *overwrite = "Overwrite file (Y/N)?";
+static const char *overwrite = "Overwrite file (Y/N)?";
char string[8], outpath[MAX_PATH], inpath[MAX_PATH], *infile;
if ((strchr(param1,'*') != NULL) && (strchr(param1,'%') != NULL)) {
@@ -207,9 +207,9 @@
* in DOS (try typing "ECHO ON AGAIN" for an example).
*/
-void WCMD_echo (char *command) {
+void WCMD_echo (const char *command) {
-static char *eon = "Echo is ON\n", *eoff = "Echo is OFF\n";
+static const char *eon = "Echo is ON\n", *eoff = "Echo is OFF\n";
int count;
count = strlen(command);
@@ -805,7 +805,7 @@
void WCMD_verify (char *command) {
-static char *von = "Verify is ON\n", *voff = "Verify is OFF\n";
+static const char *von = "Verify is ON\n", *voff = "Verify is OFF\n";
int count;
count = strlen(command);
Index: programs/wcmd/wcmd.h
===================================================================
RCS file: /home/wine/wine/programs/wcmd/wcmd.h,v
retrieving revision 1.11
diff -u -r1.11 wcmd.h
--- programs/wcmd/wcmd.h 5 Sep 2003 23:15:42 -0000 1.11
+++ programs/wcmd/wcmd.h 8 Oct 2003 19:41:07 -0000
@@ -40,7 +40,7 @@
void WCMD_create_dir (void);
void WCMD_delete (int recurse);
void WCMD_directory (void);
-void WCMD_echo (char *);
+void WCMD_echo (const char *);
void WCMD_enter_paged_mode(void);
void WCMD_for (char *);
void WCMD_give_help (char *command);
@@ -48,8 +48,8 @@
void WCMD_if (char *);
void WCMD_leave_paged_mode(void);
void WCMD_move (void);
-void WCMD_output (char *format, ...);
-void WCMD_output_asis (char *message);
+void WCMD_output (const char *format, ...);
+void WCMD_output_asis (const char *message);
void WCMD_parse (char *s, char *q, char *p1, char *p2);
void WCMD_pause (void);
void WCMD_pipe (char *command);
Index: programs/wcmd/wcmdmain.c
===================================================================
RCS file: /home/wine/wine/programs/wcmd/wcmdmain.c,v
retrieving revision 1.37
diff -u -r1.37 wcmdmain.c
--- programs/wcmd/wcmdmain.c 11 Sep 2003 20:41:26 -0000 1.37
+++ programs/wcmd/wcmdmain.c 8 Oct 2003 19:41:10 -0000
@@ -27,7 +27,7 @@
#include "ntstatus.h"
#include "wcmd.h"
-char *inbuilt[] = {"ATTRIB", "CALL", "CD", "CHDIR", "CLS", "COPY", "CTTY",
+const char *inbuilt[] = {"ATTRIB", "CALL", "CD", "CHDIR", "CLS", "COPY", "CTTY",
"DATE", "DEL", "DIR", "ECHO", "ERASE", "FOR", "GOTO",
"HELP", "IF", "LABEL", "MD", "MKDIR", "MOVE", "PATH", "PAUSE",
"PROMPT", "REM", "REN", "RENAME", "RD", "RMDIR", "SET", "SHIFT",
@@ -728,7 +728,7 @@
*
*/
-void WCMD_output (char *format, ...) {
+void WCMD_output (const char *format, ...) {
va_list ap;
char string[1024];
@@ -766,7 +766,7 @@
* without formatting eg. when message contains '%'
*/
-void WCMD_output_asis (char *message) {
+void WCMD_output_asis (const char *message) {
DWORD count;
char* ptr;
char string[1024];
More information about the wine-patches
mailing list