frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Clean up a few function prototypes to not place formals in /**/ 

This just removes the comment markers from around the formals in
several function prototypes near where pointer -> void * changes were
made. There are plenty more of these to fix.

Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
This commit is contained in:
Keith Packard 2013-12-29 15:18:28 -08:00
parent 60014a4a98
commit 2d2d49dab5
6 changed files with 63 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
Xext/saver.c
View File

@ -107,9 +107,7 @@ typedef struct _ScreenSaverSuspension {
int count; int count;
} ScreenSaverSuspensionRec; } ScreenSaverSuspensionRec;
static int ScreenSaverFreeSuspend(void */*value */ , static int ScreenSaverFreeSuspend(void *value, XID id);
XID /* id */
);
/* /*
* each screen has a list of clients requesting * each screen has a list of clients requesting
@ -131,18 +129,14 @@ typedef struct _ScreenSaverEvent {
CARD32 mask; CARD32 mask;
} ScreenSaverEventRec; } ScreenSaverEventRec;
static int ScreenSaverFreeEvents(void * /* value */ , static int ScreenSaverFreeEvents(void * value, XID id);
XID /* id */
);
static Bool setEventMask(ScreenPtr /* pScreen */ , static Bool setEventMask(ScreenPtr pScreen,
ClientPtr /* client */ , ClientPtr client,
unsigned long /* mask */ unsigned long mask);
);
static unsigned long getEventMask(ScreenPtr /* pScreen */ , static unsigned long getEventMask(ScreenPtr pScreen,
ClientPtr /* client */ ClientPtr client);
);
/* /*
* when a client sets the screen saver attributes, a resource is * when a client sets the screen saver attributes, a resource is
@ -168,21 +162,16 @@ typedef struct _ScreenSaverAttr {
unsigned long *values; unsigned long *values;
} ScreenSaverAttrRec, *ScreenSaverAttrPtr; } ScreenSaverAttrRec, *ScreenSaverAttrPtr;
static int ScreenSaverFreeAttr(void */* value */ , static int ScreenSaverFreeAttr(void *value, XID id);
XID /* id */
);
static void FreeAttrs(ScreenSaverAttrPtr /* pAttr */ static void FreeAttrs(ScreenSaverAttrPtr pAttr);
);
static void FreeScreenAttr(ScreenSaverAttrPtr /* pAttr */ static void FreeScreenAttr(ScreenSaverAttrPtr pAttr);
);
static void static void
SendScreenSaverNotify(ScreenPtr /* pScreen */ , SendScreenSaverNotify(ScreenPtr pScreen,
int /* state */ , int state,
Bool /* forced */ Bool forced);
);
typedef struct _ScreenSaverScreenPrivate { typedef struct _ScreenSaverScreenPrivate {
ScreenSaverEventPtr events; ScreenSaverEventPtr events;
@ -191,8 +180,7 @@ typedef struct _ScreenSaverScreenPrivate {
Colormap installedMap; Colormap installedMap;
} ScreenSaverScreenPrivateRec, *ScreenSaverScreenPrivatePtr; } ScreenSaverScreenPrivateRec, *ScreenSaverScreenPrivatePtr;
static ScreenSaverScreenPrivatePtr MakeScreenPrivate(ScreenPtr /* pScreen */ static ScreenSaverScreenPrivatePtr MakeScreenPrivate(ScreenPtr pScreen);
);
static DevPrivateKeyRec ScreenPrivateKeyRec; static DevPrivateKeyRec ScreenPrivateKeyRec;

12
Xext/shm.c
View File

@ -99,14 +99,10 @@ typedef struct _ShmScrPrivateRec {
} ShmScrPrivateRec; } ShmScrPrivateRec;
static PixmapPtr fbShmCreatePixmap(XSHM_CREATE_PIXMAP_ARGS); static PixmapPtr fbShmCreatePixmap(XSHM_CREATE_PIXMAP_ARGS);
static int ShmDetachSegment(void */* value */ , static int ShmDetachSegment(void *value, XID shmseg);
XID /* shmseg */ static void ShmResetProc(ExtensionEntry *extEntry);
); static void SShmCompletionEvent(xShmCompletionEvent *from,
static void ShmResetProc(ExtensionEntry * /* extEntry */ xShmCompletionEvent *to);
);
static void SShmCompletionEvent(xShmCompletionEvent * /* from */ ,
xShmCompletionEvent * /* to */
);
static Bool ShmDestroyPixmap(PixmapPtr pPixmap); static Bool ShmDestroyPixmap(PixmapPtr pPixmap);

3
dix/dixutils.c
View File

@ -556,8 +556,7 @@ ProcessWorkQueueZombies(void)
} }
Bool Bool
QueueWorkProc(Bool (*function) QueueWorkProc(Bool (*function) (ClientPtr pClient, void *closure),
(ClientPtr /* pClient */ , void */* closure */ ),
ClientPtr client, void *closure) ClientPtr client, void *closure)
{ {
WorkQueuePtr q; WorkQueuePtr q;

37
mi/migc.h
View File

@ -26,31 +26,24 @@ from The Open Group.
*/ */
extern _X_EXPORT void miChangeGC(GCPtr /*pGC */ , extern _X_EXPORT void miChangeGC(GCPtr pGC,
unsigned long /*mask */ unsigned long mask);
);
extern _X_EXPORT void miDestroyGC(GCPtr /*pGC */ extern _X_EXPORT void miDestroyGC(GCPtr pGC);
);
extern _X_EXPORT void miDestroyClip(GCPtr /*pGC */ extern _X_EXPORT void miDestroyClip(GCPtr pGC);
);
extern _X_EXPORT void miChangeClip(GCPtr /*pGC */ , extern _X_EXPORT void miChangeClip(GCPtr pGC,
int /*type */ , int type,
void */*pvalue */ , void *pvalue,
int /*nrects */ int nrects);
);
extern _X_EXPORT void miCopyClip(GCPtr /*pgcDst */ , extern _X_EXPORT void miCopyClip(GCPtr pgcDst,
GCPtr /*pgcSrc */ GCPtr pgcSrc);
);
extern _X_EXPORT void miCopyGC(GCPtr /*pGCSrc */ , extern _X_EXPORT void miCopyGC(GCPtr pGCSrc,
unsigned long /*changes */ , unsigned long changes,
GCPtr /*pGCDst */ GCPtr pGCDst);
);
extern _X_EXPORT void miComputeCompositeClip(GCPtr /*pGC */ , extern _X_EXPORT void miComputeCompositeClip(GCPtr pGC,
DrawablePtr /*pDrawable */ DrawablePtr pDrawable);
);

51
os/xdmcp.c
View File

@ -145,43 +145,46 @@ static void get_xdmcp_sock(void);
static void send_query_msg(void); static void send_query_msg(void);
static void recv_willing_msg(struct sockaddr * /*from */ , static void recv_willing_msg(struct sockaddr *from,
int /*fromlen */ , int fromlen,
unsigned /*length */ ); unsigned length);
static void send_request_msg(void); static void send_request_msg(void);
static void recv_accept_msg(unsigned /*length */ ); static void recv_accept_msg(unsigned length);
static void recv_decline_msg(unsigned /*length */ ); static void recv_decline_msg(unsigned length);
static void send_manage_msg(void); static void send_manage_msg(void);
static void recv_refuse_msg(unsigned /*length */ ); static void recv_refuse_msg(unsigned length);
static void recv_failed_msg(unsigned /*length */ ); static void recv_failed_msg(unsigned length);
static void send_keepalive_msg(void); static void send_keepalive_msg(void);
static void recv_alive_msg(unsigned /*length */ ); static void recv_alive_msg(unsigned length );
static void XdmcpFatal(const char * /*type */ , static void XdmcpFatal(const char *type,
ARRAY8Ptr /*status */ ); ARRAY8Ptr status);
static void XdmcpWarning(const char * /*str */ ); static void XdmcpWarning(const char *str);
static void get_manager_by_name(int /*argc */ , static void get_manager_by_name(int argc,
char ** /*argv */ , char **argv,
int /*i */ ); int i);
static void get_fromaddr_by_name(int /*argc */ , char ** /*argv */ , static void get_fromaddr_by_name(int argc,
int /*i */ ); char **argv,
int i);
#if defined(IPv6) && defined(AF_INET6) #if defined(IPv6) && defined(AF_INET6)
static int get_mcast_options(int /*argc */ , char ** /*argv */ , int /*i */ ); static int get_mcast_options(int argc,
char **argv,
int i);
#endif #endif
static void receive_packet(int /*socketfd */ ); static void receive_packet(int socketfd);
static void send_packet(void); static void send_packet(void);
@ -189,13 +192,13 @@ static void timeout(void);
static void restart(void); static void restart(void);
static void XdmcpBlockHandler(void */*data */ , static void XdmcpBlockHandler(void *data ,
struct timeval ** /*wt */ , struct timeval **wt,
void */*LastSelectMask */ ); void *LastSelectMask);
static void XdmcpWakeupHandler(void */*data */ , static void XdmcpWakeupHandler(void *data,
int /*i */ , int i,
void */*LastSelectMask */ ); void *LastSelectMask);
/* /*
* Register the Manufacturer display ID * Register the Manufacturer display ID

5
record/record.c
View File

@ -136,9 +136,8 @@ static int numEnabledRCAPs;
return rc; \ return rc; \
} }
static int RecordDeleteContext(void */*value */ , static int RecordDeleteContext(void *value,
XID /*id */ XID id);
);
/***************************************************************************/ /***************************************************************************/