Lookup() constify WindGetCommandTable() returns 'const'
This commit related to the dynamic creation of data that is used to parse commands and options via Lookup. windows/windows.h: Lookup() constify call-site tcltk/tclmagic.c: Lookup() constify call-site graphics/W3Dmain.c: Lookup() constify call-site windows/windSend.c: Lookup() constify call-site windows/windMain.c: Lookup() constify call-site windows/windInt.h: Lookup() constify call-site textio/txMain.c: Lookup() constify call-site
This commit is contained in:
parent
882d82a8ae
commit
586e9f1e36
|
|
@ -645,7 +645,7 @@ w3dHelp(w, cmd)
|
|||
MagWindow *w;
|
||||
TxCommand *cmd;
|
||||
{
|
||||
char **msg;
|
||||
const char * const *msg;
|
||||
W3DclientRec *crec = (W3DclientRec *) w->w_clientData;
|
||||
|
||||
if (cmd->tx_argc == 1)
|
||||
|
|
|
|||
|
|
@ -512,7 +512,7 @@ _magic_initialize(ClientData clientData,
|
|||
int n, i;
|
||||
char keyword[100];
|
||||
char *kwptr = keyword + 7;
|
||||
char **commandTable;
|
||||
const char * const *commandTable;
|
||||
int result;
|
||||
|
||||
/* Is magic being executed in a slave interpreter? */
|
||||
|
|
|
|||
|
|
@ -104,7 +104,7 @@ void
|
|||
TxInitReadline()
|
||||
{
|
||||
int i, j;
|
||||
char **commandTable;
|
||||
const char * const *commandTable;
|
||||
char nobell[] = "set bell-style none";
|
||||
|
||||
rl_getc_function = TxGetChar;
|
||||
|
|
|
|||
|
|
@ -36,7 +36,7 @@ typedef struct WIND_S3 {
|
|||
bool (*w_exit)();
|
||||
void (*w_reposition)(); /* called when a window moves or changes size */
|
||||
GrGlyph *w_icon;
|
||||
char **w_commandTable;
|
||||
const char * const *w_commandTable;
|
||||
void (**w_functionTable)();
|
||||
struct WIND_S3 *w_nextClient;
|
||||
} clientRec;
|
||||
|
|
|
|||
|
|
@ -260,8 +260,9 @@ WindAddClient(clientName, create, delete, redisplay, command, update,
|
|||
/* Commands and functions should be registered with the client */
|
||||
/* using the WindAddCommand() function. */
|
||||
|
||||
res->w_commandTable = (char **)mallocMagic(sizeof(char *));
|
||||
*(res->w_commandTable) = NULL;
|
||||
const char **newtable = (const char **)mallocMagic(sizeof(char *));
|
||||
newtable[0] = NULL;
|
||||
res->w_commandTable = newtable;
|
||||
res->w_functionTable = (void (**)())mallocMagic(sizeof(void (*)()));
|
||||
*(res->w_functionTable) = NULL;
|
||||
|
||||
|
|
@ -406,7 +407,7 @@ WindExecute(w, rc, cmd)
|
|||
{
|
||||
int cmdNum;
|
||||
clientRec *client = (clientRec *) rc;
|
||||
char **commandTable = client->w_commandTable;
|
||||
const char * const *commandTable = client->w_commandTable;
|
||||
void (**functionTable)() = client->w_functionTable;
|
||||
|
||||
if (cmd->tx_argc > 0)
|
||||
|
|
@ -452,9 +453,9 @@ WindAddCommand(rc, text, func, dynamic)
|
|||
{
|
||||
int cidx, numCommands = 0;
|
||||
clientRec *client = (clientRec *) rc;
|
||||
char **commandTable = client->w_commandTable;
|
||||
const char * const *commandTable = client->w_commandTable;
|
||||
void (**functionTable)() = client->w_functionTable;
|
||||
char **newcmdTable;
|
||||
const char **newcmdTable;
|
||||
void (**newfnTable)();
|
||||
|
||||
/* Find the number of commands and functions, increment by one, and */
|
||||
|
|
@ -463,7 +464,7 @@ WindAddCommand(rc, text, func, dynamic)
|
|||
while (commandTable[numCommands] != NULL) numCommands++;
|
||||
numCommands++;
|
||||
|
||||
newcmdTable = (char **)mallocMagic((numCommands + 1) * sizeof(char *));
|
||||
newcmdTable = (const char **)mallocMagic((numCommands + 1) * sizeof(char *));
|
||||
newfnTable = (void (**)())mallocMagic((numCommands + 1) * sizeof(void (*)()));
|
||||
|
||||
/* Copy the old values, inserting the new command in alphabetical */
|
||||
|
|
@ -493,7 +494,7 @@ WindAddCommand(rc, text, func, dynamic)
|
|||
/* Release memory for the original pointers, and replace the */
|
||||
/* pointers in the client record. */
|
||||
|
||||
freeMagic(commandTable);
|
||||
freeMagic((void*)commandTable);
|
||||
freeMagic(functionTable);
|
||||
|
||||
client->w_commandTable = newcmdTable;
|
||||
|
|
@ -534,7 +535,7 @@ WindReplaceCommand(rc, command, newfunc)
|
|||
{
|
||||
int cidx, clen;
|
||||
clientRec *client = (clientRec *) rc;
|
||||
char **commandTable = client->w_commandTable;
|
||||
const char * const *commandTable = client->w_commandTable;
|
||||
void (**functionTable)() = client->w_functionTable;
|
||||
|
||||
clen = strlen(command);
|
||||
|
|
@ -569,7 +570,7 @@ WindReplaceCommand(rc, command, newfunc)
|
|||
* ----------------------------------------------------------------------------
|
||||
*/
|
||||
|
||||
char **
|
||||
const char * const *
|
||||
WindGetCommandTable(rc)
|
||||
WindClient rc;
|
||||
{
|
||||
|
|
|
|||
|
|
@ -265,7 +265,7 @@ WindSendCommand(w, cmd, quiet)
|
|||
(*(windClient->w_command))(w, cmd);
|
||||
else if ((windCmdNum >= 0) && (clientCmdNum >= 0))
|
||||
{
|
||||
char *(ownTable[3]);
|
||||
const char *(ownTable[3]);
|
||||
int ownCmdNum;
|
||||
|
||||
ownTable[0] = rc->w_commandTable[clientCmdNum];
|
||||
|
|
|
|||
|
|
@ -250,7 +250,7 @@ extern void windFixSurfaceArea();
|
|||
extern int WindExecute();
|
||||
extern void WindAddCommand();
|
||||
extern int WindReplaceCommand();
|
||||
extern char **WindGetCommandTable();
|
||||
extern const char * const *WindGetCommandTable();
|
||||
extern int windCheckOnlyWindow(MagWindow **, WindClient);
|
||||
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue