X-Git-Url: https://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=menu%2Fm_pattern.c;h=3d50cf42c1f9b5ca5507ef00a70b85e8bdbfc838;hp=7187c22458804cbef3024cd1bc4050640d08895c;hb=a8987e73ec254703634802b4f7ee30d3a485524d;hpb=0eb88fc5281804773e2a0c7a488a4452463535ce diff --git a/menu/m_pattern.c b/menu/m_pattern.c index 7187c224..3d50cf42 100644 --- a/menu/m_pattern.c +++ b/menu/m_pattern.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright (c) 1998 Free Software Foundation, Inc. * + * Copyright (c) 1998-2002,2003 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 * @@ -27,7 +27,7 @@ ****************************************************************************/ /**************************************************************************** - * Author: Juergen Pfeifer 1995,1997 * + * Author: Juergen Pfeifer, 1995,1997 * ****************************************************************************/ /*************************************************************************** @@ -37,7 +37,7 @@ #include "menu.priv.h" -MODULE_ID("$Id: m_pattern.c,v 1.4 1999/05/16 17:27:28 juergen Exp $") +MODULE_ID("$Id: m_pattern.c,v 1.9 2003/12/06 17:22:10 tom Exp $") /*--------------------------------------------------------------------------- | Facility : libnmenu @@ -50,9 +50,10 @@ MODULE_ID("$Id: m_pattern.c,v 1.4 1999/05/16 17:27:28 juergen Exp $") | pattern is stored | PatternString - as expected +--------------------------------------------------------------------------*/ -char *menu_pattern(const MENU * menu) +NCURSES_EXPORT(char *) +menu_pattern (const MENU * menu) { - return (menu ? (menu->pattern ? menu->pattern : "") : (char *)0); + return (char *)(menu ? (menu->pattern ? menu->pattern : "") : 0); } /*--------------------------------------------------------------------------- @@ -68,7 +69,8 @@ char *menu_pattern(const MENU * menu) | E_BAD_STATE - menu in user hook routine | E_NO_MATCH - no item matches pattern +--------------------------------------------------------------------------*/ -int set_menu_pattern(MENU *menu, const char *p) +NCURSES_EXPORT(int) +set_menu_pattern (MENU *menu, const char *p) { ITEM *matchitem; int matchpos; @@ -99,7 +101,7 @@ int set_menu_pattern(MENU *menu, const char *p) while(*p) { - if ( !isprint(*p) || + if ( !isprint((unsigned char)(*p)) || (_nc_Match_Next_Character_In_Item_Name(menu,*p,&matchitem) != E_OK) ) { Reset_Pattern(menu);