Commit 2d2d49da authored by Keith Packard's avatar Keith Packard

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's avatarKeith Packard <keithp@keithp.com>
Reviewed-by: Alan Coopersmith's avatarAlan Coopersmith <alan.coopersmith@oracle.com>
parent 60014a4a
......@@ -107,9 +107,7 @@ typedef struct _ScreenSaverSuspension {
int count;
} ScreenSaverSuspensionRec;
static int ScreenSaverFreeSuspend(void */*value */ ,
XID /* id */
);
static int ScreenSaverFreeSuspend(void *value, XID id);
/*
* each screen has a list of clients requesting
......@@ -131,18 +129,14 @@ typedef struct _ScreenSaverEvent {
CARD32 mask;
} ScreenSaverEventRec;
static int ScreenSaverFreeEvents(void * /* value */ ,
XID /* id */
);
static int ScreenSaverFreeEvents(void * value, XID id);
static Bool setEventMask(ScreenPtr /* pScreen */ ,
ClientPtr /* client */ ,
unsigned long /* mask */
);
static Bool setEventMask(ScreenPtr pScreen,
ClientPtr client,
unsigned long mask);
static unsigned long getEventMask(ScreenPtr /* pScreen */ ,
ClientPtr /* client */
);
static unsigned long getEventMask(ScreenPtr pScreen,
ClientPtr client);
/*
* when a client sets the screen saver attributes, a resource is
......@@ -168,21 +162,16 @@ typedef struct _ScreenSaverAttr {
unsigned long *values;
} ScreenSaverAttrRec, *ScreenSaverAttrPtr;
static int ScreenSaverFreeAttr(void */* value */ ,
XID /* id */
);
static int ScreenSaverFreeAttr(void *value, XID id);
static void FreeAttrs(ScreenSaverAttrPtr /* pAttr */
);
static void FreeAttrs(ScreenSaverAttrPtr pAttr);
static void FreeScreenAttr(ScreenSaverAttrPtr /* pAttr */
);
static void FreeScreenAttr(ScreenSaverAttrPtr pAttr);
static void
SendScreenSaverNotify(ScreenPtr /* pScreen */ ,
int /* state */ ,
Bool /* forced */
);
SendScreenSaverNotify(ScreenPtr pScreen,
int state,
Bool forced);
typedef struct _ScreenSaverScreenPrivate {
ScreenSaverEventPtr events;
......@@ -191,8 +180,7 @@ typedef struct _ScreenSaverScreenPrivate {
Colormap installedMap;
} ScreenSaverScreenPrivateRec, *ScreenSaverScreenPrivatePtr;
static ScreenSaverScreenPrivatePtr MakeScreenPrivate(ScreenPtr /* pScreen */
);
static ScreenSaverScreenPrivatePtr MakeScreenPrivate(ScreenPtr pScreen);
static DevPrivateKeyRec ScreenPrivateKeyRec;
......
......@@ -99,14 +99,10 @@ typedef struct _ShmScrPrivateRec {
} ShmScrPrivateRec;
static PixmapPtr fbShmCreatePixmap(XSHM_CREATE_PIXMAP_ARGS);
static int ShmDetachSegment(void */* value */ ,
XID /* shmseg */
);
static void ShmResetProc(ExtensionEntry * /* extEntry */
);
static void SShmCompletionEvent(xShmCompletionEvent * /* from */ ,
xShmCompletionEvent * /* to */
);
static int ShmDetachSegment(void *value, XID shmseg);
static void ShmResetProc(ExtensionEntry *extEntry);
static void SShmCompletionEvent(xShmCompletionEvent *from,
xShmCompletionEvent *to);
static Bool ShmDestroyPixmap(PixmapPtr pPixmap);
......
......@@ -556,8 +556,7 @@ ProcessWorkQueueZombies(void)
}
Bool
QueueWorkProc(Bool (*function)
(ClientPtr /* pClient */ , void */* closure */ ),
QueueWorkProc(Bool (*function) (ClientPtr pClient, void *closure),
ClientPtr client, void *closure)
{
WorkQueuePtr q;
......
......@@ -26,31 +26,24 @@ from The Open Group.
*/
extern _X_EXPORT void miChangeGC(GCPtr /*pGC */ ,
unsigned long /*mask */
);
extern _X_EXPORT void miDestroyGC(GCPtr /*pGC */
);
extern _X_EXPORT void miDestroyClip(GCPtr /*pGC */
);
extern _X_EXPORT void miChangeClip(GCPtr /*pGC */ ,
int /*type */ ,
void */*pvalue */ ,
int /*nrects */
);
extern _X_EXPORT void miCopyClip(GCPtr /*pgcDst */ ,
GCPtr /*pgcSrc */
);
extern _X_EXPORT void miCopyGC(GCPtr /*pGCSrc */ ,
unsigned long /*changes */ ,
GCPtr /*pGCDst */
);
extern _X_EXPORT void miComputeCompositeClip(GCPtr /*pGC */ ,
DrawablePtr /*pDrawable */
);
extern _X_EXPORT void miChangeGC(GCPtr pGC,
unsigned long mask);
extern _X_EXPORT void miDestroyGC(GCPtr pGC);
extern _X_EXPORT void miDestroyClip(GCPtr pGC);
extern _X_EXPORT void miChangeClip(GCPtr pGC,
int type,
void *pvalue,
int nrects);
extern _X_EXPORT void miCopyClip(GCPtr pgcDst,
GCPtr pgcSrc);
extern _X_EXPORT void miCopyGC(GCPtr pGCSrc,
unsigned long changes,
GCPtr pGCDst);
extern _X_EXPORT void miComputeCompositeClip(GCPtr pGC,
DrawablePtr pDrawable);
......@@ -145,43 +145,46 @@ static void get_xdmcp_sock(void);
static void send_query_msg(void);
static void recv_willing_msg(struct sockaddr * /*from */ ,
int /*fromlen */ ,
unsigned /*length */ );
static void recv_willing_msg(struct sockaddr *from,
int fromlen,
unsigned length);
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 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 recv_alive_msg(unsigned /*length */ );
static void recv_alive_msg(unsigned length );
static void XdmcpFatal(const char * /*type */ ,
ARRAY8Ptr /*status */ );
static void XdmcpFatal(const char *type,
ARRAY8Ptr status);
static void XdmcpWarning(const char * /*str */ );
static void XdmcpWarning(const char *str);
static void get_manager_by_name(int /*argc */ ,
char ** /*argv */ ,
int /*i */ );
static void get_manager_by_name(int argc,
char **argv,
int i);
static void get_fromaddr_by_name(int /*argc */ , char ** /*argv */ ,
int /*i */ );
static void get_fromaddr_by_name(int argc,
char **argv,
int i);
#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
static void receive_packet(int /*socketfd */ );
static void receive_packet(int socketfd);
static void send_packet(void);
......@@ -189,13 +192,13 @@ static void timeout(void);
static void restart(void);
static void XdmcpBlockHandler(void */*data */ ,
struct timeval ** /*wt */ ,
void */*LastSelectMask */ );
static void XdmcpBlockHandler(void *data ,
struct timeval **wt,
void *LastSelectMask);
static void XdmcpWakeupHandler(void */*data */ ,
int /*i */ ,
void */*LastSelectMask */ );
static void XdmcpWakeupHandler(void *data,
int i,
void *LastSelectMask);
/*
* Register the Manufacturer display ID
......
......@@ -136,9 +136,8 @@ static int numEnabledRCAPs;
return rc; \
}
static int RecordDeleteContext(void */*value */ ,
XID /*id */
);
static int RecordDeleteContext(void *value,
XID id);
/***************************************************************************/
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment