Skip to content

Commit 7f9b612

Browse files
anjohnsonmdavidsaver
authored andcommitted
Clang warnings: sprintf() => epicsSnprintf()
1 parent 11c7bc1 commit 7f9b612

File tree

5 files changed

+14
-13
lines changed

5 files changed

+14
-13
lines changed

src/ca/notifierConveyor.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66

77
#include <iostream>
88
#include <queue>
9-
#include <cstdio>
109
#include <cantProceed.h>
10+
#include <epicsStdio.h>
1111
#include <epicsThread.h>
1212
#include <epicsMutex.h>
1313
#include <epicsGuard.h> // Needed for 3.15 builds
@@ -40,7 +40,7 @@ void NotifierConveyor::start()
4040
{
4141
if (thread) return;
4242
char name[40];
43-
std::sprintf(name, "pva::ca::conveyor %p", this);
43+
epicsSnprintf(name, sizeof(name), "pva::ca::conveyor %p", this);
4444
thread = std::tr1::shared_ptr<epicsThread>(new epicsThread(*this, name,
4545
epicsThreadGetStackSize(epicsThreadStackBig),
4646
epicsThreadPriorityLow));

testApp/remote/testChannelConnect.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
#include <iostream>
77
#include <sstream>
88
#include <vector>
9-
#include <stdio.h>
9+
#include <epicsStdio.h>
1010
#include <epicsStdlib.h>
1111
#include <epicsGetopt.h>
1212
#include <epicsExit.h>
@@ -138,7 +138,7 @@ int main (int argc, char *argv[])
138138
char buf[16];
139139
for (size_t i = 0; i < nChannels; i++)
140140
{
141-
sprintf(buf, "test%zu", (i+1));
141+
epicsSnprintf(buf, sizeof(buf), "test%zu", (i+1));
142142
channels.push_back(provider->createChannel(buf, channelRequester));
143143
}
144144

testApp/remote/testGetPerformance.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#include <pv/clientFactory.h>
44
#include <pv/pvAccess.h>
55

6-
#include <stdio.h>
6+
#include <epicsStdio.h>
77
#include <epicsStdlib.h>
88
#include <epicsGetopt.h>
99
#include <epicsThread.h>
@@ -301,9 +301,9 @@ void runTest()
301301
for (int i = 0; i < channels; i++)
302302
{
303303
if (arraySize > 0)
304-
sprintf(buf, "testArray%d_%d", arraySize, i);
304+
epicsSnprintf(buf, sizeof(buf), "testArray%d_%d", arraySize, i);
305305
else
306-
sprintf(buf, "test%d", i);
306+
epicsSnprintf(buf, sizeof(buf), "test%d", i);
307307
channelNames.push_back(buf);
308308
}
309309

testApp/remote/testMonitorPerformance.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#include <pv/clientFactory.h>
44
#include <pv/pvAccess.h>
55

6-
#include <stdio.h>
6+
#include <epicsStdio.h>
77
#include <epicsStdlib.h>
88
#include <epicsGetopt.h>
99
#include <epicsThread.h>
@@ -286,9 +286,9 @@ void runTest()
286286
for (int i = 0; i < channels; i++)
287287
{
288288
if (arraySize > 0)
289-
sprintf(buf, "testArray%d_%d", arraySize, i);
289+
epicsSnprintf(buf, sizeof(buf), "testArray%d_%d", arraySize, i);
290290
else
291-
sprintf(buf, "test%d", i);
291+
epicsSnprintf(buf, sizeof(buf), "test%d", i);
292292
channelNames.push_back(buf);
293293
}
294294

testApp/remote/testServer.cpp

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010

1111
#include <pv/serverContext.h>
1212
#include <pv/clientContextImpl.h>
13+
#include <epicsStdio.h>
1314
#include <epicsExit.h>
1415
#include <pv/standardPVField.h>
1516
#include <pv/pvTimeStamp.h>
@@ -273,7 +274,7 @@ static epics::pvData::PVStructure::shared_pointer createNTTable(int columnsCount
273274
PVStringArray::svector labels(columnsCount);
274275
for (int i = 0; i < columnsCount; i++)
275276
{
276-
sprintf(sbuf, "column%d", i);
277+
epicsSnprintf(sbuf, sizeof(sbuf), "column%d", i);
277278
fieldNames[i] = sbuf;
278279
fields[i] = getFieldCreate()->createScalarArray(pvDouble);
279280
labels[i] = sbuf;
@@ -315,7 +316,7 @@ static epics::pvData::PVStructure::shared_pointer createNTNameValue(int columnsC
315316
PVStringArray::svector labels(columnsCount);
316317
for (int i = 0; i < columnsCount; i++)
317318
{
318-
sprintf(sbuf, "name%d", i);
319+
epicsSnprintf(sbuf, sizeof(sbuf), "name%d", i);
319320
fieldNames[i] = sbuf;
320321
fields[i] = getFieldCreate()->createScalarArray(pvDouble);
321322
labels[i] = sbuf;
@@ -1318,7 +1319,7 @@ class MockChannelRPC :
13181319
PVStringArray::svector labels(columnsCount);
13191320
for (int i = 0; i < columnsCount; i++)
13201321
{
1321-
sprintf(sbuf, "name%d", i);
1322+
epicsSnprintf(sbuf, sizeof(sbuf), "name%d", i);
13221323
labels[i] = sbuf;
13231324
}
13241325

0 commit comments

Comments
 (0)