Attachment 14671 Details for Bug 14728 – 0001-libXp-ansification.patch

[patch] 0001-libXp-ansification.patch

0001-libXp-ansification.patch (text/plain), 5.27 KB, created by Paulo César Pereira de Andrade on 2008-02-28 16:18:24 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Paulo César Pereira de Andrade

Created: 2008-02-28 16:18:24 UTC

Size: 5.27 KB

patch

obsolete

>From dd953bf3214264b2706ade5a7d4c7981b50c150b Mon Sep 17 00:00:00 2001
>From: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
>Date: Thu, 28 Feb 2008 20:48:59 -0300
>Subject: [PATCH] libXp ansification.
>
>  Ansification caused an warning due to XpEventToWire prototype not
>matching the function prototype event_to_wire in the XExtensionHooks
>structure.
>---
> src/XpExtUtil.c   |   70 ++++++++++++++++++++++++++++++++++++----------------
> src/XpGetData.c   |   12 ++++----
> src/XpLocale.c    |    8 ++++--
> src/XpNotifyPdm.c |    2 +
> 4 files changed, 61 insertions(+), 31 deletions(-)
>
>diff --git a/src/XpExtUtil.c b/src/XpExtUtil.c
>index dac8028..662787d 100644
>--- a/src/XpExtUtil.c
>+++ b/src/XpExtUtil.c
>@@ -54,10 +54,36 @@ static XExtensionInfo     xp_info_data;
> static XExtensionInfo     *xp_info = &xp_info_data;
> static /* const */ char   *xp_extension_name = XP_PRINTNAME;
> 
>-static int    XpClose();
>-static char   *XpError();
>-static Bool   XpWireToEvent();
>-static Status XpEventToWire();
>+int XpCheckExtInitUnlocked(
>+    register Display *	/* dpy */,
>+    register int	/* version_index */
>+);
>+
>+static int    XpClose(
>+    Display *		/* dpy */,
>+    XExtCodes *		/* codes */
>+);
>+
>+static char   *XpError(
>+    Display *		/* dpy */,
>+    int			/* code */,
>+    XExtCodes *		/* codes */,
>+    char *		/* buf */,
>+    int 		/* n */
>+);
>+
>+static Bool   XpWireToEvent(
>+    Display *		/* dpy */,
>+    XEvent *		/* re */,
>+    xEvent *		/* event */
>+);
>+
>+static Status XpEventToWire(
>+    register Display *	/* dpy */,
>+    register XEvent *	/* re */,
>+    register xEvent **	/* event, */,
>+    register int *	/* count */
>+);
> 
> #define XpCheckExtension(dpy,i,val) \
>   XextCheckExtension (dpy, i, xp_extension_name, val)
>@@ -117,9 +143,9 @@ static XPrintLocalExtensionVersion xpprintversions[] = {{XP_ABSENT,0,0},
>  * xpprintversions[version_index] shows which version *this* library is.
>  */
> 
>-int XpCheckExtInitUnlocked(dpy, version_index)
>-    register	Display *dpy;
>-    register	int	version_index;
>+int XpCheckExtInitUnlocked(
>+    register	Display *dpy,
>+    register	int	 version_index)
> {
>     XExtDisplayInfo 	*info = xp_find_display (dpy);
> 
>@@ -175,9 +201,9 @@ int XpCheckExtInitUnlocked(dpy, version_index)
>     return (0);
> }
> 
>-int XpCheckExtInit(dpy, version_index)
>-    register	Display *dpy;
>-    register	int	version_index;
>+int XpCheckExtInit(
>+    register	Display *dpy,
>+    register	int	 version_index)
> {
>     int retval;
>     
>@@ -197,9 +223,9 @@ int XpCheckExtInit(dpy, version_index)
>  */
> 
> static int
>-XpClose (dpy, codes)
>-    Display *dpy;
>-    XExtCodes *codes;
>+XpClose (
>+    Display	*dpy,
>+    XExtCodes	*codes)
>     {
>     XExtDisplayInfo 	*info = xp_find_display (dpy);
> 
>@@ -227,10 +253,10 @@ XpClose (dpy, codes)
>  * Reformat a wire event into an XEvent structure of the right type.
>  */
> static Bool
>-XpWireToEvent (dpy, re, event)
>-    Display	*dpy;
>-    XEvent	*re;
>-    xEvent	*event;
>+XpWireToEvent (
>+    Display	*dpy,
>+    XEvent	*re,
>+    xEvent	*event)
> {
>     XExtDisplayInfo *info = xp_find_display (dpy);
> 
>@@ -290,11 +316,11 @@ XpWireToEvent (dpy, re, event)
>  * Reformat an XEvent into a wire event.
>  */
> static Status
>-XpEventToWire(dpy, re, event, count)
>-    register Display *dpy;      /* pointer to display structure */
>-    register XEvent *re;        /* pointer to client event */
>-    register xEvent **event;    /* wire protocol event */
>-    register int *count;
>+XpEventToWire(
>+    register Display	 *dpy,		/* pointer to display structure */
>+    register XEvent	 *re,		/* pointer to client event */
>+    register xEvent	**event,	/* wire protocol event */
>+    register int	 *count)
> {
>     XExtDisplayInfo *info = (XExtDisplayInfo *) xp_find_display (dpy);
> 
>diff --git a/src/XpGetData.c b/src/XpGetData.c
>index b495021..800268c 100644
>--- a/src/XpGetData.c
>+++ b/src/XpGetData.c
>@@ -66,12 +66,12 @@ typedef struct {
>  * XpGetDocumentData().
>  */
> static Bool
>-_XpGetDocDataHandler(dpy, rep, buf, len, adata)
>-    register Display *dpy;
>-    register xReply *rep;
>-    char *buf;
>-    int len;
>-    XPointer adata;
>+_XpGetDocDataHandler(
>+    register Display	*dpy,
>+    register xReply	*rep,
>+    char		*buf,
>+    int			 len,
>+    XPointer		 adata)
> {
>     register _XpState            *state;
>     xPrintGetDocumentDataReply   replbuf;
>diff --git a/src/XpLocale.c b/src/XpLocale.c
>index ef7c5fb..dec577a 100644
>--- a/src/XpLocale.c
>+++ b/src/XpLocale.c
>@@ -54,7 +54,9 @@ char         *_xp_hinter_desc = NULL;
> int           _xp_hinter_init = 1;	/* need to init */
> 
> 
>-extern char *_xpstrdup();
>+extern char *_xpstrdup(
>+    char *	/* str */
>+);
> 
> 
> /******************************************************************************
>@@ -63,7 +65,7 @@ extern char *_xpstrdup();
>  *
>  * Make changes here only.
>  */
>-static char *_XpLocaleHinter()
>+static char *_XpLocaleHinter(void)
> {
> #ifdef hpux
>     char lbuf[ LC_BUFSIZ ];
>@@ -180,7 +182,7 @@ XpGetLocaleHinter (
>  *
>  * If neither a hint or description exists, a NULL is returned.
>  */
>-char *XpGetLocaleNetString()
>+char *XpGetLocaleNetString(void)
> {
>     XPHinterProc  locale_hinter;
> 
>diff --git a/src/XpNotifyPdm.c b/src/XpNotifyPdm.c
>index feb62f0..1dd4e05 100644
>--- a/src/XpNotifyPdm.c
>+++ b/src/XpNotifyPdm.c
>@@ -68,6 +68,8 @@
> /*
>  * str_dup using Xmalloc
>  */
>+char *_xpstrdup(char * str);
>+
> char *_xpstrdup(char * str)
> {
>     int len;
>-- 
>1.5.4.3
>

Actions: View | Splinter Review

Attachments on bug 14728: 14671 | 14672

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.