From 511bf1ffcae641a9994c0f37c8bb66ed81caf44e Mon Sep 17 00:00:00 2001 From: Michael Davidsaver Date: Sat, 25 Nov 2023 12:14:00 -0800 Subject: [PATCH] const-ify dbLink arrays external code really should never be modifying pamaplinkType[] --- modules/database/src/ioc/db/dbLock.c | 2 +- modules/database/src/ioc/dbStatic/dbStaticLib.c | 6 +++--- modules/database/src/ioc/dbStatic/link.h | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/modules/database/src/ioc/db/dbLock.c b/modules/database/src/ioc/db/dbLock.c index 8ddb5dfc8..9a6b9efea 100644 --- a/modules/database/src/ioc/db/dbLock.c +++ b/modules/database/src/ioc/db/dbLock.c @@ -869,7 +869,7 @@ nosplit: } } -static char *msstring[4]={"NMS","MS","MSI","MSS"}; +static const char *msstring[4]={"NMS","MS","MSI","MSS"}; long dblsr(char *recordname,int level) { diff --git a/modules/database/src/ioc/dbStatic/dbStaticLib.c b/modules/database/src/ioc/dbStatic/dbStaticLib.c index 19e154956..eb008fb87 100644 --- a/modules/database/src/ioc/dbStatic/dbStaticLib.c +++ b/modules/database/src/ioc/dbStatic/dbStaticLib.c @@ -57,10 +57,10 @@ static char *pNullString = ""; */ STATIC_ASSERT(messagesize >= 21); -static char *ppstring[5]={" NPP"," PP"," CA"," CP"," CPP"}; -static char *msstring[4]={" NMS"," MS"," MSI"," MSS"}; +static const char *ppstring[5]={" NPP"," PP"," CA"," CP"," CPP"}; +static const char *msstring[4]={" NMS"," MS"," MSI"," MSS"}; -maplinkType pamaplinkType[LINK_NTYPES] = { +const maplinkType pamaplinkType[LINK_NTYPES] = { {"CONSTANT",CONSTANT}, {"PV_LINK",PV_LINK}, {"VME_IO",VME_IO}, diff --git a/modules/database/src/ioc/dbStatic/link.h b/modules/database/src/ioc/dbStatic/link.h index 74607a1b1..a7edebf57 100644 --- a/modules/database/src/ioc/dbStatic/link.h +++ b/modules/database/src/ioc/dbStatic/link.h @@ -43,11 +43,11 @@ extern "C" { #define VXI_IO 15 #define LINK_NTYPES 16 typedef struct maplinkType { - char *strvalue; + const char *strvalue; int value; } maplinkType; -DBCORE_API extern maplinkType pamaplinkType[]; +DBCORE_API extern const maplinkType pamaplinkType[LINK_NTYPES]; #define VXIDYNAMIC 0 #define VXISTATIC 1