From 09668bc462a37c1b9337031da6ca1ddd8bbef13c Mon Sep 17 00:00:00 2001 From: "Darryl L. Miles" Date: Fri, 3 Oct 2025 22:06:56 +0100 Subject: [PATCH] SimSelect.c: constify (const char*) TLE.tl_nodeName TLE.tl_simLabel --- sim/SimSelect.c | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/sim/SimSelect.c b/sim/SimSelect.c index a37e7a13..65714470 100644 --- a/sim/SimSelect.c +++ b/sim/SimSelect.c @@ -78,9 +78,9 @@ static SimDefListElt *SimCellLabList = (SimDefListElt *) NULL; */ typedef struct TLE { - char *tl_nodeName; + const char *tl_nodeName; Tile *tl_nodeTile; - char *tl_simLabel; + const char *tl_simLabel; struct TLE *tl_next; } TileListElt; @@ -212,7 +212,7 @@ SimFreeNodeList( while (temp != NULL) { current = temp; temp = temp->tl_next; - freeMagic(current->tl_nodeName); + freeMagic((char*)current->tl_nodeName); freeMagic(current); } *List = (TileListElt *) NULL; @@ -230,7 +230,7 @@ simFreeNodeEntry( if( curr == entry ) { prev->tl_next = curr->tl_next; - freeMagic( entry->tl_nodeName ); + freeMagic( (char*)entry->tl_nodeName ); freeMagic( entry ); return( prev ); /* next element in list */ } @@ -406,8 +406,9 @@ SimSelectFunc( if( ! coord ) HashFind(&SimNodeNameTbl, nodeName); newNodeTile = (TileListElt *) mallocMagic((unsigned) (sizeof (TileListElt))); - newNodeTile->tl_nodeName = (char *) mallocMagic((unsigned) (strlen(nodeName) + 1)); - strcpy(newNodeTile->tl_nodeName, nodeName); + char *tmp = (char *) mallocMagic((unsigned) (strlen(nodeName) + 1)); + strcpy(tmp, nodeName); + newNodeTile->tl_nodeName = tmp; /* assign to const */ newNodeTile->tl_nodeTile = tile; newNodeTile->tl_next = *pHead; *pHead = newNodeTile; @@ -515,7 +516,7 @@ the selection.\n"); if (*cmd == 'd') { - char *name = current->tl_nodeName; + const char *name = current->tl_nodeName; bool coord = (name[0] == '@' && name[1] == '=') ? TRUE : FALSE; strPtr = strrchr( replyLine, '=' ); @@ -527,9 +528,10 @@ the selection.\n"); name = replyLine; if( HashLookOnly(&SimNodeNameTbl, name) == (HashEntry *) NULL) { - freeMagic(current->tl_nodeName); - current->tl_nodeName = (char *) mallocMagic((unsigned) (strlen(name) + 1)); - strcpy(current->tl_nodeName, name); + freeMagic((char*)current->tl_nodeName); + char *tmp = (char *) mallocMagic((unsigned) (strlen(name) + 1)); + strcpy(tmp, name); + current->tl_nodeName = tmp; /* assign to const */ HashFind(&SimNodeNameTbl, current->tl_nodeName); *strPtr++ = '='; }