VARCem/PDCurses
1
0
Fork 0
mirror of https://github.com/VARCem/PDCurses.git synced 2026-09-25 00:05:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Removed casts from calloc(), malloc() and realloc(); simplified.

Browse Source
This commit is contained in:
William McBrine
2006-08-12 21:13:45 +00:00
parent af2dc4f623
commit 16b4c7113f
9 changed files with 50 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
demos/tuidemo.c
View File

@@ -1,6 +1,6 @@
/********************************* tuidemo.c ********************************/
/*
* $Id: tuidemo.c,v 1.16 2006/07/29 06:00:54 wmcbrine Exp $
* $Id: tuidemo.c,v 1.17 2006/08/12 21:13:45 wmcbrine Exp $
*
* Author : P.J. Kunst (kunst@prl.philips.nl)
* Date : 25-02-93
@@ -39,7 +39,7 @@ void address(void)
int i, field = 50;
for (i = 0; i < 5; i++)
fieldbuf[i] = (char *) calloc(1, field + 1);
fieldbuf[i] = calloc(1, field + 1);
if (getstrings(fieldname, fieldbuf, field) != KEY_ESC)
{

6
dos/pdcclip.c
View File

@@ -20,7 +20,7 @@
#include <stdlib.h>
#include <string.h>
RCSID("$Id: pdcclip.c,v 1.23 2006/07/29 06:00:54 wmcbrine Exp $");
RCSID("$Id: pdcclip.c,v 1.24 2006/08/12 21:13:45 wmcbrine Exp $");
/* global clipboard contents, should be NULL if none set */
@@ -62,7 +62,7 @@ int PDC_getclipboard(char **contents, long *length)
return PDC_CLIP_EMPTY;
len = strlen(pdc_DOS_clipboard);
if ((*contents = (char *)malloc(len + 1)) == NULL)
if ((*contents = malloc(len + 1)) == NULL)
return PDC_CLIP_MEMORY_ERROR;
strcpy(*contents, pdc_DOS_clipboard);
@@ -105,7 +105,7 @@ int PDC_setclipboard(const char *contents, long length)
if (contents != NULL)
{
if ((pdc_DOS_clipboard = (char *)malloc(length + 1)) == NULL)
if ((pdc_DOS_clipboard = malloc(length + 1)) == NULL)
return PDC_CLIP_MEMORY_ERROR;
strcpy(pdc_DOS_clipboard, contents);

17
dos/pdcscrn.c
View File

@@ -24,7 +24,7 @@
# include <sys/movedata.h>
#endif
RCSID("$Id: pdcscrn.c,v 1.46 2006/08/12 20:11:36 wmcbrine Exp $");
RCSID("$Id: pdcscrn.c,v 1.47 2006/08/12 21:13:45 wmcbrine Exp $");
union REGS regs; /* used in various other modules */
@@ -141,11 +141,13 @@ int PDC_scr_open(int argc, char **argv)
#endif
PDC_LOG(("PDC_scr_open() - called\n"));
if (!(SP = (SCREEN *)calloc(1, sizeof(SCREEN)))
|| !(atrtab = (unsigned char *)calloc(MAX_ATRTAB, 1)) )
SP = calloc(1, sizeof(SCREEN));
atrtab = calloc(MAX_ATRTAB, 1);
if (!SP || !atrtab)
return ERR;
SP->orig_attr = FALSE;
SP->orig_attr = FALSE;
PDC_get_cursor_pos(&SP->cursrow, &SP->curscol);
@@ -155,8 +157,8 @@ int PDC_scr_open(int argc, char **argv)
pdc_adapter = PDC_query_adapter_type();
pdc_scrnmode = PDC_get_scrn_mode();
pdc_font = PDC_get_font();
SP->lines = PDC_get_rows();
SP->cols = PDC_get_columns();
@@ -177,8 +179,9 @@ int PDC_scr_open(int argc, char **argv)
saved_lines = SP->lines;
saved_cols = SP->cols;
if ((saved_screen = (unsigned short *)malloc(saved_lines
* saved_cols * 2)) == NULL)
saved_screen = malloc(saved_lines * saved_cols * 2);
if (!saved_screen)
{
SP->_preserve = FALSE;
return OK;

4
os2/pdcclip.c
View File

@@ -24,7 +24,7 @@
#include <stdlib.h>
#include <string.h>
RCSID("$Id: pdcclip.c,v 1.20 2006/03/29 20:06:40 wmcbrine Exp $");
RCSID("$Id: pdcclip.c,v 1.21 2006/08/12 21:13:45 wmcbrine Exp $");
/*man-start**************************************************************
@@ -86,7 +86,7 @@ int PDC_getclipboard(char **contents, long *length)
if (ulRet)
{
len = strlen((char *)ulRet);
*contents = (char *)malloc(len + 1);
*contents = malloc(len + 1);
if (!*contents)
rc = PDC_CLIP_MEMORY_ERROR;

24
os2/pdcscrn.c
View File

@@ -20,7 +20,7 @@
#include <curses.h>
#include <stdlib.h>
RCSID("$Id: pdcscrn.c,v 1.41 2006/08/12 20:11:36 wmcbrine Exp $");
RCSID("$Id: pdcscrn.c,v 1.42 2006/08/12 21:13:45 wmcbrine Exp $");
#ifdef EMXVIDEO
static unsigned char *saved_screen = NULL;
@@ -167,8 +167,10 @@ int PDC_scr_open(int argc, char **argv)
#endif
PDC_LOG(("PDC_scr_open() - called\n"));
if (!(SP = (SCREEN *)calloc(1, sizeof(SCREEN)))
|| !(atrtab = (unsigned char *)calloc(MAX_ATRTAB, 1)) )
SP = calloc(1, sizeof(SCREEN));
atrtab = calloc(MAX_ATRTAB, 1);
if (!SP || !atrtab)
return ERR;
#ifdef EMXVIDEO
@@ -211,23 +213,17 @@ int PDC_scr_open(int argc, char **argv)
{
saved_lines = SP->lines;
saved_cols = SP->cols;
#ifdef EMXVIDEO
if ((saved_screen = (unsigned char *)malloc(2 * saved_lines *
saved_cols)) == NULL)
saved_screen = malloc(2 * saved_lines * saved_cols);
if (!saved_screen)
{
SP->_preserve = FALSE;
return OK;
}
#ifdef EMXVIDEO
v_getline(saved_screen, 0, 0, saved_lines * saved_cols);
#else
if ((saved_screen = (PCH)malloc(2 * saved_lines *
saved_cols)) == NULL)
{
SP->_preserve = FALSE;
return OK;
}
totchars = saved_lines * saved_cols * 2;
VioReadCellStr((PCH)saved_screen, &totchars, 0, 0, (HVIO)NULL);
#endif

7
panel/panel.c
View File

@@ -23,7 +23,7 @@
#include <curspriv.h>
#include <stdlib.h>
RCSID("$Id: panel.c,v 1.22 2006/08/10 01:44:08 wmcbrine Exp $");
RCSID("$Id: panel.c,v 1.23 2006/08/12 21:13:45 wmcbrine Exp $");
/*man-start**************************************************************
@@ -261,8 +261,7 @@ static void __calculate_obscure(void)
{
if (__panels_overlapped(pan, pan2))
{
if ((tobs = (PANELOBS *)malloc(sizeof(PANELOBS)))
== NULL)
if ((tobs = malloc(sizeof(PANELOBS))) == NULL)
return;
tobs->pan = pan2;
@@ -588,7 +587,7 @@ int move_panel(PANEL *pan, int starty, int startx)
PANEL *new_panel(WINDOW *win)
{
PANEL *pan = (PANEL *)malloc(sizeof(PANEL));
PANEL *pan = malloc(sizeof(PANEL));
if (!__stdscr_pseudo_panel.win)
{

20
win32/pdcscrn.c
View File

@@ -24,7 +24,7 @@
#define CURSES_LIBRARY 1
#include <curses.h>
RCSID("$Id: pdcscrn.c,v 1.54 2006/08/12 20:11:36 wmcbrine Exp $");
RCSID("$Id: pdcscrn.c,v 1.55 2006/08/12 21:13:45 wmcbrine Exp $");
#define PDC_RESTORE_NONE 0
#define PDC_RESTORE_BUFFER 1
@@ -139,8 +139,10 @@ int PDC_scr_open(int argc, char **argv)
PDC_LOG(("PDC_scr_open() - called\n"));
if (!(SP = (SCREEN *)calloc(1, sizeof(SCREEN)))
|| !(atrtab = (unsigned char *)calloc(MAX_ATRTAB, 1)) )
SP = calloc(1, sizeof(SCREEN));
atrtab = calloc(MAX_ATRTAB, 1);
if (!SP || !atrtab)
return ERR;
hConOut = GetStdHandle(STD_OUTPUT_HANDLE);
@@ -183,8 +185,10 @@ int PDC_scr_open(int argc, char **argv)
{
/* Attempt to save the complete console buffer */
if ((ciSaveBuffer = (CHAR_INFO*)malloc(orig_scr.dwSize.X *
orig_scr.dwSize.Y * sizeof(CHAR_INFO))) == NULL)
ciSaveBuffer = malloc(orig_scr.dwSize.X *
orig_scr.dwSize.Y * sizeof(CHAR_INFO));
if (!ciSaveBuffer)
{
PDC_LOG(("PDC_scr_open() - malloc failure (1)\n"));
@@ -214,8 +218,10 @@ int PDC_scr_open(int argc, char **argv)
bufsize.Y = orig_scr.srWindow.Bottom -
orig_scr.srWindow.Top + 1;
if ((ciSaveBuffer = (CHAR_INFO*)malloc(bufsize.X *
bufsize.Y * sizeof(CHAR_INFO))) == NULL)
ciSaveBuffer = malloc(bufsize.X * bufsize.Y *
sizeof(CHAR_INFO));
if (!ciSaveBuffer)
{
PDC_LOG(("PDC_scr_open() - malloc failure (2)\n"));

4
x11/pdcclip.c
View File

@@ -19,7 +19,7 @@
#include <stdlib.h>
RCSID("$Id: pdcclip.c,v 1.22 2006/07/31 00:20:18 wmcbrine Exp $");
RCSID("$Id: pdcclip.c,v 1.23 2006/08/12 21:13:45 wmcbrine Exp $");
/*man-start**************************************************************
@@ -69,7 +69,7 @@ int PDC_getclipboard(char **contents, long *length)
if (len != 0)
{
*contents = (char *)malloc(len + 1);
*contents = malloc(len + 1);
if (!*contents)
XCursesExitCursesProcess(6, "exiting from "

13
x11/x11.c
View File

@@ -32,7 +32,7 @@
#include <stdlib.h>
#include <string.h>
RCSID("$Id: x11.c,v 1.7 2006/07/31 00:20:18 wmcbrine Exp $");
RCSID("$Id: x11.c,v 1.8 2006/08/12 21:13:45 wmcbrine Exp $");
#ifndef XPOINTER_TYPEDEFED
typedef char * XPointer;
@@ -2242,10 +2242,9 @@ static void SelectionSet(void)
if (length > (int)tmpsel_length)
{
if (tmpsel_length == 0)
tmpsel = (chtype *)malloc(newlen * sizeof(chtype));
tmpsel = malloc(newlen * sizeof(chtype));
else
tmpsel = (chtype *)realloc(tmpsel,
newlen * sizeof(chtype));
tmpsel = realloc(tmpsel, newlen * sizeof(chtype));
}
if (!tmpsel)
@@ -3225,11 +3224,9 @@ static void XCursesProcessRequestsFromCurses(XtPointer client_data, int *fid,
if (length > (long)tmpsel_length)
{
if (tmpsel_length == 0)
tmpsel = (chtype *)malloc((length + 1) *
sizeof(chtype));
tmpsel = malloc((length + 1) * sizeof(chtype));
else
tmpsel = (chtype *)realloc(tmpsel, (length + 1) *
sizeof(chtype));
tmpsel = realloc(tmpsel, (length + 1) * sizeof(chtype));
}
if (!tmpsel)