X-Git-Url: https://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=form%2Ffrm_req_name.c;h=c24db1a8a9241ca5c066efad136df67da64a5a9c;hp=63006517ee855507b55b52565d77cf50525a4b84;hb=67ab4b308e932639a3a832052228d445c41c54b4;hpb=0eb88fc5281804773e2a0c7a488a4452463535ce diff --git a/form/frm_req_name.c b/form/frm_req_name.c index 63006517..c24db1a8 100644 --- a/form/frm_req_name.c +++ b/form/frm_req_name.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright (c) 1998 Free Software Foundation, Inc. * + * Copyright (c) 1998-2009,2012 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,71 +37,73 @@ #include "form.priv.h" -MODULE_ID("$Id: frm_req_name.c,v 1.7 1999/05/16 17:21:53 juergen Exp $") - -static const char *request_names[ MAX_FORM_COMMAND - MIN_FORM_COMMAND + 1 ] = { - "NEXT_PAGE" , - "PREV_PAGE" , - "FIRST_PAGE" , - "LAST_PAGE" , - - "NEXT_FIELD" , - "PREV_FIELD" , - "FIRST_FIELD" , - "LAST_FIELD" , - "SNEXT_FIELD" , - "SPREV_FIELD" , - "SFIRST_FIELD" , - "SLAST_FIELD" , - "LEFT_FIELD" , - "RIGHT_FIELD" , - "UP_FIELD" , - "DOWN_FIELD" , - - "NEXT_CHAR" , - "PREV_CHAR" , - "NEXT_LINE" , - "PREV_LINE" , - "NEXT_WORD" , - "PREV_WORD" , - "BEG_FIELD" , - "END_FIELD" , - "BEG_LINE" , - "END_LINE" , - "LEFT_CHAR" , - "RIGHT_CHAR" , - "UP_CHAR" , - "DOWN_CHAR" , - - "NEW_LINE" , - "INS_CHAR" , - "INS_LINE" , - "DEL_CHAR" , - "DEL_PREV" , - "DEL_LINE" , - "DEL_WORD" , - "CLR_EOL" , - "CLR_EOF" , - "CLR_FIELD" , - "OVL_MODE" , - "INS_MODE" , - "SCR_FLINE" , - "SCR_BLINE" , - "SCR_FPAGE" , - "SCR_BPAGE" , - "SCR_FHPAGE" , - "SCR_BHPAGE" , - "SCR_FCHAR" , - "SCR_BCHAR" , - "SCR_HFLINE" , - "SCR_HBLINE" , - "SCR_HFHALF" , - "SCR_HBHALF" , - - "VALIDATION" , - "NEXT_CHOICE" , - "PREV_CHOICE" +MODULE_ID("$Id: frm_req_name.c,v 1.18 2012/07/21 23:17:23 tom Exp $") + +static const char *request_names[MAX_FORM_COMMAND - MIN_FORM_COMMAND + 1] = +{ + "NEXT_PAGE", + "PREV_PAGE", + "FIRST_PAGE", + "LAST_PAGE", + + "NEXT_FIELD", + "PREV_FIELD", + "FIRST_FIELD", + "LAST_FIELD", + "SNEXT_FIELD", + "SPREV_FIELD", + "SFIRST_FIELD", + "SLAST_FIELD", + "LEFT_FIELD", + "RIGHT_FIELD", + "UP_FIELD", + "DOWN_FIELD", + + "NEXT_CHAR", + "PREV_CHAR", + "NEXT_LINE", + "PREV_LINE", + "NEXT_WORD", + "PREV_WORD", + "BEG_FIELD", + "END_FIELD", + "BEG_LINE", + "END_LINE", + "LEFT_CHAR", + "RIGHT_CHAR", + "UP_CHAR", + "DOWN_CHAR", + + "NEW_LINE", + "INS_CHAR", + "INS_LINE", + "DEL_CHAR", + "DEL_PREV", + "DEL_LINE", + "DEL_WORD", + "CLR_EOL", + "CLR_EOF", + "CLR_FIELD", + "OVL_MODE", + "INS_MODE", + "SCR_FLINE", + "SCR_BLINE", + "SCR_FPAGE", + "SCR_BPAGE", + "SCR_FHPAGE", + "SCR_BHPAGE", + "SCR_FCHAR", + "SCR_BCHAR", + "SCR_HFLINE", + "SCR_HBLINE", + "SCR_HFHALF", + "SCR_HBHALF", + + "VALIDATION", + "NEXT_CHOICE", + "PREV_CHOICE" }; + #define A_SIZE (sizeof(request_names)/sizeof(request_names[0])) /*--------------------------------------------------------------------------- @@ -113,18 +115,20 @@ static const char *request_names[ MAX_FORM_COMMAND - MIN_FORM_COMMAND + 1 ] = { | Return Values : Pointer to name - on success | NULL - on invalid request code +--------------------------------------------------------------------------*/ -const char *form_request_name( int request ) +NCURSES_EXPORT(const char *) +form_request_name(int request) { - if ( (request < MIN_FORM_COMMAND) || (request > MAX_FORM_COMMAND) ) + T((T_CALLED("form_request_name(%d)"), request)); + + if ((request < MIN_FORM_COMMAND) || (request > MAX_FORM_COMMAND)) { - SET_ERROR (E_BAD_ARGUMENT); - return (const char *)0; + SET_ERROR(E_BAD_ARGUMENT); + returnCPtr((const char *)0); } else - return request_names[ request - MIN_FORM_COMMAND ]; + returnCPtr(request_names[request - MIN_FORM_COMMAND]); } - /*--------------------------------------------------------------------------- | Facility : libnform | Function : int form_request_by_name (const char *str); @@ -134,28 +138,34 @@ const char *form_request_name( int request ) | Return Values : Request Id - on success | E_NO_MATCH - request not found +--------------------------------------------------------------------------*/ -int form_request_by_name( const char *str ) -{ +NCURSES_EXPORT(int) +form_request_by_name(const char *str) +{ /* because the table is so small, it doesn't really hurt to run sequentially through it. - */ - unsigned int i = 0; - char buf[16]; - - if (str) + */ + size_t i = 0; + char buf[16]; /* longest name is 10 chars */ + + T((T_CALLED("form_request_by_name(%s)"), _nc_visbuf(str))); + + if (str != 0 && (i = strlen(str)) != 0) { - strncpy(buf,str,sizeof(buf)); - while( (i sizeof(buf) - 2) + i = sizeof(buf) - 2; + memcpy(buf, str, i); + buf[i] = '\0'; + + for (i = 0; buf[i] != '\0'; ++i) { - buf[i] = toupper(buf[i]); - i++; + buf[i] = (char)toupper(UChar(buf[i])); } - - for (i=0; i < A_SIZE; i++) + + for (i = 0; i < A_SIZE; i++) { - if (strncmp(request_names[i],buf,sizeof(buf))==0) - return MIN_FORM_COMMAND + i; - } + if (strcmp(request_names[i], buf) == 0) + returnCode(MIN_FORM_COMMAND + (int)i); + } } RETURN(E_NO_MATCH); }