wineps: String constification
Francois Gouget
fgouget at free.fr
Sat Apr 24 17:57:05 CDT 2004
Changelog:
* dlls/wineps/download.c
dlls/wineps/pen.c
dlls/wineps/ps.c
dlls/wineps/psdrv.h
dlls/wineps/type42.c
Make PSPEN.dash const. Declare the PEN dash strings as const.
Constify and staticify strings.
Index: dlls/wineps/download.c
===================================================================
RCS file: /var/cvs/wine/dlls/wineps/download.c,v
retrieving revision 1.10
diff -u -r1.10 download.c
--- a/dlls/wineps/download.c 12 Feb 2004 20:04:48 -0000 1.10
+++ b/dlls/wineps/download.c 24 Apr 2004 10:55:24 -0000
@@ -268,7 +268,7 @@
BOOL PSDRV_EmptyDownloadList(PSDRV_PDEVICE *physDev, BOOL write_undef)
{
DOWNLOAD *pdl, *old;
- char undef[] = "/%s findfont 40 scalefont setfont /%s undefinefont\n";
+ static const char undef[] = "/%s findfont 40 scalefont setfont /%s undefinefont\n";
char buf[sizeof(undef) + 200];
char *default_font = physDev->pi->ppd->DefaultFont ?
physDev->pi->ppd->DefaultFont : "Courier";
Index: dlls/wineps/pen.c
===================================================================
RCS file: /var/cvs/wine/dlls/wineps/pen.c,v
retrieving revision 1.13
diff -u -r1.13 pen.c
--- a/dlls/wineps/pen.c 20 Jan 2004 22:48:57 -0000 1.13
+++ b/dlls/wineps/pen.c 24 Apr 2004 10:55:24 -0000
@@ -28,11 +28,11 @@
WINE_DEFAULT_DEBUG_CHANNEL(psdrv);
-static char PEN_dash[] = "50 30"; /* ----- ----- ----- */
-static char PEN_dot[] = "20"; /* -- -- -- -- -- -- */
-static char PEN_dashdot[] = "40 30 20 30"; /* ---- -- ---- -- */
-static char PEN_dashdotdot[] = "40 20 20 20 20 20"; /* ---- -- -- ---- */
-static char PEN_alternate[] = "1";
+static const char* PEN_dash = "50 30"; /* ----- ----- ----- */
+static const char* PEN_dot = "20"; /* -- -- -- -- -- -- */
+static const char* PEN_dashdot = "40 30 20 30"; /* ---- -- ---- -- */
+static const char* PEN_dashdotdot = "40 20 20 20 20 20"; /* ---- -- -- ---- */
+static const char* PEN_alternate = "1";
/***********************************************************************
* SelectPen (WINEPS.@)
Index: dlls/wineps/ps.c
===================================================================
RCS file: /var/cvs/wine/dlls/wineps/ps.c,v
retrieving revision 1.26
diff -u -r1.26 ps.c
--- a/dlls/wineps/ps.c 12 Feb 2004 20:05:22 -0000 1.26
+++ b/dlls/wineps/ps.c 24 Apr 2004 10:55:24 -0000
@@ -617,7 +617,7 @@
BOOL PSDRV_WriteIndexColorSpaceEnd(PSDRV_PDEVICE *physDev)
{
- char buf[] = ">\n] setcolorspace\n";
+ static const char buf[] = ">\n] setcolorspace\n";
return PSDRV_WriteSpool(physDev, buf, sizeof(buf) - 1);
}
@@ -643,17 +643,17 @@
INT widthDst, INT heightDst, INT widthSrc,
INT heightSrc, char *bits, BOOL mask)
{
- const char start[] = "%d %d translate\n%d %d scale\n<<\n"
+ static const char start[] = "%d %d translate\n%d %d scale\n<<\n"
" /ImageType 1\n /Width %d\n /Height %d\n /BitsPerComponent %d\n"
" /ImageMatrix [%d 0 0 %d 0 %d]\n";
- const char decode1[] = " /Decode [0 %d]\n";
- const char decode3[] = " /Decode [0 1 0 1 0 1]\n";
+ static const char decode1[] = " /Decode [0 %d]\n";
+ static const char decode3[] = " /Decode [0 1 0 1 0 1]\n";
- const char end[] = " /DataSource currentfile /ASCII85Decode filter /RunLengthDecode filter\n>> image\n";
- const char endmask[] = " /DataSource currentfile /ASCII85Decode filter /RunLengthDecode filter\n>> imagemask\n";
+ static const char end[] = " /DataSource currentfile /ASCII85Decode filter /RunLengthDecode filter\n>> image\n";
+ static const char endmask[] = " /DataSource currentfile /ASCII85Decode filter /RunLengthDecode filter\n>> imagemask\n";
- const char endbits[] = " /DataSource <%s>\n>> image\n";
+ static const char endbits[] = " /DataSource <%s>\n>> image\n";
char *buf = HeapAlloc(PSDRV_Heap, 0, 1000);
@@ -775,10 +775,10 @@
BOOL PSDRV_WritePatternDict(PSDRV_PDEVICE *physDev, BITMAP *bm, BYTE *bits)
{
- const char start[] = "<<\n /PaintType 1\n /PatternType 1\n /TilingType 1\n "
+ static const char start[] = "<<\n /PaintType 1\n /PatternType 1\n /TilingType 1\n "
"/BBox [0 0 %d %d]\n /XStep %d\n /YStep %d\n /PaintProc {\n begin\n";
- const char end[] = " end\n }\n>>\n matrix makepattern setpattern\n";
+ static const char end[] = " end\n }\n>>\n matrix makepattern setpattern\n";
char *buf, *ptr;
INT w, h, x, y;
COLORREF map[2];
@@ -809,10 +809,10 @@
BOOL PSDRV_WriteDIBPatternDict(PSDRV_PDEVICE *physDev, BITMAPINFO *bmi, UINT usage)
{
- const char start[] = "<<\n /PaintType 1\n /PatternType 1\n /TilingType 1\n "
+ static const char start[] = "<<\n /PaintType 1\n /PatternType 1\n /TilingType 1\n "
"/BBox [0 0 %d %d]\n /XStep %d\n /YStep %d\n /PaintProc {\n begin\n";
- const char end[] = " end\n }\n>>\n matrix makepattern setpattern\n";
+ static const char end[] = " end\n }\n>>\n matrix makepattern setpattern\n";
char *buf, *ptr;
BYTE *bits;
INT w, h, x, y, colours;
Index: dlls/wineps/psdrv.h
===================================================================
RCS file: /var/cvs/wine/dlls/wineps/psdrv.h,v
retrieving revision 1.51
diff -u -r1.51 psdrv.h
--- a/dlls/wineps/psdrv.h 4 Mar 2004 06:26:11 -0000 1.51
+++ b/dlls/wineps/psdrv.h 24 Apr 2004 10:55:24 -0000
@@ -308,7 +308,7 @@
typedef struct {
INT style;
INT width;
- char *dash;
+ const char* dash;
PSCOLOR color;
BOOL set;
} PSPEN;
Index: dlls/wineps/type42.c
===================================================================
RCS file: /var/cvs/wine/dlls/wineps/type42.c,v
retrieving revision 1.9
diff -u -r1.9 type42.c
--- a/dlls/wineps/type42.c 7 Apr 2004 03:59:41 -0000 1.9
+++ b/dlls/wineps/type42.c 24 Apr 2004 10:55:24 -0000
@@ -142,7 +142,7 @@
WORD num_of_tables = sizeof(tables_templ) / sizeof(tables_templ[0]) - 1;
char *buf;
TYPE42 *t42;
- const char start[] = /* name, fontbbox */
+ static const char start[] = /* name, fontbbox */
"25 dict begin\n"
" /FontName /%s def\n"
" /Encoding 256 array 0 1 255{1 index exch /.notdef put} for\n"
@@ -155,10 +155,10 @@
" /.notdef 0 def\n"
" currentdict end def\n"
" /sfnts [\n";
- const char TT_offset_table[] = "<00010000%04x%04x%04x%04x\n";
- const char TT_table_dir_entry[] = "%08lx%08lx%08lx%08lx\n";
- const char storage[] ="]\nhavetype42gdir{pop}{{string} forall}ifelse\n";
- const char end[] = "] def\n"
+ static const char TT_offset_table[] = "<00010000%04x%04x%04x%04x\n";
+ static const char TT_table_dir_entry[] = "%08lx%08lx%08lx%08lx\n";
+ static const char storage[] ="]\nhavetype42gdir{pop}{{string} forall}ifelse\n";
+ static const char end[] = "] def\n"
"havetype42gdir{/GlyphDirectory 256 dict def\n"
" sfnts 0 get dup %ld (locx) putinterval %ld (glfx) putinterval}if\n"
"currentdict end dup /FontName get exch definefont pop\n";
--
Francois Gouget fgouget at free.fr http://fgouget.free.fr/
The software said it requires Win95 or better, so I installed Linux.
More information about the wine-patches
mailing list