diff options
Diffstat (limited to 'nx-X11/programs')
| -rw-r--r-- | nx-X11/programs/Xserver/hw/nxagent/Font.c | 45 |
1 files changed, 15 insertions, 30 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Font.c b/nx-X11/programs/Xserver/hw/nxagent/Font.c index a11fbda3c..93fb93295 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Font.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Font.c @@ -707,8 +707,6 @@ static XFontStruct *nxagentLoadBestQueryFont(Display* dpy, char *fontName, FontP */ char *searchFields[FIELDS+1]; char *fontNameFields[FIELDS+1]; - int i; - int j; int numSearchFields = 0; int numFontFields = 0; int weight = 0; @@ -748,7 +746,7 @@ static XFontStruct *nxagentLoadBestQueryFont(Display* dpy, char *fontName, FontP } else { - for (i = 1 ; i < nxagentRemoteFontList.length ; i++) + for (int i = 1 ; i < nxagentRemoteFontList.length ; i++) { numSearchFields = nxagentSplitString(nxagentRemoteFontList.list[i]->name, searchFields, FIELDS+1, "-"); @@ -773,7 +771,7 @@ static XFontStruct *nxagentLoadBestQueryFont(Display* dpy, char *fontName, FontP tempWeight = 0; - for (j = 0; j < FIELDS; j++) + for (int j = 0; j < FIELDS; j++) { if (strcasecmp(searchFields[fieldOrder[j]], fontNameFields[fieldOrder[j]]) == 0 || strcmp(searchFields[fieldOrder[j]], "") == 0 || @@ -801,7 +799,7 @@ static XFontStruct *nxagentLoadBestQueryFont(Display* dpy, char *fontName, FontP #endif } - for (j = 0; j < numSearchFields; j++) + for (int j = 0; j < numSearchFields; j++) { SAFE_free(searchFields[j]); } @@ -818,7 +816,7 @@ static XFontStruct *nxagentLoadBestQueryFont(Display* dpy, char *fontName, FontP fontStruct = nxagentLoadQueryFont(dpy, substFontBuf, pFont); - for (j = 0; j < numFontFields; j++) + for (int j = 0; j < numFontFields; j++) { SAFE_free(fontNameFields[j]); } @@ -828,13 +826,12 @@ static XFontStruct *nxagentLoadBestQueryFont(Display* dpy, char *fontName, FontP static void nxagentFontDisconnect(FontPtr pFont, XID param1, void * param2) { - nxagentPrivFont *privFont; Bool *pBool = (Bool*)param2; if (pFont == NULL || !*pBool) return; - privFont = nxagentFontPriv(pFont); + nxagentPrivFont *privFont = nxagentFontPriv(pFont); #ifdef NXAGENT_RECONNECT_FONT_DEBUG fprintf(stderr, "nxagentFontDisconnect: pFont %p, XID %lx\n", @@ -931,13 +928,12 @@ static void nxagentCollectFailedFont(FontPtr fpt, XID id) static void nxagentFontReconnect(FontPtr pFont, XID param1, void * param2) { int i; - nxagentPrivFont *privFont; Bool *pBool = (Bool*)param2; if (pFont == NULL) return; - privFont = nxagentFontPriv(pFont); + nxagentPrivFont *privFont = nxagentFontPriv(pFont); #ifdef NXAGENT_RECONNECT_FONT_DEBUG fprintf(stderr, "nxagentFontReconnect: pFont %p - XID %lx - name %s\n", @@ -1622,26 +1618,17 @@ int nxagentFreeFont(XFontStruct *fs) int nxagentSplitString(char *string, char *fields[], int nfields, char *sep) { - int seplen; - int fieldlen; - int last; - int len; - int i; - - char *current; - char *next; - - seplen = strlen(sep); - len = strlen(string); + int seplen = strlen(sep); + int len = strlen(string); - current = string; + char *current = string; - i = 0; - last = 0; + int i = 0; + int last = 0; for (;;) { - next = NULL; + char *next = NULL; if (current < string + len) { @@ -1654,7 +1641,7 @@ int nxagentSplitString(char *string, char *fields[], int nfields, char *sep) last = 1; } - fieldlen = next - current; + int fieldlen = next - current; if (i < nfields) { @@ -1681,8 +1668,6 @@ int nxagentSplitString(char *string, char *fields[], int nfields, char *sep) char *nxagentMakeScalableFontName(const char *fontName, int scalableResolution) { char *scalableFontName; - const char *s; - int field; /* FIXME: use str(n)dup()? */ if ((scalableFontName = malloc(strlen(fontName) + 1)) == NULL) @@ -1701,9 +1686,9 @@ char *nxagentMakeScalableFontName(const char *fontName, int scalableResolution) goto MakeScalableFontNameError; } - s = fontName; + const char *s = fontName; - field = 0; + int field = 0; while (s != NULL) { |