From dc45242d4679a4a4ab7b71bbece39ebd2ca4a2ba Mon Sep 17 00:00:00 2001 From: "Darryl L. Miles" Date: Mon, 25 Aug 2025 11:19:15 +0100 Subject: [PATCH] database: DBTypeLongNameTbl() constify data (const char*) --- commands/CmdWizard.c | 4 ++-- database/DBtechtype.c | 2 +- database/database.h.in | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/commands/CmdWizard.c b/commands/CmdWizard.c index 2e72d053..06ef55ab 100644 --- a/commands/CmdWizard.c +++ b/commands/CmdWizard.c @@ -232,7 +232,7 @@ showTech( fprintf(outf, "\n"); fprintf(outf, "Types:\n"); for (i = 0; i < DBNumTypes; i++) { - int pl ; char *spl ; + int pl ; const char *spl ; pl = DBPlane(i); spl = ( pl <= 0 || pl > DBNumPlanes ) ? "??" : DBPlaneLongName(pl); @@ -1047,7 +1047,7 @@ CmdWatch( pNum = DBTechNamePlane(cmd->tx_argv[1]); if (pNum < 0) { - char *cp; + const char *cp; TxError("Unrecognized plane: %s. Legal names are:\n", cmd->tx_argv[1]); for(pNum=0; pNum < PL_MAXTYPES; pNum++) { diff --git a/database/DBtechtype.c b/database/DBtechtype.c index 12a5284b..8db59f77 100644 --- a/database/DBtechtype.c +++ b/database/DBtechtype.c @@ -38,7 +38,7 @@ static char rcsid[] __attribute__ ((unused)) = "$Header: /usr/cvsroot/magic-8.0/ /* Types and their names */ int DBNumTypes; -char *DBTypeLongNameTbl[NT]; +const char *DBTypeLongNameTbl[NT]; int DBTypePlaneTbl[NT]; /* Normally accessed as macro "DBPlane(x)" */ NameList dbTypeNameLists = {NULL, NULL, NULL, (ClientData)0, FALSE}; HashTable DBTypeAliasTable; diff --git a/database/database.h.in b/database/database.h.in index 6a0cbea1..9e6cdcfc 100644 --- a/database/database.h.in +++ b/database/database.h.in @@ -1121,7 +1121,7 @@ extern int DBTypePlaneTbl[TT_MAXTYPES]; extern PlaneMask DBTypePlaneMaskTbl[TT_MAXTYPES]; /* Gives the long name for each tile type: */ -extern char *DBTypeLongNameTbl[TT_MAXTYPES]; +extern const char *DBTypeLongNameTbl[TT_MAXTYPES]; /* Gives a short name for a tile type: */ extern const char *DBTypeShortName(TileType type);