From cbd86ada20cedbff5f45fe8decb3b7b7da71ef0f Mon Sep 17 00:00:00 2001 From: Andrew Johnson Date: Fri, 4 Nov 2022 11:09:06 -0500 Subject: [PATCH] regRecDevDrv.pl: Don't break long symbol names in DBD files Makes a test symbol name long enough to trigger the problem. Fixes lp: #1995728 --- modules/database/src/tools/registerRecordDeviceDriver.pl | 1 + modules/database/test/ioc/db/devx.c | 6 ++++-- modules/database/test/ioc/db/devx.dbd | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/modules/database/src/tools/registerRecordDeviceDriver.pl b/modules/database/src/tools/registerRecordDeviceDriver.pl index 076ba9d21..940b422d9 100644 --- a/modules/database/src/tools/registerRecordDeviceDriver.pl +++ b/modules/database/src/tools/registerRecordDeviceDriver.pl @@ -46,6 +46,7 @@ if ($opt_D) { # Output dependencies only } $Text::Wrap::columns = 75; +$Text::Wrap::huge = 'overflow'; # Eliminate chars not allowed in C symbol names my $c_bad_ident_chars = '[^0-9A-Za-z_]'; diff --git a/modules/database/test/ioc/db/devx.c b/modules/database/test/ioc/db/devx.c index 448d03f53..66cbb74f5 100644 --- a/modules/database/test/ioc/db/devx.c +++ b/modules/database/test/ioc/db/devx.c @@ -131,13 +131,15 @@ static long xscanio_read(xRecord *prec) return 0; } -static xdset devxScanIO = { +static xdset + devxScanIO_excessively_long_symbol_name_for_testing_code_generation = { 5, NULL, NULL, &xscanio_init_record, &xscanio_get_ioint_info, &xscanio_read }; -epicsExportAddress(dset, devxScanIO); +epicsExportAddress(dset, + devxScanIO_excessively_long_symbol_name_for_testing_code_generation); /* basic DTYP="Soft Channel" */ static long xsoft_init_record(xRecord *prec) diff --git a/modules/database/test/ioc/db/devx.dbd b/modules/database/test/ioc/db/devx.dbd index ee6421bc0..b48ce0263 100644 --- a/modules/database/test/ioc/db/devx.dbd +++ b/modules/database/test/ioc/db/devx.dbd @@ -1,2 +1,2 @@ device(x, CONSTANT, devxSoft, "Soft Channel") -device(x, INST_IO , devxScanIO, "Scan I/O") +device(x, INST_IO, devxScanIO_excessively_long_symbol_name_for_testing_code_generation, "Scan I/O")