summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan Coopersmith <alan.coopersmith@oracle.com>2014-06-04 23:36:45 -0700
committerAlan Coopersmith <alan.coopersmith@oracle.com>2014-06-04 23:36:45 -0700
commitfa577a18f189fe454995306d38059570e1ad8bf2 (patch)
tree7673a81157c5a9e54dbc9f9d71b5edc3a9fe9f22
parent5e0f1b91edb97759e2c07ec233c2ce8639c8e0fe (diff)
Constify some more strings in API arguments
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
-rw-r--r--include/X11/fonts/FSlib.h13
-rw-r--r--src/FSOpenFont.c2
-rw-r--r--src/FSQGlyphs.c4
-rw-r--r--src/FSQXExt.c4
-rw-r--r--src/FSQuExt.c2
5 files changed, 12 insertions, 13 deletions
diff --git a/include/X11/fonts/FSlib.h b/include/X11/fonts/FSlib.h
index ee6f245..3debd77 100644
--- a/include/X11/fonts/FSlib.h
+++ b/include/X11/fonts/FSlib.h
@@ -249,7 +249,7 @@ extern FSSyncHandler FSSetAfterFunction(FSServer *, FSSyncHandler);
extern const char * FSServerName ( const char *server );
extern char ** FSListExtensions ( FSServer *svr, int *next );
-extern int FSQueryExtension ( FSServer *svr, char *name, int *major_opcode,
+extern int FSQueryExtension ( FSServer *svr, const char *name, int *major_opcode,
int *first_event, int *first_error );
extern char ** FSListCatalogues ( FSServer *svr, const char *pattern,
@@ -267,7 +267,7 @@ extern char ** FSListFontsWithXInfo ( FSServer *svr, const char *pattern,
FSPropOffset ***offsets,
unsigned char ***prop_data );
extern Font FSOpenBitmapFont ( FSServer *svr, FSBitmapFormat hint,
- FSBitmapFormatMask fmask, char *name,
+ FSBitmapFormatMask fmask, const char *name,
Font *otherid );
extern int FSSync ( FSServer *svr, Bool discard );
@@ -278,7 +278,6 @@ extern int FSGetErrorDatabaseText ( FSServer *svr, const char *name,
const char *type, const char *defaultp,
char *buffer, int nbytes );
extern int FSGetErrorText ( FSServer *svr, int code, char *buffer,
-
int nbytes );
extern int FSFlush ( FSServer *svr );
extern int FSFreeFontNames ( char **list );
@@ -286,18 +285,18 @@ extern int FSFreeCatalogues ( char **list );
extern int FSFreeExtensionList ( char **list );
extern int FSNextEvent ( FSServer *svr, FSEvent *event );
extern int FSQueryXBitmaps8 ( FSServer *svr, Font fid, FSBitmapFormat format,
- int range_type, unsigned char *str,
+ int range_type, const unsigned char *str,
unsigned long str_len, FSOffset **offsets,
unsigned char **glyphdata );
extern int FSQueryXBitmaps16 ( FSServer *svr, Font fid, FSBitmapFormat format,
- int range_type, FSChar2b *str,
+ int range_type, const FSChar2b *str,
unsigned long str_len, FSOffset **offsets,
unsigned char **glyphdata );
extern int FSQueryXExtents8 ( FSServer *svr, Font fid, int range_type,
- unsigned char *str, unsigned long str_len,
+ const unsigned char *str, unsigned long str_len,
FSXCharInfo **extents );
extern int FSQueryXExtents16 ( FSServer *svr, Font fid, int range_type,
- FSChar2b *str, unsigned long str_len,
+ const FSChar2b *str, unsigned long str_len,
FSXCharInfo **extents );
extern int FSQueryXInfo ( FSServer *svr, Font fid, FSXFontInfoHeader *info,
FSPropInfo *props, FSPropOffset **offsets,
diff --git a/src/FSOpenFont.c b/src/FSOpenFont.c
index 0dcaaf8..d35b75e 100644
--- a/src/FSOpenFont.c
+++ b/src/FSOpenFont.c
@@ -59,7 +59,7 @@ FSOpenBitmapFont(
FSServer *svr,
FSBitmapFormat hint,
FSBitmapFormatMask fmask,
- char *name,
+ const char *name,
Font *otherid)
{
unsigned int nbytes;
diff --git a/src/FSQGlyphs.c b/src/FSQGlyphs.c
index 9681ef0..0c6523e 100644
--- a/src/FSQGlyphs.c
+++ b/src/FSQGlyphs.c
@@ -60,7 +60,7 @@ FSQueryXBitmaps8(
Font fid,
FSBitmapFormat format,
Bool range_type,
- unsigned char *str,
+ const unsigned char *str,
unsigned long str_len,
FSOffset **offsets,
unsigned char **glyphdata)
@@ -129,7 +129,7 @@ FSQueryXBitmaps16(
Font fid,
FSBitmapFormat format,
Bool range_type,
- FSChar2b *str,
+ const FSChar2b *str,
unsigned long str_len,
FSOffset **offsets,
unsigned char **glyphdata)
diff --git a/src/FSQXExt.c b/src/FSQXExt.c
index e730df5..4ad63ac 100644
--- a/src/FSQXExt.c
+++ b/src/FSQXExt.c
@@ -70,7 +70,7 @@ FSQueryXExtents8(
FSServer *svr,
Font fid,
Bool range_type,
- unsigned char *str,
+ const unsigned char *str,
unsigned long str_len,
FSXCharInfo **extents)
{
@@ -116,7 +116,7 @@ FSQueryXExtents16(
FSServer *svr,
Font fid,
Bool range_type,
- FSChar2b *str,
+ const FSChar2b *str,
unsigned long str_len,
FSXCharInfo **extents)
{
diff --git a/src/FSQuExt.c b/src/FSQuExt.c
index 774a571..fa3dd7e 100644
--- a/src/FSQuExt.c
+++ b/src/FSQuExt.c
@@ -57,7 +57,7 @@ in this Software without prior written authorization from The Open Group.
Bool
FSQueryExtension(
FSServer *svr,
- char *name,
+ const char *name,
int *major_opcode,
int *first_event,
int *first_error)