wcmd: Constify strings

[Francois Gouget]

Changelog:

 * programs/wcmd/batch.c
   programs/wcmd/builtins.c
   programs/wcmd/directory.c
   programs/wcmd/wcmd.h
   programs/wcmd/wcmdmain.c

   Declare nyi, newline, version_string and anykey in wcmd.h rather than
declaring them extern in each file.
   Constify the strings.
   Use the string literals directly rather than declaring a constant
string variable that is used only once.


Index: programs/wcmd/batch.c
===================================================================
RCS file: /var/cvs/wine/programs/wcmd/batch.c,v
retrieving revision 1.11
diff -u -r1.11 batch.c
--- a/programs/wcmd/batch.c	25 Mar 2003 00:33:56 -0000	1.11
+++ b/programs/wcmd/batch.c	24 Apr 2004 10:55:24 -0000
@@ -22,9 +22,6 @@

 void WCMD_batch_command (char *line);

-extern char nyi[];
-extern char newline[];
-extern char version_string[];
 extern int echo_mode;
 extern char quals[MAX_PATH], param1[MAX_PATH], param2[MAX_PATH];
 extern BATCH_CONTEXT *context;
Index: programs/wcmd/builtins.c
===================================================================
RCS file: /var/cvs/wine/programs/wcmd/builtins.c,v
retrieving revision 1.23
diff -u -r1.23 builtins.c
--- a/programs/wcmd/builtins.c	22 Mar 2004 22:56:58 -0000	1.23
+++ b/programs/wcmd/builtins.c	24 Apr 2004 10:55:24 -0000
@@ -46,10 +46,6 @@

 extern HINSTANCE hinst;
 extern char *inbuilt[];
-extern char nyi[];
-extern char newline[];
-extern char version_string[];
-extern char anykey[];
 extern int echo_mode, verify_mode;
 extern char quals[MAX_PATH], param1[MAX_PATH], param2[MAX_PATH];
 extern BATCH_CONTEXT *context;
@@ -1027,7 +1023,6 @@
 DWORD count, serial;
 char string[MAX_PATH], label[MAX_PATH], curdir[MAX_PATH];
 BOOL status;
-static char syntax[] = "Syntax Error\n\n";

   if (lstrlen(path) == 0) {
     status = GetCurrentDirectory (sizeof(curdir), curdir);
@@ -1040,7 +1035,7 @@
   }
   else {
     if ((path[1] != ':') || (lstrlen(path) != 2)) {
-      WCMD_output_asis(syntax);
+      WCMD_output_asis("Syntax Error\n\n");
       return 0;
     }
     wsprintf (curdir, "%s\\", path);
Index: programs/wcmd/directory.c
===================================================================
RCS file: /var/cvs/wine/programs/wcmd/directory.c,v
retrieving revision 1.19
diff -u -r1.19 directory.c
--- a/programs/wcmd/directory.c	23 Jan 2004 01:51:33 -0000	1.19
+++ b/programs/wcmd/directory.c	24 Apr 2004 10:55:24 -0000
@@ -35,10 +35,6 @@
 char * WCMD_strrev (char *buff);


-extern char nyi[];
-extern char newline[];
-extern char version_string[];
-extern char anykey[];
 extern int echo_mode;
 extern char quals[MAX_PATH], param1[MAX_PATH], param2[MAX_PATH];
 extern DWORD errorlevel;
@@ -131,7 +127,6 @@
 void WCMD_list_directory (char *search_path, int level) {

 char string[1024], datestring[32], timestring[32];
-char mem_err[] = "Memory Allocation Error";
 char *p;
 char real_path[MAX_PATH];
 WIN32_FIND_DATA *fd;
@@ -193,7 +188,7 @@
     fd = realloc (fd, (entry_count+1)*sizeof(WIN32_FIND_DATA));
     if (fd == NULL) {
       FindClose (hff);
-      WCMD_output (mem_err);
+      WCMD_output ("Memory Allocation Error");
        return;
     }
   } while (FindNextFile(hff, (fd+entry_count)) != 0);
Index: programs/wcmd/wcmd.h
===================================================================
RCS file: /var/cvs/wine/programs/wcmd/wcmd.h,v
retrieving revision 1.14
diff -u -r1.14 wcmd.h
--- a/programs/wcmd/wcmd.h	22 Mar 2004 22:56:58 -0000	1.14
+++ b/programs/wcmd/wcmd.h	24 Apr 2004 10:55:24 -0000
@@ -137,3 +137,9 @@

 /* Must be last in list */
 #define WCMD_EXIT   38
+
+/* Some standard messages */
+extern const char* nyi;
+extern const char* newline;
+extern const char* version_string;
+extern const char* anykey;
Index: programs/wcmd/wcmdmain.c
===================================================================
RCS file: /var/cvs/wine/programs/wcmd/wcmdmain.c,v
retrieving revision 1.41
diff -u -r1.41 wcmdmain.c
--- a/programs/wcmd/wcmdmain.c	22 Mar 2004 22:56:58 -0000	1.41
+++ b/programs/wcmd/wcmdmain.c	24 Apr 2004 10:55:24 -0000
@@ -37,10 +37,10 @@
 HINSTANCE hinst;
 DWORD errorlevel;
 int echo_mode = 1, verify_mode = 0;
-char nyi[] = "Not Yet Implemented\n\n";
-char newline[] = "\n";
-char version_string[] = "WCMD Version 0.17\n\n";
-char anykey[] = "Press Return key to continue: ";
+const char* nyi = "Not Yet Implemented\n\n";
+const char* newline = "\n";
+const char* version_string = "WCMD Version 0.17\n\n";
+const char* anykey = "Press Return key to continue: ";
 char quals[MAX_PATH], param1[MAX_PATH], param2[MAX_PATH];
 BATCH_CONTEXT *context = NULL;


-- 
Francois Gouget         fgouget at free.fr        http://fgouget.free.fr/
                  A black hole is just God dividing by zero.