SwallowOS/xorg_lib_libfontenc
1
0
Fork 0
mirror of https://github.com/SwallowOS/xorg_lib_libfontenc synced 2025-11-03 21:42:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

Strip trailing whitespace

Browse Source 
Performed with: find * -type f | xargs perl -i -p -e 's{[ \t]+$}{}'
git diff -w & git diff -b show no diffs from this change

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
This commit is contained in:
Alan Coopersmith
2011-09-16 22:07:14 -07:00
parent 272b776fbd
commit 1da600011b
3 changed files with 46 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile.am
View File

@@ -1,6 +1,6 @@
#
#
# Copyright 2005 Red Hat, Inc.
#
#
# Permission to use, copy, modify, distribute, and sell this software and its
# documentation for any purpose is hereby granted without fee, provided that
# the above copyright notice appear in all copies and that both that
@@ -10,7 +10,7 @@
# specific, written prior permission. Red Hat makes no
# representations about the suitability of this software for any purpose. It
# is provided "as is" without express or implied warranty.
#
#
# RED HAT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
# INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
# EVENT SHALL RED HAT BE LIABLE FOR ANY SPECIAL, INDIRECT OR

34
src/encparse.c
View File

@@ -85,7 +85,7 @@ skipEndOfLine(FontFilePtr f, int c)
{
if(c == 0)
c = FontFileGetc(f);
for(;;)
if(c <= 0 || c == '\n')
return;
@@ -125,7 +125,7 @@ getnum(FontFilePtr f, int c, int *cp)
*cp = c; return n;
}
/* Skip to beginning of new line; return 1 if only whitespace was found. */
static int
endOfLine(FontFilePtr f, int c)
@@ -362,7 +362,7 @@ getnextline(FontFilePtr f)
return ERROR_LINE;
}
} else if(!strcasecmp(keyword_value, "ENDENCODING")) {
if(endOfLine(f,c))
if(endOfLine(f,c))
return EOF_LINE;
else
return ERROR_LINE;
@@ -380,7 +380,7 @@ getnextline(FontFilePtr f)
}
}
static void
static void
install_mapping(FontEncPtr encoding, FontMapPtr mapping)
{
FontMapPtr m;
@@ -637,7 +637,7 @@ parseEncodingFile(FontFilePtr f, int headerOnly)
goto error;
}
goto mapping;
case CODE_UNDEFINE_LINE:
if(value1 > 0x10000)
value1 = 0x10000;
@@ -658,7 +658,7 @@ parseEncodingFile(FontFilePtr f, int headerOnly)
default: goto mapping; /* ignore unknown lines */
}
string_mapping:
line = getnextline(f);
switch(line) {
@@ -791,16 +791,16 @@ parseFontFileName(const char *fontFileName, char *buf, char *dir)
{
const char *p;
char *q, *lastslash;
for(p = fontFileName, q = dir, lastslash = NULL; *p; p++, q++) {
*q = *p;
if(*p == '/')
lastslash = q+1;
}
if(!lastslash)
lastslash = dir;
*lastslash = '\0';
if(buf && strlen(dir) + 14 < MAXFONTFILENAMELEN) {
@@ -810,7 +810,7 @@ parseFontFileName(const char *fontFileName, char *buf, char *dir)
}
static FontEncPtr
FontEncReallyReallyLoad(const char *charset,
FontEncReallyReallyLoad(const char *charset,
const char *dirname, const char *dir)
{
FontFilePtr f;
@@ -820,14 +820,14 @@ FontEncReallyReallyLoad(const char *charset,
buf[MAXFONTFILENAMELEN];
int count, n;
static char format[24] = "";
/* As we don't really expect to open encodings that often, we don't
take the trouble of caching encodings directories. */
if((file = fopen(dirname, "r")) == NULL) {
return NULL;
}
count = fscanf(file, "%d\n", &n);
if(count == EOF || count != 1) {
fclose(file);
@@ -861,7 +861,7 @@ FontEncReallyReallyLoad(const char *charset,
f = FontFileOpen(buf);
if(f == NULL) {
fclose(file);
fclose(file);
return NULL;
}
encoding = parseEncodingFile(f, 0);
@@ -875,7 +875,7 @@ FontEncReallyReallyLoad(const char *charset,
return encoding;
}
/* Parser ntrypoint -- used by FontEncLoad */
/* Parser ntrypoint -- used by FontEncLoad */
FontEncPtr
FontEncReallyLoad(const char *charset, const char *fontFileName)
{
@@ -889,14 +889,14 @@ FontEncReallyLoad(const char *charset, const char *fontFileName)
if(encoding)
return(encoding);
}
d = FontEncDirectory();
if(d) {
parseFontFileName(d, NULL, dir);
encoding = FontEncReallyReallyLoad(charset, d, dir);
return encoding;
}
return NULL;
}
@@ -911,7 +911,7 @@ FontEncIdentify(const char *fileName)
FontEncPtr encoding;
char **names, **name, **alias;
int numaliases;
if((f = FontFileOpen(fileName))==NULL) {
return NULL;
}

52
src/fontenc.c
View File

@@ -59,7 +59,7 @@ static FontMapRec iso10646[]=
There's not much more we can do with fonts without a Unicode cmap
unless we are willing to combine cmaps (which we are not). */
static const unsigned short
static const unsigned short
iso8859_1_apple_roman[]=
{ 0xCA, 0xC1, 0xA2, 0xA3, 0xDB, 0xB4, 0x00, 0xA4,
0xAC, 0xA9, 0xBB, 0xC7, 0xC2, 0x00, 0xA8, 0xF8,
@@ -212,7 +212,7 @@ static const unsigned short iso8859_5_tophalf[]=
static FontEncSimpleMapRec iso8859_5_to_unicode_map=
{ 0x60, 0, 0xA0, iso8859_5_tophalf };
static const unsigned short
static const unsigned short
iso8859_5_apple_cyrillic[]=
{ 0xCA, 0xDD, 0xAB, 0xAE, 0xB8, 0xC1, 0xA7, 0xBA,
0xB7, 0xBC, 0xBE, 0xCB, 0xCD, 0x00, 0xD8, 0xDA,
@@ -253,7 +253,7 @@ iso8859_6_to_unicode(unsigned isocode, void *client_data)
{
if(isocode<=0xA0 || isocode==0xA4 || isocode==0xAD)
return isocode;
else if(isocode==0xAC || isocode==0xBB ||
else if(isocode==0xAC || isocode==0xBB ||
(isocode>=0xBF && isocode<=0xDA) ||
(isocode>=0xE0 && isocode<=0xEF) ||
(isocode>=0xF0 && isocode<=0xF2))
@@ -268,7 +268,7 @@ static FontMapRec iso8859_6[]=
{0,0,0,NULL,NULL,NULL,NULL,NULL}
};
static unsigned
static unsigned
iso8859_7_to_unicode(unsigned isocode, void *client_data)
{
if(isocode<=0xA0 ||
@@ -305,7 +305,7 @@ iso8859_8_to_unicode(unsigned isocode, void *client_data)
return 0x2017;
else if(isocode>=0xE0 && isocode<=0xFA)
return isocode+0x04F0;
else
else
return 0;
}
@@ -410,7 +410,7 @@ static FontMapRec koi8_r[]=
{0,0,0,NULL,NULL,NULL,NULL,NULL}
};
static unsigned
static unsigned
koi8_ru_to_unicode(unsigned koicode, void *client_data)
{
switch(koicode) {
@@ -458,7 +458,7 @@ koi8_e_to_unicode(unsigned koicode, void *client_data)
return koicode;
else if(koicode<0xC0)
return koi8_e_A0_BF[koicode-0xA0];
else
else
return FontEncSimpleRecode(koicode, &koi8_r_to_unicode_map);
}
@@ -480,7 +480,7 @@ static const unsigned short koi8_uni_80_BF[]=
0x2116, 0x0402, 0x0403, 0x0401, 0x0404, 0x0405, 0x0406, 0x0407,
0x0408, 0x0409, 0x040A, 0x040B, 0x040C, 0x0490, 0x040E, 0x040F };
static unsigned
static unsigned
koi8_uni_to_unicode(unsigned koicode, void *client_data)
{
if(koicode<0x80)
@@ -499,7 +499,7 @@ static FontMapRec koi8_uni[]=
/* Ukrainian variant of Koi8-R; see RFC 2319 */
static unsigned
static unsigned
koi8_u_to_unicode(unsigned koicode, void *client_data)
{
switch(koicode) {
@@ -526,9 +526,9 @@ static FontMapRec koi8_u[]=
the glyph index before applying the cmap. Lovely design. */
static FontMapRec microsoft_symbol[]=
{{FONT_ENCODING_TRUETYPE,3,0,NULL,NULL,NULL,NULL,NULL},
{{FONT_ENCODING_TRUETYPE,3,0,NULL,NULL,NULL,NULL,NULL},
/* You never know */
{FONT_ENCODING_TRUETYPE,3,1,NULL,NULL,NULL,NULL,NULL},
{FONT_ENCODING_TRUETYPE,3,1,NULL,NULL,NULL,NULL,NULL},
{0,0,0,NULL,NULL,NULL,NULL,NULL}};
static FontMapRec apple_roman[]=
@@ -619,15 +619,15 @@ FontEncFromXLFD(const char *name, int length)
if(p == NULL)
return NULL;
len = length - (p - name) - 1;
memcpy(charset, p+1, len);
charset[len] = 0;
/* check for a subset specification */
if((q = strchr(charset, (int)'[')))
*q = 0;
return charset;
}
@@ -659,7 +659,7 @@ FontEncName(unsigned code, FontMapPtr mapping)
if(encoding && mapping->name) {
if((encoding->row_size == 0 && code >= encoding->size) ||
(encoding->row_size != 0 &&
(code/0x100 >= encoding->size ||
(code/0x100 >= encoding->size ||
(code&0xFF) >= encoding->row_size)))
return NULL;
return (*mapping->name)(code, mapping->client_data);
@@ -672,9 +672,9 @@ FontEncFind(const char *encoding_name, const char *filename)
{
FontEncPtr encoding;
char **alias;
if(font_encodings == NULL) define_initial_encoding_info();
for(encoding = font_encodings; encoding; encoding = encoding->next) {
if(!strcasecmp(encoding->name, encoding_name))
return encoding;
@@ -725,14 +725,14 @@ static FontEncPtr
FontEncLoad(const char *encoding_name, const char *filename)
{
FontEncPtr encoding;
encoding = FontEncReallyLoad(encoding_name, filename);
if (encoding == NULL) {
return NULL;
} else {
char **alias;
int found = 0;
/* Check whether the name is already known for this encoding */
if(strcasecmp(encoding->name, encoding_name) == 0) {
found = 1;
@@ -745,14 +745,14 @@ FontEncLoad(const char *encoding_name, const char *filename)
}
}
}
if(!found) {
/* Add a new alias. This works because we know that this
particular encoding has been allocated dynamically */
char **new_aliases;
char *new_name;
int numaliases = 0;
new_name = strdup(encoding_name);
if(new_name == NULL)
return NULL;
@@ -773,11 +773,11 @@ FontEncLoad(const char *encoding_name, const char *filename)
new_aliases[numaliases+1] = NULL;
encoding->aliases = new_aliases;
}
/* register the new encoding */
encoding->next=font_encodings;
font_encodings=encoding;
return encoding;
}
}
@@ -798,7 +798,7 @@ FontEncSimpleRecode(unsigned code, void *client_data)
else
index = code;
if(map->map && index>=map->first && index<map->first+map->len)
if(map->map && index>=map->first && index<map->first+map->len)
return map->map[index-map->first];
else
return code;
@@ -865,7 +865,7 @@ tree_set(unsigned int **map, unsigned int i, unsigned int j)
c = i % FONTENC_SEGMENT_SIZE;
if(map[s] == NULL) {
map[s] = calloc(FONTENC_SEGMENT_SIZE, sizeof(int));
map[s] = calloc(FONTENC_SEGMENT_SIZE, sizeof(int));
if(map[s] == NULL)
return FALSE;
}
@@ -923,7 +923,7 @@ FontMapReverseFree(FontMapReversePtr delendum)
{
unsigned int **map = (unsigned int**)delendum;
int i;
if(map == NULL)
return;