summaryrefslogtreecommitdiffstats
path: root/unix/tkUnixRFont.c
diff options
context:
space:
mode:
authornijtmans <nijtmans>2008-11-05 22:20:59 (GMT)
committernijtmans <nijtmans>2008-11-05 22:20:59 (GMT)
commit436906415b673fbac6d7ce14621ad07a9a78b4a2 (patch)
treebb9005f0a49cd1cc708acc016a5b556166154d74 /unix/tkUnixRFont.c
parenta7112d75b06f0c7bba86d032d765f74116f4c41e (diff)
downloadtk-436906415b673fbac6d7ce14621ad07a9a78b4a2.zip
tk-436906415b673fbac6d7ce14621ad07a9a78b4a2.tar.gz
tk-436906415b673fbac6d7ce14621ad07a9a78b4a2.tar.bz2
fix [Bug 2226093] const changes not all correct
more internal -Wwrite-string warning fixes
Diffstat (limited to 'unix/tkUnixRFont.c')
-rw-r--r--unix/tkUnixRFont.c14
1 files changed, 9 insertions, 5 deletions
diff --git a/unix/tkUnixRFont.c b/unix/tkUnixRFont.c
index 3bea31f..0a6be20 100644
--- a/unix/tkUnixRFont.c
+++ b/unix/tkUnixRFont.c
@@ -8,7 +8,7 @@
* See the file "license.terms" for information on usage and redistribution of
* this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tkUnixRFont.c,v 1.25 2008/04/27 22:39:13 dkf Exp $
+ * RCS: @(#) $Id: tkUnixRFont.c,v 1.26 2008/11/05 22:20:59 nijtmans Exp $
*/
#include "tkUnixInt.h"
@@ -121,7 +121,8 @@ GetTkFontAttributes(
XftFont *ftFont,
TkFontAttributes *faPtr)
{
- char *family = "Unknown", **familyPtr = &family;
+ const char *family = "Unknown";
+ const char *const *familyPtr = &family;
int weight, slant, size, pxsize;
double ptsize;
@@ -468,9 +469,12 @@ TkpGetSubFonts(
Tcl_Obj *objv[3], *listPtr, *resultPtr;
UnixFtFont *fontPtr = (UnixFtFont *) tkfont;
FcPattern *pattern;
- char *family = "Unknown", **familyPtr = &family;
- char *foundry = "Unknown", **foundryPtr = &foundry;
- char *encoding = "Unknown", **encodingPtr = &encoding;
+ const char *family = "Unknown";
+ const char *const *familyPtr = &family;
+ const char *foundry = "Unknown";
+ const char *const *foundryPtr = &foundry;
+ const char *encoding = "Unknown";
+ const char *const *encodingPtr = &encoding;
int i;
resultPtr = Tcl_NewListObj(0, NULL);