Merge remote-tracking branch 'origin/released'

* origin/released:
  Update following packages:

Conflicts:
	X11/Xwinsock.h
	apps/xhost/xhost.c
	libXaw/src/Vendor.c
	libXfont/include/X11/fonts/bdfint.h
	libXfont/src/fontfile/catalogue.c

5 files changed, 78 insertions, 78 deletions

diff --git a/libXfont/include/X11/fonts/bdfint.h b/libXfont/include/X11/fonts/bdfint.h
index bd0786cb9..cc464cbdf 100644..100755
--- a/libXfont/include/X11/fonts/bdfint.h
+++ b/libXfont/include/X11/fonts/bdfint.h
@@ -65,23 +65,23 @@ typedef struct BDFSTAT {
     BOOL        haveDefaultCh;
 }           bdfFileState;
 
-extern void bdfError ( const char * message, ... );
-extern void bdfWarning ( cosnt char *message, ... );
-extern unsigned char * bdfGetLine ( FontFilePtr file, unsigned char *buf, 
+extern void bdfError ( const char * message, ... ) _X_ATTRIBUTE_PRINTF(1, 2);
+extern void bdfWarning ( const char *message, ... ) _X_ATTRIBUTE_PRINTF(1, 2);
+extern unsigned char * bdfGetLine ( FontFilePtr file, unsigned char *buf,
 				    int len );
 extern Atom bdfForceMakeAtom ( const char *str, int *size );
 extern Atom bdfGetPropertyValue ( char *s );
 extern int bdfIsInteger ( char *str );
 extern unsigned char bdfHexByte ( unsigned char *s );
-extern Bool bdfSpecialProperty ( FontPtr pFont, FontPropPtr prop, 
+extern Bool bdfSpecialProperty ( FontPtr pFont, FontPropPtr prop,
 				 char isString, bdfFileState *bdfState );
-extern int bdfReadFont( FontPtr pFont, FontFilePtr file, 
+extern int bdfReadFont( FontPtr pFont, FontFilePtr file,
 			int bit, int byte, int glyph, int scan );
 extern int bdfReadFontInfo( FontInfoPtr pFontInfo, FontFilePtr file );
 
-extern void FontCharInkMetrics ( FontPtr pFont, CharInfoPtr pCI, 
+extern void FontCharInkMetrics ( FontPtr pFont, CharInfoPtr pCI,
 				 xCharInfo *pInk );
-extern void FontCharReshape ( FontPtr pFont, CharInfoPtr pSrc, 
+extern void FontCharReshape ( FontPtr pFont, CharInfoPtr pSrc,
 			      CharInfoPtr pDst );
 
 #endif				/* BDFINT_H */
diff --git a/libXfont/include/X11/fonts/fntfil.h b/libXfont/include/X11/fonts/fntfil.h
index a66965a08..a32df63d7 100644
--- a/libXfont/include/X11/fonts/fntfil.h
+++ b/libXfont/include/X11/fonts/fntfil.h
@@ -76,62 +76,62 @@ extern int FontFileNameCheck ( char *name );
 extern int FontFileInitFPE ( FontPathElementPtr fpe );
 extern int FontFileResetFPE ( FontPathElementPtr fpe );
 extern int FontFileFreeFPE ( FontPathElementPtr fpe );
-extern int FontFileOpenFont ( pointer client, FontPathElementPtr fpe, 
-			      Mask flags, char *name, int namelen, 
-			      fsBitmapFormat format, fsBitmapFormatMask fmask, 
-			      XID id, FontPtr *pFont, char **aliasName, 
+extern int FontFileOpenFont ( pointer client, FontPathElementPtr fpe,
+			      Mask flags, char *name, int namelen,
+			      fsBitmapFormat format, fsBitmapFormatMask fmask,
+			      XID id, FontPtr *pFont, char **aliasName,
 			      FontPtr non_cachable_font );
 extern void FontFileCloseFont ( FontPathElementPtr fpe, FontPtr pFont );
-extern int FontFileOpenBitmap ( FontPathElementPtr fpe, FontPtr *pFont, 
-				int flags, FontEntryPtr entry, 
-				fsBitmapFormat format, 
+extern int FontFileOpenBitmap ( FontPathElementPtr fpe, FontPtr *pFont,
+				int flags, FontEntryPtr entry,
+				fsBitmapFormat format,
 				fsBitmapFormatMask fmask );
-extern int FontFileListFonts ( pointer client, FontPathElementPtr fpe, 
-			       char *pat, int len, int max, 
+extern int FontFileListFonts ( pointer client, FontPathElementPtr fpe,
+			       char *pat, int len, int max,
 			       FontNamesPtr names );
-extern int FontFileStartListFonts ( pointer client, FontPathElementPtr fpe, 
-				    char *pat, int len, int max, 
+extern int FontFileStartListFonts ( pointer client, FontPathElementPtr fpe,
+				    char *pat, int len, int max,
 				    pointer *privatep, int mark_aliases );
-extern int FontFileStartListFontsWithInfo ( pointer client, 
-					    FontPathElementPtr fpe, 
-					    char *pat, int len, int max, 
+extern int FontFileStartListFontsWithInfo ( pointer client,
+					    FontPathElementPtr fpe,
+					    char *pat, int len, int max,
 					    pointer *privatep );
-extern int FontFileListNextFontWithInfo ( pointer client, 
-					  FontPathElementPtr fpe, 
-					  char **namep, int *namelenp, 
-					  FontInfoPtr *pFontInfo, 
+extern int FontFileListNextFontWithInfo ( pointer client,
+					  FontPathElementPtr fpe,
+					  char **namep, int *namelenp,
+					  FontInfoPtr *pFontInfo,
 					  int *numFonts, pointer private );
-extern int FontFileStartListFontsAndAliases ( pointer client, 
-					      FontPathElementPtr fpe, 
-					      char *pat, int len, int max, 
+extern int FontFileStartListFontsAndAliases ( pointer client,
+					      FontPathElementPtr fpe,
+					      char *pat, int len, int max,
 					      pointer *privatep );
-extern int FontFileListNextFontOrAlias ( pointer client, 
-					 FontPathElementPtr fpe, 
-					 char **namep, int *namelenp, 
-					 char **resolvedp, int *resolvedlenp, 
+extern int FontFileListNextFontOrAlias ( pointer client,
+					 FontPathElementPtr fpe,
+					 char **namep, int *namelenp,
+					 char **resolvedp, int *resolvedlenp,
 					 pointer private );
 extern void FontFileRegisterLocalFpeFunctions ( void );
 extern void CatalogueRegisterLocalFpeFunctions ( void );
 
 
-extern FontEntryPtr FontFileAddEntry ( FontTablePtr table, 
+extern FontEntryPtr FontFileAddEntry ( FontTablePtr table,
 				       FontEntryPtr prototype );
-extern Bool FontFileAddFontAlias ( FontDirectoryPtr dir, char *aliasName, 
+extern Bool FontFileAddFontAlias ( FontDirectoryPtr dir, char *aliasName,
 				   char *fontName );
-extern Bool FontFileAddFontFile ( FontDirectoryPtr dir, char *fontName, 
+extern Bool FontFileAddFontFile ( FontDirectoryPtr dir, char *fontName,
 				  char *fileName );
 extern int FontFileCountDashes ( char *name, int namelen );
-extern FontEntryPtr FontFileFindNameInDir ( FontTablePtr table, 
+extern FontEntryPtr FontFileFindNameInDir ( FontTablePtr table,
 					    FontNamePtr pat );
 extern FontEntryPtr FontFileFindNameInScalableDir ( FontTablePtr table,
-						    FontNamePtr pat, 
+						    FontNamePtr pat,
 						    FontScalablePtr vals );
-extern int FontFileFindNamesInDir ( FontTablePtr table, FontNamePtr pat, 
+extern int FontFileFindNamesInDir ( FontTablePtr table, FontNamePtr pat,
 				    int max, FontNamesPtr names );
-extern int FontFileFindNamesInScalableDir ( FontTablePtr table, 
-					    FontNamePtr pat, int max, 
-					    FontNamesPtr names, 
-					    FontScalablePtr vals, 
+extern int FontFileFindNamesInScalableDir ( FontTablePtr table,
+					    FontNamePtr pat, int max,
+					    FontNamesPtr names,
+					    FontScalablePtr vals,
 					    int alias_behavior, int *newmax );
 
 extern void FontFileFreeDir ( FontDirectoryPtr dir );
@@ -151,26 +151,26 @@ extern Bool FontFilePriorityRegisterRenderer ( FontRendererPtr renderer,
                                                int priority );
 extern FontRendererPtr FontFileMatchRenderer ( char *fileName );
 
-extern Bool FontFileAddScaledInstance ( FontEntryPtr entry, 
-					FontScalablePtr vals, FontPtr pFont, 
+extern Bool FontFileAddScaledInstance ( FontEntryPtr entry,
+					FontScalablePtr vals, FontPtr pFont,
 					char *bitmapName );
 extern void FontFileSwitchStringsToBitmapPointers ( FontDirectoryPtr dir );
 extern void FontFileRemoveScaledInstance ( FontEntryPtr entry, FontPtr pFont );
 extern Bool FontFileCompleteXLFD ( FontScalablePtr vals, FontScalablePtr def );
-extern FontScaledPtr FontFileFindScaledInstance ( FontEntryPtr entry, 
-						  FontScalablePtr vals, 
+extern FontScaledPtr FontFileFindScaledInstance ( FontEntryPtr entry,
+						  FontScalablePtr vals,
 						  int noSpecificSize );
 
 extern Bool FontFileRegisterBitmapSource ( FontPathElementPtr fpe );
 extern void FontFileUnregisterBitmapSource ( FontPathElementPtr fpe );
 extern void FontFileEmptyBitmapSource ( void );
-extern int FontFileMatchBitmapSource ( FontPathElementPtr fpe, 
-				       FontPtr *pFont, int flags, 
-				       FontEntryPtr entry, 
-				       FontNamePtr zeroPat, 
-				       FontScalablePtr vals, 
-				       fsBitmapFormat format, 
-				       fsBitmapFormatMask fmask, 
+extern int FontFileMatchBitmapSource ( FontPathElementPtr fpe,
+				       FontPtr *pFont, int flags,
+				       FontEntryPtr entry,
+				       FontNamePtr zeroPat,
+				       FontScalablePtr vals,
+				       fsBitmapFormat format,
+				       fsBitmapFormatMask fmask,
 				       Bool noSpecificSize );
 
 extern int FontFileReadDirectory ( char *directory, FontDirectoryPtr *pdir );
diff --git a/libXfont/include/X11/fonts/fntfilst.h b/libXfont/include/X11/fonts/fntfilst.h
index 29e0a56fb..6e8645e16 100644
--- a/libXfont/include/X11/fonts/fntfilst.h
+++ b/libXfont/include/X11/fonts/fntfilst.h
@@ -124,34 +124,34 @@ typedef struct _FontDirectory {
 #define CAP_CHARSUBSETTING	0x2
 
 typedef struct _FontRenderer {
-    char    *fileSuffix;
+    const char    *fileSuffix;
     int	    fileSuffixLen;
-    int	    (*OpenBitmap)(FontPathElementPtr /* fpe */, 
+    int	    (*OpenBitmap)(FontPathElementPtr /* fpe */,
 			  FontPtr * /* pFont */,
-			  int /* flags */, 
-			  FontEntryPtr /* entry */, 
-			  char * /* fileName */, 
-			  fsBitmapFormat /* format */, 
+			  int /* flags */,
+			  FontEntryPtr /* entry */,
+			  char * /* fileName */,
+			  fsBitmapFormat /* format */,
 			  fsBitmapFormatMask /* mask */,
 			  FontPtr /* non_cachable_font */);
-    int	    (*OpenScalable)(FontPathElementPtr /* fpe */, 
-			    FontPtr * /* pFont */, 
-			    int /* flags */, 
-			    FontEntryPtr /* entry */, 
-			    char * /* fileName */, 
-			    FontScalablePtr /* vals */, 
-			    fsBitmapFormat /* format */, 
+    int	    (*OpenScalable)(FontPathElementPtr /* fpe */,
+			    FontPtr * /* pFont */,
+			    int /* flags */,
+			    FontEntryPtr /* entry */,
+			    char * /* fileName */,
+			    FontScalablePtr /* vals */,
+			    fsBitmapFormat /* format */,
 			    fsBitmapFormatMask /* fmask */,
 			    FontPtr /* non_cachable_font */);
-    int	    (*GetInfoBitmap)(FontPathElementPtr /* fpe */, 
-			     FontInfoPtr /* pFontInfo */, 
-			     FontEntryPtr /* entry */, 
+    int	    (*GetInfoBitmap)(FontPathElementPtr /* fpe */,
+			     FontInfoPtr /* pFontInfo */,
+			     FontEntryPtr /* entry */,
 			     char * /*fileName */);
-    int	    (*GetInfoScalable)(FontPathElementPtr /* fpe */, 
-			       FontInfoPtr /* pFontInfo */, 
-			       FontEntryPtr /* entry */, 
+    int	    (*GetInfoScalable)(FontPathElementPtr /* fpe */,
+			       FontInfoPtr /* pFontInfo */,
+			       FontEntryPtr /* entry */,
 			       FontNamePtr /* fontName */,
-			       char * /* fileName */, 
+			       char * /* fileName */,
 			       FontScalablePtr /* vals */);
     int	    number;
     int     capabilities;	/* Bitmap components defined above */
diff --git a/libXfont/include/X11/fonts/fontmisc.h b/libXfont/include/X11/fonts/fontmisc.h
index a1cce67f2..73a824789 100644
--- a/libXfont/include/X11/fonts/fontmisc.h
+++ b/libXfont/include/X11/fonts/fontmisc.h
@@ -81,11 +81,11 @@ FourByteSwap(
 
 extern int
 RepadBitmap (
-    char*, 
     char*,
-    unsigned, 
+    char*,
+    unsigned,
     unsigned,
-    int, 
+    int,
     int
 );
 
diff --git a/libXfont/include/X11/fonts/pcf.h b/libXfont/include/X11/fonts/pcf.h
index a5fdbcd01..ddce0a936 100644
--- a/libXfont/include/X11/fonts/pcf.h
+++ b/libXfont/include/X11/fonts/pcf.h
@@ -88,10 +88,10 @@ typedef struct _PCFTable {
 #define PCF_GLYPH_NAMES		    (1<<7)
 #define PCF_BDF_ACCELERATORS	    (1<<8)
 
-extern int pcfReadFont ( FontPtr pFont, FontFilePtr file, 
+extern int pcfReadFont ( FontPtr pFont, FontFilePtr file,
 			 int bit, int byte, int glyph, int scan );
 extern int pcfReadFontInfo ( FontInfoPtr pFontInfo, FontFilePtr file );
 extern int pcfWriteFont ( FontPtr pFont, FontFilePtr file );
-extern void pcfError ( const char *, ... );
+extern void pcfError ( const char *, ... ) _X_ATTRIBUTE_PRINTF(1, 2);
 
 #endif				/* _PCF_H_ */