diff options
author | marha <marha@users.sourceforge.net> | 2012-04-10 15:05:45 +0200 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2012-04-10 15:05:45 +0200 |
commit | 4b35ef19b76849cbd854c3b6f92bbc1c2d50f2d8 (patch) | |
tree | 3ddf28be6916dd5ea27837431b5be8c94017cd9a /libXpm/src/WrFFrI.c | |
parent | 5564e91e3cf4ba5cb2fbebbc2d63d18f588016b8 (diff) | |
parent | 5f8448ef6b85a9ff72c5af4cec99183c8bb60dc6 (diff) | |
download | vcxsrv-4b35ef19b76849cbd854c3b6f92bbc1c2d50f2d8.tar.gz vcxsrv-4b35ef19b76849cbd854c3b6f92bbc1c2d50f2d8.tar.bz2 vcxsrv-4b35ef19b76849cbd854c3b6f92bbc1c2d50f2d8.zip |
Merge remote-tracking branch 'origin/released'
Diffstat (limited to 'libXpm/src/WrFFrI.c')
-rw-r--r-- | libXpm/src/WrFFrI.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/libXpm/src/WrFFrI.c b/libXpm/src/WrFFrI.c index f2726f995..b592fa154 100644 --- a/libXpm/src/WrFFrI.c +++ b/libXpm/src/WrFFrI.c @@ -51,7 +51,7 @@ #endif /* MS Windows define a function called WriteFile @#%#&!!! */ -LFUNC(xpmWriteFile, int, (FILE *file, XpmImage *image, char *name, +LFUNC(xpmWriteFile, int, (FILE *file, XpmImage *image, const char *name, XpmInfo *info)); LFUNC(WriteColors, void, (FILE *file, XpmColor *colors, unsigned int ncolors)); @@ -104,7 +104,8 @@ XpmWriteFileFromXpmImage( XpmInfo *info) { xpmData mdata; - char *name, *dot, *s, new_name[BUFSIZ] = {0}; + const char *name; + char *dot, *s, new_name[BUFSIZ] = {0}; int ErrorStatus; /* open file to write */ @@ -143,7 +144,7 @@ XpmWriteFileFromXpmImage( name = new_name; } /* change '-' to '_' */ - s = name; + s = new_name; while ((dot = strchr(s, '-'))) { *dot = '_'; s = dot; @@ -165,7 +166,7 @@ static int xpmWriteFile( FILE *file, XpmImage *image, - char *name, + const char *name, XpmInfo *info) { /* calculation variables */ @@ -256,8 +257,8 @@ WritePixels( unsigned int x, y, h; h = height - 1; - if (cpp != 0 && width >= (UINT_MAX - 3)/cpp) - return XpmNoMemory; + if (cpp != 0 && width >= (UINT_MAX - 3)/cpp) + return XpmNoMemory; p = buf = (char *) XpmMalloc(width * cpp + 3); if (!buf) return (XpmNoMemory); |