[prev in list] [next in list] [prev in thread] [next in thread]
List: freedesktop-xorg-devel
Subject: Re: [PATCH 01/10] Replace 'pointer' type with 'void *'
From: Keith Packard <keithp () keithp ! com>
Date: 2013-12-29 23:22:48
Message-ID: 86r48v8con.fsf () miki ! keithp ! com
[Download RAW message or body]
[Attachment #2 (multipart/signed)]
[Attachment #4 (multipart/mixed)]
here's the function prototype changes, split out from the pointer->void
* changes.
["0002-Clean-up-a-few-function-prototypes-to-not-place-form.patch" (text/x-diff)]
From 789e3d6934033d55a72e0f573d001df478f1ca20 Mon Sep 17 00:00:00 2001
From: Keith Packard <keithp@keithp.com>
Date: Sun, 29 Dec 2013 15:18:28 -0800
Subject: [PATCH 02/11] 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>
---
Xext/saver.c | 40 ++++++++++++++--------------------------
Xext/shm.c | 12 ++++--------
dix/dixutils.c | 3 +--
mi/migc.h | 49 +++++++++++++++++++++----------------------------
os/xdmcp.c | 51 +++++++++++++++++++++++++++------------------------
record/record.c | 5 ++---
6 files changed, 69 insertions(+), 91 deletions(-)
diff --git a/Xext/saver.c b/Xext/saver.c
index 03f28bb..8e92fdf 100644
--- a/Xext/saver.c
+++ b/Xext/saver.c
@@ -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;
diff --git a/Xext/shm.c b/Xext/shm.c
index 34545ec..4dad8b6 100644
--- a/Xext/shm.c
+++ b/Xext/shm.c
@@ -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);
diff --git a/dix/dixutils.c b/dix/dixutils.c
index 220040f..5de74c8 100644
--- a/dix/dixutils.c
+++ b/dix/dixutils.c
@@ -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;
diff --git a/mi/migc.h b/mi/migc.h
index fb9f35c..8d06a6f 100644
--- a/mi/migc.h
+++ b/mi/migc.h
@@ -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);
diff --git a/os/xdmcp.c b/os/xdmcp.c
index da509e4..fd8ae58 100644
--- a/os/xdmcp.c
+++ b/os/xdmcp.c
@@ -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
diff --git a/record/record.c b/record/record.c
index 8217a44..c900219 100644
--- a/record/record.c
+++ b/record/record.c
@@ -136,9 +136,8 @@ static int numEnabledRCAPs;
return rc; \
}
-static int RecordDeleteContext(void */*value */ ,
- XID /*id */
- );
+static int RecordDeleteContext(void *value,
+ XID id);
/***************************************************************************/
--
1.8.5.1
Content-Transfer-Encoding: quoted-printable
--
keith.packard@intel.com
[Attachment #9 (application/pgp-signature)]
_______________________________________________
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: http://lists.x.org/mailman/listinfo/xorg-devel
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic