cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- remove unnecessary NULL casts

Browse Source
This commit is contained in:
jasper 2011-04-17 18:13:10 +00:00
parent f868102161
commit fa46ac7d9f
9 changed files with 6 additions and 150 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
x11/tk/8.4/Makefile
View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.25 2011/01/05 16:21:06 stu Exp $
# $OpenBSD: Makefile,v 1.26 2011/04/17 18:13:10 jasper Exp $
COMMENT = graphical toolkit for Tcl
DISTNAME = tk8.4.19
PKGNAME = tk-8.4.19
REVISION = 2
REVISION = 3
SHARED_LIBS = tk84 1.1
CATEGORIES = x11 x11/tk
HOMEPAGE = http://www.tcl.tk/

47
x11/tk/8.4/patches/patch-generic_tkEvent_c
View File

@ -1,47 +0,0 @@
$OpenBSD: patch-generic_tkEvent_c,v 1.1 2011/01/05 16:21:06 stu Exp $
--- generic/tkEvent.c.orig Wed Sep 29 20:13:11 2010
+++ generic/tkEvent.c Wed Sep 29 20:14:47 2010
@@ -908,7 +908,7 @@ Tk_HandleEvent(eventPtr)
}
preedit_attr = XVaCreateNestedList(0, XNSpotLocation,
- &spot, XNFontSet, dispPtr->inputXfs, NULL);
+ &spot, XNFontSet, dispPtr->inputXfs, (void *) NULL);
if (winPtr->inputContext != NULL)
panic("inputContext not NULL");
winPtr->inputContext = XCreateIC(dispPtr->inputMethod,
@@ -916,7 +916,7 @@ Tk_HandleEvent(eventPtr)
XNClientWindow, winPtr->window,
XNFocusWindow, winPtr->window,
XNPreeditAttributes, preedit_attr,
- NULL);
+ (void *) NULL);
XFree(preedit_attr);
} else {
if (winPtr->inputContext != NULL)
@@ -925,7 +925,7 @@ Tk_HandleEvent(eventPtr)
XNInputStyle, XIMPreeditNothing|XIMStatusNothing,
XNClientWindow, winPtr->window,
XNFocusWindow, winPtr->window,
- NULL);
+ (void *) NULL);
}
#else
if (winPtr->inputContext != NULL)
@@ -934,14 +934,14 @@ Tk_HandleEvent(eventPtr)
XNInputStyle, XIMPreeditNothing|XIMStatusNothing,
XNClientWindow, winPtr->window,
XNFocusWindow, winPtr->window,
- NULL);
+ (void *) NULL);
#endif
}
}
if (winPtr->inputContext != NULL &&
(eventPtr->xany.type == FocusIn)) {
XGetICValues(winPtr->inputContext,
- XNFilterEvents, &im_event_mask, NULL);
+ XNFilterEvents, &im_event_mask, (void *) NULL);
if (im_event_mask != 0L) {
XSelectInput(winPtr->display, winPtr->window,
winPtr->atts.event_mask | im_event_mask);

12
x11/tk/8.4/patches/patch-unix_tkUnixEvent_c
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-unix_tkUnixEvent_c,v 1.1 2011/01/05 16:21:06 stu Exp $
--- unix/tkUnixEvent.c.orig Wed Sep 29 20:15:32 2010
+++ unix/tkUnixEvent.c Wed Sep 29 20:16:09 2010
@@ -669,7 +669,7 @@ OpenIM(dispPtr)
}
if ((XGetIMValues(dispPtr->inputMethod, XNQueryInputStyle, &stylePtr,
- NULL) != NULL) || (stylePtr == NULL)) {
+ (void *) NULL) != NULL) || (stylePtr == NULL)) {
goto error;
}
#if TK_XIM_SPOT

15
x11/tk/8.4/patches/patch-unix_tkUnixKey_c
View File

@ -1,15 +0,0 @@
$OpenBSD: patch-unix_tkUnixKey_c,v 1.1 2011/01/05 16:21:06 stu Exp $
--- unix/tkUnixKey.c.orig Wed Sep 29 20:16:41 2010
+++ unix/tkUnixKey.c Wed Sep 29 20:17:20 2010
@@ -130,9 +130,9 @@ TkpGetString(winPtr, eventPtr, dsPtr)
if (dispPtr->flags & TK_DISPLAY_XIM_SPOT) {
spot.x = dispPtr->caret.x;
spot.y = dispPtr->caret.y + dispPtr->caret.height;
- preedit_attr = XVaCreateNestedList(0, XNSpotLocation, &spot, NULL);
+ preedit_attr = XVaCreateNestedList(0, XNSpotLocation, &spot, (void *) NULL);
XSetICValues(winPtr->inputContext,
- XNPreeditAttributes, preedit_attr, NULL);
+ XNPreeditAttributes, preedit_attr, (void *) NULL);
XFree(preedit_attr);
}
#endif

8
x11/tk/8.5/Makefile
View File

@ -1,11 +1,11 @@
# $OpenBSD: Makefile,v 1.21 2011/01/09 14:47:43 espie Exp $
# $OpenBSD: Makefile,v 1.22 2011/04/17 18:13:10 jasper Exp $
COMMENT = graphical toolkit for Tcl
DISTNAME = tk8.5.9
PKGNAME = tk-8.5.9
SHARED_LIBS = tk85 0.6
REVISION = 0
REVISION = 1
CATEGORIES = x11 x11/tk
HOMEPAGE = http://www.tcl.tk/
MAINTAINER = Stuart Cassoff <stwo@users.sourceforge.net>
@ -16,8 +16,8 @@ PERMIT_PACKAGE_FTP = Yes
PERMIT_DISTFILES_CDROM =Yes
PERMIT_DISTFILES_FTP = Yes
WANTLIB = X11 Xau Xdmcp Xext Xft Xrender Xss c expat fontconfig freetype m z \
tcl85
WANTLIB += X11 Xau Xdmcp Xext Xft Xrender Xss c expat fontconfig
WANTLIB += freetype m tcl85 z
MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=tcl/}
DISTFILES = ${DISTNAME}-src.tar.gz

30
x11/tk/8.5/patches/patch-generic_tkEvent_c
View File

@ -1,30 +0,0 @@
$OpenBSD: patch-generic_tkEvent_c,v 1.1 2011/01/05 16:18:09 stu Exp $
--- generic/tkEvent.c.orig Fri Sep 24 18:47:54 2010
+++ generic/tkEvent.c Fri Sep 24 18:49:29 2010
@@ -345,7 +345,7 @@ CreateXIC(
preedit_attlist = XVaCreateNestedList(0,
XNSpotLocation, &spot,
XNFontSet, dispPtr->inputXfs,
- NULL);
+ (void *) NULL);
}
winPtr->inputContext = XCreateIC(dispPtr->inputMethod,
@@ -353,7 +353,7 @@ CreateXIC(
XNClientWindow, winPtr->window,
XNFocusWindow, winPtr->window,
preedit_attname, preedit_attlist,
- NULL);
+ (void *) NULL);
if (preedit_attlist) {
XFree(preedit_attlist);
@@ -368,7 +368,7 @@ CreateXIC(
/*
* Adjust the window's event mask if the IM requires it.
*/
- XGetICValues(winPtr->inputContext, XNFilterEvents, &im_event_mask, NULL);
+ XGetICValues(winPtr->inputContext, XNFilterEvents, &im_event_mask, (void *) NULL);
if ((winPtr->atts.event_mask & im_event_mask) != im_event_mask) {
winPtr->atts.event_mask |= im_event_mask;
XSelectInput(winPtr->display, winPtr->window, winPtr->atts.event_mask);

12
x11/tk/8.5/patches/patch-unix_tkUnixEvent_c
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-unix_tkUnixEvent_c,v 1.1 2011/01/05 16:18:09 stu Exp $
--- unix/tkUnixEvent.c.orig Fri Sep 24 19:00:20 2010
+++ unix/tkUnixEvent.c Fri Sep 24 19:00:55 2010
@@ -640,7 +640,7 @@ OpenIM(
}
if ((XGetIMValues(dispPtr->inputMethod, XNQueryInputStyle, &stylePtr,
- NULL) != NULL) || (stylePtr == NULL)) {
+ (void *) NULL) != NULL) || (stylePtr == NULL)) {
goto error;
}

16
x11/tk/8.5/patches/patch-unix_tkUnixKey_c
View File

@ -1,16 +0,0 @@
$OpenBSD: patch-unix_tkUnixKey_c,v 1.1 2011/01/05 16:18:09 stu Exp $
--- unix/tkUnixKey.c.orig Fri Sep 24 19:02:35 2010
+++ unix/tkUnixKey.c Fri Sep 24 19:03:21 2010
@@ -66,10 +66,10 @@ Tk_SetCaretPos(
spot.x = dispPtr->caret.x;
spot.y = dispPtr->caret.y + dispPtr->caret.height;
- preedit_attr = XVaCreateNestedList(0, XNSpotLocation, &spot, NULL);
+ preedit_attr = XVaCreateNestedList(0, XNSpotLocation, &spot, (void *) NULL);
XSetICValues(winPtr->inputContext,
XNPreeditAttributes, preedit_attr,
- NULL);
+ (void *) NULL);
XFree(preedit_attr);
}
#endif

12
x11/tk/8.5/patches/patch-unix_tkUnixRFont_c
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-unix_tkUnixRFont_c,v 1.1 2011/01/05 16:18:09 stu Exp $
--- unix/tkUnixRFont.c.orig Fri Sep 24 19:01:33 2010
+++ unix/tkUnixRFont.c Fri Sep 24 19:01:58 2010
@@ -93,7 +93,7 @@ GetFont(
ftFont = XftFontOpen(fontPtr->display, fontPtr->screen,
FC_FAMILY, FcTypeString, "sans",
FC_SIZE, FcTypeDouble, 12.0,
- NULL);
+ (void *) NULL);
}
if (!ftFont) {
/*