mirror of
https://github.com/X11Libre/xserver.git
synced 2026-04-14 17:18:09 +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
@@ -22,7 +22,6 @@ Except as contained in this notice, the name of The Open Group shall not be
|
||||
used in advertising or otherwise to promote the sale, use or other dealings
|
||||
in this Software without prior written authorization from The Open Group.
|
||||
|
||||
|
||||
Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts.
|
||||
|
||||
All Rights Reserved
|
||||
@@ -70,120 +69,102 @@ SOFTWARE.
|
||||
#define AllAllocated 2
|
||||
#define BeingCreated 4
|
||||
|
||||
|
||||
typedef CARD32 Pixel;
|
||||
typedef struct _CMEntry *EntryPtr;
|
||||
|
||||
/* moved to screenint.h: typedef struct _ColormapRec *ColormapPtr */
|
||||
typedef struct _colorResource *colorResourcePtr;
|
||||
|
||||
extern _X_EXPORT int CreateColormap(
|
||||
Colormap /*mid*/,
|
||||
ScreenPtr /*pScreen*/,
|
||||
VisualPtr /*pVisual*/,
|
||||
ColormapPtr* /*ppcmap*/,
|
||||
int /*alloc*/,
|
||||
int /*client*/);
|
||||
extern _X_EXPORT int CreateColormap(Colormap /*mid */ ,
|
||||
ScreenPtr /*pScreen */ ,
|
||||
VisualPtr /*pVisual */ ,
|
||||
ColormapPtr * /*ppcmap */ ,
|
||||
int /*alloc */ ,
|
||||
int /*client */ );
|
||||
|
||||
extern _X_EXPORT int FreeColormap(
|
||||
pointer /*pmap*/,
|
||||
XID /*mid*/);
|
||||
extern _X_EXPORT int FreeColormap(pointer /*pmap */ ,
|
||||
XID /*mid */ );
|
||||
|
||||
extern _X_EXPORT int TellLostMap(
|
||||
WindowPtr /*pwin*/,
|
||||
pointer /* Colormap *pmid */);
|
||||
extern _X_EXPORT int TellLostMap(WindowPtr /*pwin */ ,
|
||||
pointer /* Colormap *pmid */ );
|
||||
|
||||
extern _X_EXPORT int TellGainedMap(
|
||||
WindowPtr /*pwin*/,
|
||||
pointer /* Colormap *pmid */);
|
||||
extern _X_EXPORT int TellGainedMap(WindowPtr /*pwin */ ,
|
||||
pointer /* Colormap *pmid */ );
|
||||
|
||||
extern _X_EXPORT int CopyColormapAndFree(
|
||||
Colormap /*mid*/,
|
||||
ColormapPtr /*pSrc*/,
|
||||
int /*client*/);
|
||||
extern _X_EXPORT int CopyColormapAndFree(Colormap /*mid */ ,
|
||||
ColormapPtr /*pSrc */ ,
|
||||
int /*client */ );
|
||||
|
||||
extern _X_EXPORT int AllocColor(
|
||||
ColormapPtr /*pmap*/,
|
||||
unsigned short* /*pred*/,
|
||||
unsigned short* /*pgreen*/,
|
||||
unsigned short* /*pblue*/,
|
||||
Pixel* /*pPix*/,
|
||||
int /*client*/);
|
||||
extern _X_EXPORT int AllocColor(ColormapPtr /*pmap */ ,
|
||||
unsigned short * /*pred */ ,
|
||||
unsigned short * /*pgreen */ ,
|
||||
unsigned short * /*pblue */ ,
|
||||
Pixel * /*pPix */ ,
|
||||
int /*client */ );
|
||||
|
||||
extern _X_EXPORT void FakeAllocColor(
|
||||
ColormapPtr /*pmap*/,
|
||||
xColorItem * /*item*/);
|
||||
extern _X_EXPORT void FakeAllocColor(ColormapPtr /*pmap */ ,
|
||||
xColorItem * /*item */ );
|
||||
|
||||
extern _X_EXPORT void FakeFreeColor(
|
||||
ColormapPtr /*pmap*/,
|
||||
Pixel /*pixel*/);
|
||||
extern _X_EXPORT void FakeFreeColor(ColormapPtr /*pmap */ ,
|
||||
Pixel /*pixel */ );
|
||||
|
||||
typedef int (*ColorCompareProcPtr)(
|
||||
EntryPtr /*pent*/,
|
||||
xrgb * /*prgb*/);
|
||||
typedef int (*ColorCompareProcPtr) (EntryPtr /*pent */ ,
|
||||
xrgb * /*prgb */ );
|
||||
|
||||
extern _X_EXPORT int FindColor(
|
||||
ColormapPtr /*pmap*/,
|
||||
EntryPtr /*pentFirst*/,
|
||||
int /*size*/,
|
||||
xrgb* /*prgb*/,
|
||||
Pixel* /*pPixel*/,
|
||||
int /*channel*/,
|
||||
int /*client*/,
|
||||
ColorCompareProcPtr /*comp*/);
|
||||
extern _X_EXPORT int FindColor(ColormapPtr /*pmap */ ,
|
||||
EntryPtr /*pentFirst */ ,
|
||||
int /*size */ ,
|
||||
xrgb * /*prgb */ ,
|
||||
Pixel * /*pPixel */ ,
|
||||
int /*channel */ ,
|
||||
int /*client */ ,
|
||||
ColorCompareProcPtr /*comp */ );
|
||||
|
||||
extern _X_EXPORT int QueryColors(
|
||||
ColormapPtr /*pmap*/,
|
||||
int /*count*/,
|
||||
Pixel* /*ppixIn*/,
|
||||
xrgb* /*prgbList*/,
|
||||
ClientPtr client);
|
||||
extern _X_EXPORT int QueryColors(ColormapPtr /*pmap */ ,
|
||||
int /*count */ ,
|
||||
Pixel * /*ppixIn */ ,
|
||||
xrgb * /*prgbList */ ,
|
||||
ClientPtr client);
|
||||
|
||||
extern _X_EXPORT int FreeClientPixels(
|
||||
pointer /*pcr*/,
|
||||
XID /*fakeid*/);
|
||||
extern _X_EXPORT int FreeClientPixels(pointer /*pcr */ ,
|
||||
XID /*fakeid */ );
|
||||
|
||||
extern _X_EXPORT int AllocColorCells(
|
||||
int /*client*/,
|
||||
ColormapPtr /*pmap*/,
|
||||
int /*colors*/,
|
||||
int /*planes*/,
|
||||
Bool /*contig*/,
|
||||
Pixel* /*ppix*/,
|
||||
Pixel* /*masks*/);
|
||||
extern _X_EXPORT int AllocColorCells(int /*client */ ,
|
||||
ColormapPtr /*pmap */ ,
|
||||
int /*colors */ ,
|
||||
int /*planes */ ,
|
||||
Bool /*contig */ ,
|
||||
Pixel * /*ppix */ ,
|
||||
Pixel * /*masks */ );
|
||||
|
||||
extern _X_EXPORT int AllocColorPlanes(
|
||||
int /*client*/,
|
||||
ColormapPtr /*pmap*/,
|
||||
int /*colors*/,
|
||||
int /*r*/,
|
||||
int /*g*/,
|
||||
int /*b*/,
|
||||
Bool /*contig*/,
|
||||
Pixel* /*pixels*/,
|
||||
Pixel* /*prmask*/,
|
||||
Pixel* /*pgmask*/,
|
||||
Pixel* /*pbmask*/);
|
||||
extern _X_EXPORT int AllocColorPlanes(int /*client */ ,
|
||||
ColormapPtr /*pmap */ ,
|
||||
int /*colors */ ,
|
||||
int /*r */ ,
|
||||
int /*g */ ,
|
||||
int /*b */ ,
|
||||
Bool /*contig */ ,
|
||||
Pixel * /*pixels */ ,
|
||||
Pixel * /*prmask */ ,
|
||||
Pixel * /*pgmask */ ,
|
||||
Pixel * /*pbmask */ );
|
||||
|
||||
extern _X_EXPORT int FreeColors(
|
||||
ColormapPtr /*pmap*/,
|
||||
int /*client*/,
|
||||
int /*count*/,
|
||||
Pixel* /*pixels*/,
|
||||
Pixel /*mask*/);
|
||||
extern _X_EXPORT int FreeColors(ColormapPtr /*pmap */ ,
|
||||
int /*client */ ,
|
||||
int /*count */ ,
|
||||
Pixel * /*pixels */ ,
|
||||
Pixel /*mask */ );
|
||||
|
||||
extern _X_EXPORT int StoreColors(
|
||||
ColormapPtr /*pmap*/,
|
||||
int /*count*/,
|
||||
xColorItem* /*defs*/,
|
||||
ClientPtr client);
|
||||
extern _X_EXPORT int StoreColors(ColormapPtr /*pmap */ ,
|
||||
int /*count */ ,
|
||||
xColorItem * /*defs */ ,
|
||||
ClientPtr client);
|
||||
|
||||
extern _X_EXPORT int IsMapInstalled(
|
||||
Colormap /*map*/,
|
||||
WindowPtr /*pWin*/);
|
||||
extern _X_EXPORT int IsMapInstalled(Colormap /*map */ ,
|
||||
WindowPtr /*pWin */ );
|
||||
|
||||
extern _X_EXPORT Bool ResizeVisualArray(
|
||||
ScreenPtr /* pScreen */,
|
||||
int /* new_vis_count */,
|
||||
DepthPtr /* depth */);
|
||||
extern _X_EXPORT Bool ResizeVisualArray(ScreenPtr /* pScreen */ ,
|
||||
int /* new_vis_count */ ,
|
||||
DepthPtr /* depth */ );
|
||||
|
||||
#endif /* CMAP_H */
|
||||
#endif /* CMAP_H */
|
||||
|
||||
Reference in New Issue
Block a user