Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix handling of userptr, no longer assumes userptr is a pointer to a

Browse Source 
string to be copied, we now just copy the passed pointer.  Also fixed
bug with handling of NULL passed to menu_userptr.
This commit is contained in:
blymn 2000-03-05 04:09:53 +00:00
parent 1dfdd10eae
commit 307e770b37
1 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
lib/libmenu/userptr.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: userptr.c,v 1.5 1999/12/22 14:38:13 kleink Exp $ */
/* $NetBSD: userptr.c,v 1.6 2000/03/05 04:09:53 blymn Exp $ */
/*-
* Copyright (c) 1998-1999 Brett Lymn (blymn@baea.com.au, brett_lymn@yahoo.com.au)
@ -46,11 +46,7 @@ set_item_userptr(param_item, userptr)
{
ITEM *item = (param_item != NULL) ? param_item : &_menui_default_item;
if ((item->userptr = (char *) malloc(strlen(userptr))) == NULL)
return E_SYSTEM_ERROR;
strcpy(item->userptr, userptr);
item->userptr = userptr;
return E_OK;
}
@ -85,15 +81,13 @@ menu_userptr(menu)
* Set the user pointer for the given menu
*/
int
set_menu_userptr(menu, userptr)
MENU *menu;
set_menu_userptr(param_menu, userptr)
MENU *param_menu;
char *userptr;
{
MENU *menu = (param_menu != NULL) ? param_menu : &_menui_default_menu;
if ((menu->userptr = (char *) malloc(strlen(userptr))) == NULL)
return E_SYSTEM_ERROR;
strcpy(menu->userptr, userptr);
menu->userptr = userptr;
return E_OK;
}