mirror of
https://github.com/X11Libre/xserver.git
synced 2026-10-07 23:02:23 +00:00
Introduce a consistent coding style
This is strictly the application of the script 'x-indent-all.sh' from util/modular. Compared to the patch that Daniel posted in January, I've added a few indent flags: -bap -psl -T PrivatePtr -T pmWait -T _XFUNCPROTOBEGIN -T _XFUNCPROTOEND -T _X_EXPORT The typedefs were needed to make the output of sdksyms.sh match the previous output, otherwise, the code is formatted badly enough that sdksyms.sh generates incorrect output. The generated code was compared with the previous version and found to be essentially identical -- "assert" line numbers and BUILD_TIME were the only differences found. The comparison was done with this script: dir1=$1 dir2=$2 for dir in $dir1 $dir2; do (cd $dir && find . -name '*.o' | while read file; do dir=`dirname $file` base=`basename $file .o` dump=$dir/$base.dump objdump -d $file > $dump done) done find $dir1 -name '*.dump' | while read dump; do otherdump=`echo $dump | sed "s;$dir1;$dir2;"` diff -u $dump $otherdump done Signed-off-by: Keith Packard <keithp@keithp.com> Acked-by: Daniel Stone <daniel@fooishbar.org> Acked-by: Alan Coopersmith <alan.coopersmith@oracle.com>
This commit is contained in:
Keith Packard
parent
75199129c6
commit
9838b7032e
1258 changed files with 264655 additions and 259938 deletions
|
|
@ -33,79 +33,78 @@ SOFTWARE.
|
|||
|
||||
typedef struct _DIXFontProp *DIXFontPropPtr;
|
||||
|
||||
extern _X_EXPORT Bool SetDefaultFont(char * /*defaultfontname*/);
|
||||
extern _X_EXPORT Bool SetDefaultFont(char * /*defaultfontname */ );
|
||||
|
||||
extern _X_EXPORT void QueueFontWakeup(FontPathElementPtr /*fpe*/);
|
||||
extern _X_EXPORT void QueueFontWakeup(FontPathElementPtr /*fpe */ );
|
||||
|
||||
extern _X_EXPORT void RemoveFontWakeup(FontPathElementPtr /*fpe*/);
|
||||
extern _X_EXPORT void RemoveFontWakeup(FontPathElementPtr /*fpe */ );
|
||||
|
||||
extern _X_EXPORT void FontWakeup(pointer /*data*/,
|
||||
int /*count*/,
|
||||
pointer /*LastSelectMask*/);
|
||||
extern _X_EXPORT void FontWakeup(pointer /*data */ ,
|
||||
int /*count */ ,
|
||||
pointer /*LastSelectMask */ );
|
||||
|
||||
extern _X_EXPORT int OpenFont(ClientPtr /*client*/,
|
||||
XID /*fid*/,
|
||||
Mask /*flags*/,
|
||||
unsigned /*lenfname*/,
|
||||
char * /*pfontname*/);
|
||||
extern _X_EXPORT int OpenFont(ClientPtr /*client */ ,
|
||||
XID /*fid */ ,
|
||||
Mask /*flags */ ,
|
||||
unsigned /*lenfname */ ,
|
||||
char * /*pfontname */ );
|
||||
|
||||
extern _X_EXPORT int CloseFont(pointer /*pfont*/,
|
||||
XID /*fid*/);
|
||||
extern _X_EXPORT int CloseFont(pointer /*pfont */ ,
|
||||
XID /*fid */ );
|
||||
|
||||
typedef struct _xQueryFontReply *xQueryFontReplyPtr;
|
||||
|
||||
extern _X_EXPORT void QueryFont(FontPtr /*pFont*/,
|
||||
xQueryFontReplyPtr /*pReply*/,
|
||||
int /*nProtoCCIStructs*/);
|
||||
extern _X_EXPORT void QueryFont(FontPtr /*pFont */ ,
|
||||
xQueryFontReplyPtr /*pReply */ ,
|
||||
int /*nProtoCCIStructs */ );
|
||||
|
||||
extern _X_EXPORT int ListFonts(ClientPtr /*client*/,
|
||||
unsigned char * /*pattern*/,
|
||||
unsigned int /*length*/,
|
||||
unsigned int /*max_names*/);
|
||||
extern _X_EXPORT int ListFonts(ClientPtr /*client */ ,
|
||||
unsigned char * /*pattern */ ,
|
||||
unsigned int /*length */ ,
|
||||
unsigned int /*max_names */ );
|
||||
|
||||
extern _X_EXPORT int
|
||||
doListFontsWithInfo(ClientPtr /*client*/,
|
||||
LFWIclosurePtr /*c*/);
|
||||
doListFontsWithInfo(ClientPtr /*client */ ,
|
||||
LFWIclosurePtr /*c */ );
|
||||
|
||||
extern _X_EXPORT int doPolyText(ClientPtr /*client*/,
|
||||
PTclosurePtr /*c*/
|
||||
);
|
||||
extern _X_EXPORT int doPolyText(ClientPtr /*client */ ,
|
||||
PTclosurePtr /*c */
|
||||
);
|
||||
|
||||
extern _X_EXPORT int PolyText(ClientPtr /*client*/,
|
||||
DrawablePtr /*pDraw*/,
|
||||
GCPtr /*pGC*/,
|
||||
unsigned char * /*pElt*/,
|
||||
unsigned char * /*endReq*/,
|
||||
int /*xorg*/,
|
||||
int /*yorg*/,
|
||||
int /*reqType*/,
|
||||
XID /*did*/);
|
||||
extern _X_EXPORT int PolyText(ClientPtr /*client */ ,
|
||||
DrawablePtr /*pDraw */ ,
|
||||
GCPtr /*pGC */ ,
|
||||
unsigned char * /*pElt */ ,
|
||||
unsigned char * /*endReq */ ,
|
||||
int /*xorg */ ,
|
||||
int /*yorg */ ,
|
||||
int /*reqType */ ,
|
||||
XID /*did */ );
|
||||
|
||||
extern _X_EXPORT int doImageText(ClientPtr /*client*/,
|
||||
ITclosurePtr /*c*/);
|
||||
extern _X_EXPORT int doImageText(ClientPtr /*client */ ,
|
||||
ITclosurePtr /*c */ );
|
||||
|
||||
extern _X_EXPORT int ImageText(ClientPtr /*client*/,
|
||||
DrawablePtr /*pDraw*/,
|
||||
GCPtr /*pGC*/,
|
||||
int /*nChars*/,
|
||||
unsigned char * /*data*/,
|
||||
int /*xorg*/,
|
||||
int /*yorg*/,
|
||||
int /*reqType*/,
|
||||
XID /*did*/);
|
||||
extern _X_EXPORT int ImageText(ClientPtr /*client */ ,
|
||||
DrawablePtr /*pDraw */ ,
|
||||
GCPtr /*pGC */ ,
|
||||
int /*nChars */ ,
|
||||
unsigned char * /*data */ ,
|
||||
int /*xorg */ ,
|
||||
int /*yorg */ ,
|
||||
int /*reqType */ ,
|
||||
XID /*did */ );
|
||||
|
||||
extern _X_EXPORT int SetFontPath(ClientPtr /*client*/,
|
||||
int /*npaths*/,
|
||||
unsigned char * /*paths*/);
|
||||
extern _X_EXPORT int SetFontPath(ClientPtr /*client */ ,
|
||||
int /*npaths */ ,
|
||||
unsigned char * /*paths */ );
|
||||
|
||||
extern _X_EXPORT int SetDefaultFontPath(char * /*path*/);
|
||||
extern _X_EXPORT int SetDefaultFontPath(char * /*path */ );
|
||||
|
||||
extern _X_EXPORT int GetFontPath(ClientPtr client,
|
||||
int *count,
|
||||
int *length,
|
||||
unsigned char **result);
|
||||
int *count,
|
||||
int *length, unsigned char **result);
|
||||
|
||||
extern _X_EXPORT void DeleteClientFontStuff(ClientPtr /*client*/);
|
||||
extern _X_EXPORT void DeleteClientFontStuff(ClientPtr /*client */ );
|
||||
|
||||
/* Quartz support on Mac OS X pulls in the QuickDraw
|
||||
framework whose InitFonts function conflicts here. */
|
||||
|
|
@ -116,30 +115,30 @@ extern _X_EXPORT void InitFonts(void);
|
|||
|
||||
extern _X_EXPORT void FreeFonts(void);
|
||||
|
||||
extern _X_EXPORT FontPtr find_old_font(XID /*id*/);
|
||||
extern _X_EXPORT FontPtr find_old_font(XID /*id */ );
|
||||
|
||||
extern _X_EXPORT void GetGlyphs(FontPtr /*font*/,
|
||||
unsigned long /*count*/,
|
||||
unsigned char * /*chars*/,
|
||||
FontEncoding /*fontEncoding*/,
|
||||
unsigned long * /*glyphcount*/,
|
||||
CharInfoPtr * /*glyphs*/);
|
||||
extern _X_EXPORT void GetGlyphs(FontPtr /*font */ ,
|
||||
unsigned long /*count */ ,
|
||||
unsigned char * /*chars */ ,
|
||||
FontEncoding /*fontEncoding */ ,
|
||||
unsigned long * /*glyphcount */ ,
|
||||
CharInfoPtr * /*glyphs */ );
|
||||
|
||||
extern _X_EXPORT void QueryGlyphExtents(FontPtr /*pFont*/,
|
||||
CharInfoPtr * /*charinfo*/,
|
||||
unsigned long /*count*/,
|
||||
ExtentInfoPtr /*info*/);
|
||||
extern _X_EXPORT void QueryGlyphExtents(FontPtr /*pFont */ ,
|
||||
CharInfoPtr * /*charinfo */ ,
|
||||
unsigned long /*count */ ,
|
||||
ExtentInfoPtr /*info */ );
|
||||
|
||||
extern _X_EXPORT Bool QueryTextExtents(FontPtr /*pFont*/,
|
||||
unsigned long /*count*/,
|
||||
unsigned char * /*chars*/,
|
||||
ExtentInfoPtr /*info*/);
|
||||
extern _X_EXPORT Bool QueryTextExtents(FontPtr /*pFont */ ,
|
||||
unsigned long /*count */ ,
|
||||
unsigned char * /*chars */ ,
|
||||
ExtentInfoPtr /*info */ );
|
||||
|
||||
extern _X_EXPORT Bool ParseGlyphCachingMode(char * /*str*/);
|
||||
extern _X_EXPORT Bool ParseGlyphCachingMode(char * /*str */ );
|
||||
|
||||
extern _X_EXPORT void InitGlyphCaching(void);
|
||||
|
||||
extern _X_EXPORT void SetGlyphCachingMode(int /*newmode*/);
|
||||
extern _X_EXPORT void SetGlyphCachingMode(int /*newmode */ );
|
||||
|
||||
extern _X_EXPORT void register_fpe_functions(void);
|
||||
|
||||
|
|
@ -157,28 +156,28 @@ extern _X_EXPORT int GetDefaultPointSize(void);
|
|||
extern _X_EXPORT Font GetNewFontClientID(void);
|
||||
|
||||
extern _X_EXPORT int init_fs_handlers(FontPathElementPtr fpe,
|
||||
BlockHandlerProcPtr block_handler);
|
||||
BlockHandlerProcPtr block_handler);
|
||||
|
||||
extern _X_EXPORT int RegisterFPEFunctions(NameCheckFunc name_func,
|
||||
InitFpeFunc init_func,
|
||||
FreeFpeFunc free_func,
|
||||
ResetFpeFunc reset_func,
|
||||
OpenFontFunc open_func,
|
||||
CloseFontFunc close_func,
|
||||
ListFontsFunc list_func,
|
||||
StartLfwiFunc start_lfwi_func,
|
||||
NextLfwiFunc next_lfwi_func,
|
||||
WakeupFpeFunc wakeup_func,
|
||||
ClientDiedFunc client_died,
|
||||
LoadGlyphsFunc load_glyphs,
|
||||
StartLaFunc start_list_alias_func,
|
||||
NextLaFunc next_list_alias_func,
|
||||
SetPathFunc set_path_func);
|
||||
InitFpeFunc init_func,
|
||||
FreeFpeFunc free_func,
|
||||
ResetFpeFunc reset_func,
|
||||
OpenFontFunc open_func,
|
||||
CloseFontFunc close_func,
|
||||
ListFontsFunc list_func,
|
||||
StartLfwiFunc start_lfwi_func,
|
||||
NextLfwiFunc next_lfwi_func,
|
||||
WakeupFpeFunc wakeup_func,
|
||||
ClientDiedFunc client_died,
|
||||
LoadGlyphsFunc load_glyphs,
|
||||
StartLaFunc start_list_alias_func,
|
||||
NextLaFunc next_list_alias_func,
|
||||
SetPathFunc set_path_func);
|
||||
|
||||
extern _X_EXPORT void remove_fs_handlers(FontPathElementPtr fpe,
|
||||
BlockHandlerProcPtr blockHandler,
|
||||
Bool all);
|
||||
BlockHandlerProcPtr blockHandler,
|
||||
Bool all);
|
||||
|
||||
extern _X_EXPORT int StoreFontClientFont(FontPtr pfont, Font id);
|
||||
|
||||
#endif /* DIXFONT_H */
|
||||
#endif /* DIXFONT_H */
|
||||
|
|
|
|||
Loading…
Reference in a new issue