Module Name: src
Committed By: christos
Date: Sat Oct 22 21:55:06 UTC 2016
Modified Files:
src/lib/libcurses: add_wchstr.c addbytes.c background.c border.c
curses.c fileio.c fileio.h ins_wch.c ins_wstr.c
Log Message:
remove bogus malloc casts
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/lib/libcurses/add_wchstr.c \
src/lib/libcurses/fileio.c
cvs rdiff -u -r1.42 -r1.43 src/lib/libcurses/addbytes.c
cvs rdiff -u -r1.15 -r1.16 src/lib/libcurses/background.c \
src/lib/libcurses/border.c
cvs rdiff -u -r1.25 -r1.26 src/lib/libcurses/curses.c
cvs rdiff -u -r1.2 -r1.3 src/lib/libcurses/fileio.h
cvs rdiff -u -r1.6 -r1.7 src/lib/libcurses/ins_wch.c
cvs rdiff -u -r1.7 -r1.8 src/lib/libcurses/ins_wstr.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libcurses/add_wchstr.c
diff -u src/lib/libcurses/add_wchstr.c:1.4 src/lib/libcurses/add_wchstr.c:1.5
--- src/lib/libcurses/add_wchstr.c:1.4 Tue Feb 23 14:48:26 2010
+++ src/lib/libcurses/add_wchstr.c Sat Oct 22 17:55:06 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: add_wchstr.c,v 1.4 2010/02/23 19:48:26 drochner Exp $ */
+/* $NetBSD: add_wchstr.c,v 1.5 2016/10/22 21:55:06 christos Exp $ */
/*
* Copyright (c) 2005 The NetBSD Foundation Inc.
@@ -36,7 +36,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: add_wchstr.c,v 1.4 2010/02/23 19:48:26 drochner Exp $");
+__RCSID("$NetBSD: add_wchstr.c,v 1.5 2016/10/22 21:55:06 christos Exp $");
#endif /* not lint */
#include <stdlib.h>
@@ -309,7 +309,7 @@ wadd_wchnstr(WINDOW *win, const cchar_t
"wadd_wchnstr: as non-spacing char");
#endif /* DEBUG */
for (i = 0; i < chp->elements; i++) {
- np = (nschar_t *)malloc(sizeof(nschar_t));
+ np = malloc(sizeof(nschar_t));
if (!np)
return ERR;
np->ch = chp->vals[i];
Index: src/lib/libcurses/fileio.c
diff -u src/lib/libcurses/fileio.c:1.4 src/lib/libcurses/fileio.c:1.5
--- src/lib/libcurses/fileio.c:1.4 Wed Jul 22 12:57:14 2009
+++ src/lib/libcurses/fileio.c Sat Oct 22 17:55:06 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: fileio.c,v 1.4 2009/07/22 16:57:14 roy Exp $ */
+/* $NetBSD: fileio.c,v 1.5 2016/10/22 21:55:06 christos Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: fileio.c,v 1.4 2009/07/22 16:57:14 roy Exp $");
+__RCSID("$NetBSD: fileio.c,v 1.5 2016/10/22 21:55:06 christos Exp $");
#endif /* not lint */
#include "curses.h"
@@ -143,7 +143,7 @@ __getnsp(nschar_t *nsp, FILE *fp)
return ERR;
onsp = nsp;
while (n != 0) {
- tnsp = (nschar_t *)malloc(sizeof(nschar_t));
+ tnsp = malloc(sizeof(nschar_t));
if (tnsp == NULL) {
__cursesi_free_nsp(nsp);
return OK;
@@ -189,7 +189,7 @@ getwin(FILE *fp)
return NULL;
/* Window parameters */
- wtmp = (WINDOW *)malloc(sizeof(WINDOW));
+ wtmp = malloc(sizeof(WINDOW));
if (wtmp == NULL)
return NULL;
if (fread(wtmp, sizeof(WINDOW), 1, fp) != 1)
Index: src/lib/libcurses/addbytes.c
diff -u src/lib/libcurses/addbytes.c:1.42 src/lib/libcurses/addbytes.c:1.43
--- src/lib/libcurses/addbytes.c:1.42 Sat Nov 9 22:14:16 2013
+++ src/lib/libcurses/addbytes.c Sat Oct 22 17:55:06 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: addbytes.c,v 1.42 2013/11/10 03:14:16 christos Exp $ */
+/* $NetBSD: addbytes.c,v 1.43 2016/10/22 21:55:06 christos Exp $ */
/*
* Copyright (c) 1987, 1993, 1994
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)addbytes.c 8.4 (Berkeley) 5/4/94";
#else
-__RCSID("$NetBSD: addbytes.c,v 1.42 2013/11/10 03:14:16 christos Exp $");
+__RCSID("$NetBSD: addbytes.c,v 1.43 2016/10/22 21:55:06 christos Exp $");
#endif
#endif /* not lint */
@@ -537,7 +537,7 @@ _cursesi_addwchar(WINDOW *win, __LINE **
if (wch->elements > 1) {
for (i = 1; i < wch->elements; i++) {
- np = (nschar_t *)malloc(sizeof(nschar_t));
+ np = malloc(sizeof(nschar_t));
if (!np)
return ERR;;
np->ch = wch->vals[i];
Index: src/lib/libcurses/background.c
diff -u src/lib/libcurses/background.c:1.15 src/lib/libcurses/background.c:1.16
--- src/lib/libcurses/background.c:1.15 Wed Jul 22 12:57:14 2009
+++ src/lib/libcurses/background.c Sat Oct 22 17:55:06 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: background.c,v 1.15 2009/07/22 16:57:14 roy Exp $ */
+/* $NetBSD: background.c,v 1.16 2016/10/22 21:55:06 christos Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: background.c,v 1.15 2009/07/22 16:57:14 roy Exp $");
+__RCSID("$NetBSD: background.c,v 1.16 2016/10/22 21:55:06 christos Exp $");
#endif /* not lint */
#include <stdlib.h>
@@ -214,7 +214,7 @@ void wbkgrndset(WINDOW *win, const cchar
win->bch = wch->vals[ 0 ];
else {
if ( !np ) {
- np = (nschar_t *)malloc(sizeof(nschar_t));
+ np = malloc(sizeof(nschar_t));
if (!np)
return;
np->next = NULL;
@@ -228,7 +228,7 @@ void wbkgrndset(WINDOW *win, const cchar
if ( wch->elements > 1 ) {
for ( i = 1; i < wch->elements; i++ ) {
if ( !np ) {
- np = (nschar_t *)malloc(sizeof(nschar_t));
+ np = malloc(sizeof(nschar_t));
if (!np)
return;
np->next = NULL;
Index: src/lib/libcurses/border.c
diff -u src/lib/libcurses/border.c:1.15 src/lib/libcurses/border.c:1.16
--- src/lib/libcurses/border.c:1.15 Sun May 5 10:23:16 2013
+++ src/lib/libcurses/border.c Sat Oct 22 17:55:06 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: border.c,v 1.15 2013/05/05 14:23:16 jdc Exp $ */
+/* $NetBSD: border.c,v 1.16 2016/10/22 21:55:06 christos Exp $ */
/*
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: border.c,v 1.15 2013/05/05 14:23:16 jdc Exp $");
+__RCSID("$NetBSD: border.c,v 1.16 2016/10/22 21:55:06 christos Exp $");
#endif /* not lint */
#include <stdlib.h>
@@ -319,7 +319,7 @@ int wborder_set(WINDOW *win, const cchar
SET_WCOL( win->alines[i]->line[j], cw );
if ( left.elements > 1 ) {
for (k = 1; k < left.elements; k++) {
- np = (nschar_t *)malloc(sizeof(nschar_t));
+ np = malloc(sizeof(nschar_t));
if (!np)
return ERR;
np->ch = left.vals[ k ];
@@ -362,7 +362,7 @@ int wborder_set(WINDOW *win, const cchar
SET_WCOL( win->alines[i]->line[j], cw );
if ( right.elements > 1 ) {
for (k = 1; k < right.elements; k++) {
- np = (nschar_t *)malloc(sizeof(nschar_t));
+ np = malloc(sizeof(nschar_t));
if (!np)
return ERR;
np->ch = right.vals[ k ];
@@ -428,7 +428,7 @@ int wborder_set(WINDOW *win, const cchar
SET_WCOL( win->alines[ 0 ]->line[ i + j ], cw );
if ( top.elements > 1 ) {
for ( k = 1; k < top.elements; k++ ) {
- np = (nschar_t *)malloc(sizeof(nschar_t));
+ np = malloc(sizeof(nschar_t));
if (!np)
return ERR;
np->ch = top.vals[ k ];
@@ -471,7 +471,8 @@ int wborder_set(WINDOW *win, const cchar
if ( bottom.elements > 1 ) {
for ( k = 1; k < bottom.elements;
k++ ) {
- if ( !( np = ( nschar_t *)malloc( sizeof( nschar_t ))))
+ np = malloc(sizeof(nschar_t));
+ if (!np)
return ERR;
np->ch = bottom.vals[ k ];
np->next = win->alines[endy]->line[i + j].nsp;
@@ -514,7 +515,7 @@ int wborder_set(WINDOW *win, const cchar
if ( topleft.elements > 1 ) {
for ( k = 1; k < topleft.elements;
k++ ) {
- np = (nschar_t *)malloc(sizeof(nschar_t));
+ np = malloc(sizeof(nschar_t));
if (!np)
return ERR;
np->ch = topleft.vals[ k ];
@@ -542,7 +543,7 @@ int wborder_set(WINDOW *win, const cchar
if ( topright.elements > 1 ) {
for ( k = 1; k < topright.elements;
k++ ) {
- np = (nschar_t *)malloc(sizeof(nschar_t));
+ np = malloc(sizeof(nschar_t));
if (!np)
return ERR;
np->ch = topright.vals[ k ];
@@ -574,7 +575,7 @@ int wborder_set(WINDOW *win, const cchar
if ( botleft.elements > 1 ) {
for ( k = 1; k < botleft.elements;
k++ ) {
- np = (nschar_t *)malloc(sizeof(nschar_t));
+ np = malloc(sizeof(nschar_t));
if (!np)
return ERR;
np->ch = botleft.vals[ k ];
@@ -602,7 +603,7 @@ int wborder_set(WINDOW *win, const cchar
brcw );
if ( botright.elements > 1 ) {
for ( k = 1; k < botright.elements; k++ ) {
- np = (nschar_t *)malloc(sizeof(nschar_t));
+ np = malloc(sizeof(nschar_t));
if (!np)
return ERR;
np->ch = botright.vals[ k ];
Index: src/lib/libcurses/curses.c
diff -u src/lib/libcurses/curses.c:1.25 src/lib/libcurses/curses.c:1.26
--- src/lib/libcurses/curses.c:1.25 Wed Oct 16 15:59:29 2013
+++ src/lib/libcurses/curses.c Sat Oct 22 17:55:06 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: curses.c,v 1.25 2013/10/16 19:59:29 roy Exp $ */
+/* $NetBSD: curses.c,v 1.26 2016/10/22 21:55:06 christos Exp $ */
/*
* Copyright (c) 1981, 1993, 1994
@@ -35,7 +35,7 @@
#if 0
static char sccsid[] = "@(#)curses.c 8.3 (Berkeley) 5/4/94";
#else
-__RCSID("$NetBSD: curses.c,v 1.25 2013/10/16 19:59:29 roy Exp $");
+__RCSID("$NetBSD: curses.c,v 1.26 2016/10/22 21:55:06 christos Exp $");
#endif
#endif /* not lint */
@@ -95,7 +95,7 @@ _cursesi_copy_nsp(nschar_t *src_nsp, str
pnp = tnp;
tnp = tnp->next;
} else {
- tnp = (nschar_t *)malloc(sizeof(nschar_t));
+ tnp = malloc(sizeof(nschar_t));
if (!tnp)
return ERR;
tnp->ch = np->ch;
Index: src/lib/libcurses/fileio.h
diff -u src/lib/libcurses/fileio.h:1.2 src/lib/libcurses/fileio.h:1.3
--- src/lib/libcurses/fileio.h:1.2 Sun Apr 5 20:48:04 2009
+++ src/lib/libcurses/fileio.h Sat Oct 22 17:55:06 2016
@@ -1,6 +1,6 @@
/*
* Do not edit! Automatically generated file:
- * from: NetBSD: shlib_version,v 1.40 2009/01/11 03:07:47 christos Exp
+ * from: NetBSD: shlib_version,v 1.41 2015/11/22 04:56:00 kamil Exp
* by : NetBSD: genfileioh.awk,v 1.2 2008/05/02 11:13:02 martin Exp
*/
Index: src/lib/libcurses/ins_wch.c
diff -u src/lib/libcurses/ins_wch.c:1.6 src/lib/libcurses/ins_wch.c:1.7
--- src/lib/libcurses/ins_wch.c:1.6 Wed Oct 16 15:59:29 2013
+++ src/lib/libcurses/ins_wch.c Sat Oct 22 17:55:06 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: ins_wch.c,v 1.6 2013/10/16 19:59:29 roy Exp $ */
+/* $NetBSD: ins_wch.c,v 1.7 2016/10/22 21:55:06 christos Exp $ */
/*
* Copyright (c) 2005 The NetBSD Foundation Inc.
@@ -36,7 +36,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: ins_wch.c,v 1.6 2013/10/16 19:59:29 roy Exp $");
+__RCSID("$NetBSD: ins_wch.c,v 1.7 2016/10/22 21:55:06 christos Exp $");
#endif /* not lint */
#include <string.h>
@@ -213,7 +213,7 @@ wins_wch(WINDOW *win, const cchar_t *wch
SET_WCOL( *start, cw );
if ( wch->elements > 1 ) {
for ( i = 1; i < wch->elements; i++ ) {
- np = (nschar_t *)malloc(sizeof(nschar_t));
+ np = malloc(sizeof(nschar_t));
if (!np)
return ERR;
np->ch = wch->vals[ i ];
Index: src/lib/libcurses/ins_wstr.c
diff -u src/lib/libcurses/ins_wstr.c:1.7 src/lib/libcurses/ins_wstr.c:1.8
--- src/lib/libcurses/ins_wstr.c:1.7 Wed Oct 16 15:59:29 2013
+++ src/lib/libcurses/ins_wstr.c Sat Oct 22 17:55:06 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: ins_wstr.c,v 1.7 2013/10/16 19:59:29 roy Exp $ */
+/* $NetBSD: ins_wstr.c,v 1.8 2016/10/22 21:55:06 christos Exp $ */
/*
* Copyright (c) 2005 The NetBSD Foundation Inc.
@@ -36,7 +36,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: ins_wstr.c,v 1.7 2013/10/16 19:59:29 roy Exp $");
+__RCSID("$NetBSD: ins_wstr.c,v 1.8 2016/10/22 21:55:06 christos Exp $");
#endif /* not lint */
#include <string.h>
@@ -301,7 +301,7 @@ wins_nwstr(WINDOW *win, const wchar_t *w
}
} else {
/* non-spacing character */
- np = (nschar_t *)malloc(sizeof(nschar_t));
+ np = malloc(sizeof(nschar_t));
if (!np)
return ERR;
np->ch = *scp;
