/****************************************************************************
- * Copyright (c) 1998-2004,2005 Free Software Foundation, Inc. *
+ * Copyright (c) 1998-2009,2010 Free Software Foundation, Inc. *
* *
* Permission is hereby granted, free of charge, to any person obtaining a *
* copy of this software and associated documentation files (the *
#include "menu.priv.h"
#if USE_WIDEC_SUPPORT
+#if HAVE_WCTYPE_H
#include <wctype.h>
#endif
+#endif
-MODULE_ID("$Id: m_item_new.c,v 1.25 2005/04/16 22:24:38 tom Exp $")
+MODULE_ID("$Id: m_item_new.c,v 1.30 2010/01/23 21:20:11 tom Exp $")
/*---------------------------------------------------------------------------
| Facility : libnmenu
assert(s);
if (count > 0
- && (temp = typeCalloc(wchar_t, (2 + count))) != 0)
+ && (temp = typeCalloc(wchar_t, (2 + (unsigned)count))) != 0)
{
int n;
mbstowcs(temp, s, (unsigned)count);
for (n = 0; n < count; ++n)
- if (!iswprint(temp[n]))
+ if (!iswprint((wint_t) temp[n]))
{
result = FALSE;
break;
}
else
{
- item = (ITEM *) calloc(1, sizeof(ITEM));
+ item = typeCalloc(ITEM, 1);
if (item)
{
*item = _nc_Default_Item; /* hope we have struct assignment */
NCURSES_EXPORT(int)
free_item(ITEM * item)
{
- T((T_CALLED("free_item(%p)"), item));
+ T((T_CALLED("free_item(%p)"), (void *)item));
if (!item)
RETURN(E_BAD_ARGUMENT);
{
unsigned l;
- T((T_CALLED("set_menu_mark(%p,%s)"), menu, _nc_visbuf(mark)));
+ T((T_CALLED("set_menu_mark(%p,%s)"), (void *)menu, _nc_visbuf(mark)));
if (mark && (*mark != '\0') && Is_Printable_String(mark))
l = strlen(mark);
menu->marklen = l;
if (l)
{
- menu->mark = (char *)malloc(l + 1);
+ menu->mark = strdup(mark);
if (menu->mark)
{
strcpy(menu->mark, mark);
else
{
menu->mark = old_mark;
+ menu->marklen = (old_mark != 0) ? strlen(old_mark) : 0;
RETURN(E_SYSTEM_ERROR);
}
}
NCURSES_EXPORT(const char *)
menu_mark(const MENU * menu)
{
- T((T_CALLED("menu_mark(%p)"), menu));
+ T((T_CALLED("menu_mark(%p)"), (const void *)menu));
returnPtr(Normalize_Menu(menu)->mark);
}