summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan Coopersmith <alan.coopersmith@oracle.com>2023-01-14 18:06:58 -0800
committerAlan Coopersmith <alan.coopersmith@oracle.com>2023-01-15 10:54:38 -0800
commitf536e9d910088d689ff010259f413d0abea915e5 (patch)
treee2f106157922687b609802eaf1a76a59591e9e7d
parent982c9d064fc05740374ae6fed02045527adb7d6a (diff)
Mark more char * as const
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
-rw-r--r--XFontName.c12
-rw-r--r--XFontName.h2
-rw-r--r--font.c12
3 files changed, 13 insertions, 13 deletions
diff --git a/XFontName.c b/XFontName.c
index 203cc60..6897e27 100644
--- a/XFontName.c
+++ b/XFontName.c
@@ -12,8 +12,8 @@
#include "XFontName.h"
#include <ctype.h>
-static char *
-extractStringField(char *name, char *buffer, int size,
+static const char *
+extractStringField(const char *name, char *buffer, int size,
unsigned int *attrp, unsigned int bit)
{
char *buf = buffer;
@@ -34,8 +34,8 @@ extractStringField(char *name, char *buffer, int size,
return name;
}
-static char *
-extractUnsignedField(char *name, unsigned int *result,
+static const char *
+extractUnsignedField(const char *name, unsigned int *result,
unsigned int *attrp, unsigned int bit)
{
char buf[256];
@@ -57,10 +57,10 @@ extractUnsignedField(char *name, unsigned int *result,
}
Bool
-XParseFontName(XFontNameString fontNameString, XFontName *fontName,
+XParseFontName(const char *fontNameString, XFontName *fontName,
unsigned int *fontNameAttributes)
{
- char *name = fontNameString;
+ const char *name = fontNameString;
XFontName temp;
unsigned int attributes = 0;
diff --git a/XFontName.h b/XFontName.h
index db83b69..5ea7f1a 100644
--- a/XFontName.h
+++ b/XFontName.h
@@ -47,7 +47,7 @@ typedef struct _xFontName {
typedef char XFontNameString[256];
-extern Bool XParseFontName(XFontNameString, XFontName *, unsigned int *);
+extern Bool XParseFontName(const char *, XFontName *, unsigned int *);
extern Bool XFormatFontName(XFontName *, unsigned int, XFontNameString);
#endif
diff --git a/font.c b/font.c
index 3cbb454..4e9059f 100644
--- a/font.c
+++ b/font.c
@@ -103,8 +103,8 @@ LookupFontSizeBySize(DviWidget dw, DviFontList *f, int size)
return best;
}
-static char *
-SkipFontNameElement(char *n)
+static const char *
+SkipFontNameElement(const char *n)
{
while (*n != '-') {
if (!*++n)
@@ -118,7 +118,7 @@ SkipFontNameElement(char *n)
#ifndef USE_XFT
static int
-ConvertFontNameToSize(char *n)
+ConvertFontNameToSize(const char *n)
{
int i, size;
@@ -132,8 +132,8 @@ ConvertFontNameToSize(char *n)
}
#endif
-static char *
-ConvertFontNameToEncoding(char *n)
+static const char *
+ConvertFontNameToEncoding(const char *n)
{
for (int i = 0; i < EncodingPosition; i++) {
n = SkipFontNameElement(n);
@@ -185,7 +185,7 @@ ResetFonts(DviWidget dw)
}
static DviFontSizeList *
-InstallFontSizes(DviWidget dw, char *x_name, Boolean *scalablep)
+InstallFontSizes(DviWidget dw, const char *x_name, Boolean *scalablep)
{
#ifndef USE_XFT
char fontNameString[2048];