diff options
author | Adam Jackson <ajax@benzedrine.nwnk.net> | 2007-06-07 14:20:27 -0400 |
---|---|---|
committer | Adam Jackson <ajax@benzedrine.nwnk.net> | 2007-06-07 14:20:27 -0400 |
commit | 9739e750a7ca4b86ddb89674b104e9b9a8b61014 (patch) | |
tree | e068b1a4bbf8abc57ceb87a6a243ac9977187cbc | |
parent | 87db45f5eb7880395735f7bf3a8ee2d89b7e0122 (diff) |
Warning cleanup.
-rw-r--r-- | include/X11/fonts/pcf.h | 2 | ||||
-rw-r--r-- | src/Type1/paths.c | 2 | ||||
-rw-r--r-- | src/Type1/t1info.c | 5 | ||||
-rw-r--r-- | src/Type1/util.h | 1 | ||||
-rw-r--r-- | src/bitmap/bitscale.c | 2 | ||||
-rw-r--r-- | src/builtins/builtin.h | 8 | ||||
-rw-r--r-- | src/builtins/dir.c | 4 | ||||
-rw-r--r-- | src/builtins/file.c | 19 | ||||
-rw-r--r-- | src/builtins/fonts.c | 14 | ||||
-rw-r--r-- | src/builtins/fpe.c | 21 | ||||
-rw-r--r-- | src/builtins/render.c | 35 | ||||
-rw-r--r-- | src/fc/fserve.c | 2 |
12 files changed, 54 insertions, 61 deletions
diff --git a/include/X11/fonts/pcf.h b/include/X11/fonts/pcf.h index 33b0cef..673e184 100644 --- a/include/X11/fonts/pcf.h +++ b/include/X11/fonts/pcf.h @@ -36,6 +36,8 @@ from The Open Group. #ifndef _PCF_H_ #define _PCF_H_ +#include <X11/fonts/fntfilio.h> + /* * Information used to read/write PCF fonts */ diff --git a/src/Type1/paths.c b/src/Type1/paths.c index 1ab25ec..4fbb1b4 100644 --- a/src/Type1/paths.c +++ b/src/Type1/paths.c @@ -1030,6 +1030,8 @@ PathDelta(struct segment *p, /* input path */ { struct fractpoint mypoint; /* I pass this to TextDelta */ register fractpel x,y; /* working variables for path current point */ + + mypoint.x = mypoint.y = 0; for (x=y=0; p != NULL; p=p->link) { x += p->dest.x; diff --git a/src/Type1/t1info.c b/src/Type1/t1info.c index ec8ac90..eea22b3 100644 --- a/src/Type1/t1info.c +++ b/src/Type1/t1info.c @@ -92,11 +92,14 @@ from The Open Group. #include <X11/fonts/fontutil.h> #ifndef FONTMODULE #include <stdio.h> +#include <math.h> #else #include "xf86_ansic.h" #endif #include <X11/fonts/FSproto.h> +#include "objects.h" +#include "spaces.h" #include "fontfcn.h" #include "t1intf.h" @@ -467,7 +470,7 @@ T1FillFontInfo(FontPtr pFont, FontScalablePtr Vals, { FontInfoPtr pInfo = &pFont->info; struct type1font *p = (struct type1font *)pFont->fontPrivate; - long sAscent, sDescent; /* Scalable 1000-pixel values */ + long sAscent = 0, sDescent = 0; /* Scalable 1000-pixel values */ FillHeader(pInfo, Vals); diff --git a/src/Type1/util.h b/src/Type1/util.h index b66bd4c..25ba572 100644 --- a/src/Type1/util.h +++ b/src/Type1/util.h @@ -186,4 +186,5 @@ extern void objFormatString ( psobj *objP, int length, char *valueP ); extern void objFormatName ( psobj *objP, int length, char *valueP ); extern void objFormatFile ( psobj *objP, FILE *valueP ); +extern void T1InitStdProps(void); #endif diff --git a/src/bitmap/bitscale.c b/src/bitmap/bitscale.c index 8f7247e..e60aab5 100644 --- a/src/bitmap/bitscale.c +++ b/src/bitmap/bitscale.c @@ -1840,7 +1840,7 @@ BitmapOpenScalable (FontPathElementPtr fpe, dy, sdy, savedX, savedY; FontPropPtr props; - char *isStringProp; + char *isStringProp = NULL; int propCount; int status; long sWidth; diff --git a/src/builtins/builtin.h b/src/builtins/builtin.h index ea98407..f12f9b0 100644 --- a/src/builtins/builtin.h +++ b/src/builtins/builtin.h @@ -56,5 +56,9 @@ extern const int builtin_dir_count; extern const BuiltinAliasRec builtin_alias[]; extern const int builtin_alias_count; -extern FontFilePtr BuiltinFileOpen (); -extern int BuiltinFileClose (); +extern FontFilePtr BuiltinFileOpen (char *); +extern int BuiltinFileClose (BufFilePtr, int); +extern int BuiltinReadDirectory (char *, FontDirectoryPtr *); +extern void BuiltinRegisterFontFileFunctions (void); + +extern void BuiltinRegisterFpeFunctions (void); diff --git a/src/builtins/dir.c b/src/builtins/dir.c index fb2f82c..c272449 100644 --- a/src/builtins/dir.c +++ b/src/builtins/dir.c @@ -30,9 +30,7 @@ #include "builtin.h" int -BuiltinReadDirectory (directory, pdir) - char *directory; - FontDirectoryPtr *pdir; +BuiltinReadDirectory (char *directory, FontDirectoryPtr *pdir) { FontDirectoryPtr dir; int i; diff --git a/src/builtins/file.c b/src/builtins/file.c index 1f73134..863ecee 100644 --- a/src/builtins/file.c +++ b/src/builtins/file.c @@ -35,8 +35,7 @@ typedef struct _BuiltinIO { } BuiltinIORec, *BuiltinIOPtr; static int -BuiltinFill (f) - BufFilePtr f; +BuiltinFill (BufFilePtr f) { int left, len; BuiltinIOPtr io = ((BuiltinIOPtr) f->private); @@ -58,15 +57,12 @@ BuiltinFill (f) } static int -BuiltinSkip (f, count) - BufFilePtr f; - int count; +BuiltinSkip (BufFilePtr f, int count) { BuiltinIOPtr io = ((BuiltinIOPtr) f->private); int curoff; int fileoff; int todo; - int left; curoff = f->bufp - f->buffer; fileoff = curoff + f->left; @@ -86,8 +82,7 @@ BuiltinSkip (f, count) } static int -BuiltinClose (f, doClose) - BufFilePtr f; +BuiltinClose (BufFilePtr f, int unused) { BuiltinIOPtr io = ((BuiltinIOPtr) f->private); @@ -97,8 +92,7 @@ BuiltinClose (f, doClose) FontFilePtr -BuiltinFileOpen (name) - char *name; +BuiltinFileOpen (char *name) { int i; BuiltinIOPtr io; @@ -121,7 +115,7 @@ BuiltinFileOpen (name) xfree (io); return NULL; } - if (cooked = BufFilePushZIP (raw)) + if ((cooked = BufFilePushZIP (raw))) raw = cooked; else { @@ -132,8 +126,7 @@ BuiltinFileOpen (name) } int -BuiltinFileClose (f) - FontFilePtr f; +BuiltinFileClose (FontFilePtr f, int unused) { return BufFileClose ((BufFilePtr) f, TRUE); } diff --git a/src/builtins/fonts.c b/src/builtins/fonts.c index 24f42e2..ef5f5ef 100644 --- a/src/builtins/fonts.c +++ b/src/builtins/fonts.c @@ -1229,15 +1229,15 @@ static char name_6x13[] = "-misc-fixed-medium-r-semicondensed--13-120-75-75-c-60 static char name_cursor[] = "cursor"; const BuiltinFileRec builtin_files[] = { -"6x13.builtin", sizeof file_6x13, file_6x13, -"cursor.builtin", sizeof file_cursor, file_cursor, + { "6x13.builtin", sizeof file_6x13, file_6x13, }, + { "cursor.builtin", sizeof file_cursor, file_cursor, } }; const int builtin_files_count = sizeof (builtin_files) / sizeof (builtin_files[0]); const BuiltinDirRec builtin_dir[] = { -"6x13.builtin", name_6x13, -"cursor.builtin", name_cursor, + { "6x13.builtin", name_6x13, }, + { "cursor.builtin", name_cursor, } }; const int builtin_dir_count = sizeof (builtin_dir) / sizeof (builtin_dir[0]); @@ -1247,9 +1247,9 @@ static char alias_6x13[] = "6x13"; static char alias_6x13_100[] = "-misc-fixed-medium-r-semicondensed--13-100-100-100-c-60-iso8859-1"; const BuiltinAliasRec builtin_alias[] = { -alias_fixed, name_6x13, -alias_6x13, name_6x13, -alias_6x13_100, name_6x13, + { alias_fixed, name_6x13, }, + { alias_6x13, name_6x13, }, + { alias_6x13_100, name_6x13, } }; const int builtin_alias_count = sizeof (builtin_alias) / sizeof (builtin_alias[0]); diff --git a/src/builtins/fpe.c b/src/builtins/fpe.c index f4ee93a..8432382 100644 --- a/src/builtins/fpe.c +++ b/src/builtins/fpe.c @@ -29,21 +29,20 @@ #include <config.h> #endif #include <X11/fonts/fntfilst.h> +#include "builtin.h" static int font_file_type; const char builtin_fonts[] = "built-ins"; -int -BuiltinNameCheck (name) - char *name; +static int +BuiltinNameCheck (char *name) { return (strcmp (name, builtin_fonts) == 0); } -int -BuiltinInitFPE (fpe) - FontPathElementPtr fpe; +static int +BuiltinInitFPE (FontPathElementPtr fpe) { int status; FontDirectoryPtr dir; @@ -56,9 +55,8 @@ BuiltinInitFPE (fpe) } /* ARGSUSED */ -int -BuiltinResetFPE (fpe) - FontPathElementPtr fpe; +static int +BuiltinResetFPE (FontPathElementPtr fpe) { FontDirectoryPtr dir; @@ -67,9 +65,8 @@ BuiltinResetFPE (fpe) return Successful; } -int -BuiltinFreeFPE (fpe) - FontPathElementPtr fpe; +static int +BuiltinFreeFPE (FontPathElementPtr fpe) { FontFileFreeDir ((FontDirectoryPtr) fpe->private); return Successful; diff --git a/src/builtins/render.c b/src/builtins/render.c index 18389b4..871665f 100644 --- a/src/builtins/render.c +++ b/src/builtins/render.c @@ -29,20 +29,17 @@ #include <config.h> #endif #include <X11/fonts/fntfilst.h> +#include <X11/fonts/fontutil.h> +#include <X11/fonts/pcf.h> #include "builtin.h" -BuiltinOpenBitmap (fpe, ppFont, flags, entry, fileName, format, fmask) - FontPathElementPtr fpe; - FontPtr *ppFont; - int flags; - FontEntryPtr entry; - char *fileName; - fsBitmapFormat format; - fsBitmapFormatMask fmask; +static int +BuiltinOpenBitmap (FontPathElementPtr fpe, FontPtr *ppFont, int flags, + FontEntryPtr entry, char *fileName, fsBitmapFormat format, + fsBitmapFormatMask fmask, FontPtr unused) { FontFilePtr file; FontPtr pFont; - int i; int ret; int bit, byte, @@ -55,7 +52,7 @@ BuiltinOpenBitmap (fpe, ppFont, flags, entry, fileName, format, fmask) return BadFontName; pFont = (FontPtr) xalloc(sizeof(FontRec)); if (!pFont) { - BuiltinFileClose (file); + BuiltinFileClose (file, 0); return AllocError; } /* set up default values */ @@ -70,7 +67,7 @@ BuiltinOpenBitmap (fpe, ppFont, flags, entry, fileName, format, fmask) ret = pcfReadFont (pFont, file, bit, byte, glyph, scan); - BuiltinFileClose (file); + BuiltinFileClose (file, 0); if (ret != Successful) xfree(pFont); else @@ -78,22 +75,18 @@ BuiltinOpenBitmap (fpe, ppFont, flags, entry, fileName, format, fmask) return ret; } -BuiltinGetInfoBitmap (fpe, pFontInfo, entry, fileName) - FontPathElementPtr fpe; - FontInfoPtr pFontInfo; - FontEntryPtr entry; - char *fileName; +static int +BuiltinGetInfoBitmap (FontPathElementPtr fpe, FontInfoPtr pFontInfo, + FontEntryPtr entry, char *fileName) { FontFilePtr file; - int i; int ret; - FontRendererPtr renderer; file = BuiltinFileOpen (fileName); if (!file) return BadFontName; ret = pcfReadFontInfo (pFontInfo, file); - BuiltinFileClose (file); + BuiltinFileClose (file, 0); return ret; } @@ -123,12 +116,12 @@ BuiltinGetInfoScalable (FontPathElementPtr fpe, } static FontRendererRec renderers[] = { - ".builtin", 8, + { ".builtin", 8, BuiltinOpenBitmap, BuiltinOpenScalable, BuiltinGetInfoBitmap, BuiltinGetInfoScalable, - 0 + 0 } }; #define numRenderers (sizeof renderers / sizeof renderers[0]) diff --git a/src/fc/fserve.c b/src/fc/fserve.c index bce9241..804ac85 100644 --- a/src/fc/fserve.c +++ b/src/fc/fserve.c @@ -2779,7 +2779,7 @@ _fs_send_conn_client_prefix (FSFpePtr conn) static int _fs_recv_conn_setup (FSFpePtr conn) { - int ret; + int ret = FSIO_ERROR; fsConnSetup *setup; FSFpeAltPtr alts; int i, alt_len; |