Skip to content

Commit 650e87b

Browse files
authored
fix: remove security warnings
* Merge pull request #208 from jerzyjamroz/codeql
2 parents 68c21f6 + a30564f commit 650e87b

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

evgMrmApp/src/evgEvtClk.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11

22
#include <stdio.h>
3-
#include <errlog.h>
3+
#include <errlog.h>
44
#include <stdexcept>
55
#include <sstream>
66

7-
#include <mrfCommonIO.h>
8-
#include <mrfCommon.h>
7+
#include <mrfCommonIO.h>
8+
#include <mrfCommon.h>
99
#include <mrfFracSynth.h>
1010

1111
#include "evgMrm.h"
@@ -39,7 +39,7 @@ evgMrm::setRFFreq (epicsFloat64 RFref) {
3939

4040
epicsFloat64
4141
evgMrm::getRFFreq() const {
42-
return m_RFref;
42+
return m_RFref;
4343
}
4444

4545
void
@@ -67,7 +67,7 @@ evgMrm::setFracSynFreq(epicsFloat64 freq) {
6767
epicsUInt32 controlWord = FracSynthControlWord (freq, MRF_FRAC_SYNTH_REF, 0, &error);
6868
if ((!controlWord) || (error > 100.0)) {
6969
char err[80];
70-
sprintf(err, "Cannot set event clock speed to %f MHz.\n", freq);
70+
snprintf(err, sizeof(err), "Cannot set event clock speed to %f MHz.\n", freq);
7171
std::string strErr(err);
7272
throw std::runtime_error(strErr);
7373
}

evrMrmApp/src/drvemCML.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -367,10 +367,10 @@ MRMCML::getPattern(pattern p, unsigned char *buf, epicsUInt32 blen) const
367367
for(epicsUInt32 i=0; i<blen; i++) {
368368
size_t cmlword = (i/mult);
369369
size_t cmlbit = (i%mult);
370-
370+
371371
size_t cpuword, cpubit;
372372
bool first; // first bit in CPU word
373-
373+
374374
if(mult<32) {
375375
first = cmlbit==0;
376376
cpuword = cmlword;
@@ -386,11 +386,11 @@ MRMCML::getPattern(pattern p, unsigned char *buf, epicsUInt32 blen) const
386386
cpubit = cmlbit<8 ? 7-cmlbit : 31-(cmlbit-8);
387387
#endif
388388
}
389-
389+
390390
if(first) {
391391
val=shadowPattern[p][cpuword];
392392
}
393-
393+
394394
buf[i]=val>>cpubit;
395395
buf[i]&=0x1;
396396
}
@@ -517,7 +517,7 @@ MRMCML::syncPattern(pattern p)
517517
case cmlModePattern:
518518
switch(p) {
519519
case patternWaveform:
520-
for(size_t i=0; i<shadowWaveformlength*wordlen; i++)
520+
for(size_t i=0; i<(size_t)shadowWaveformlength*wordlen; i++)
521521
WRITE32(base, OutputCMLPat(N, i), shadowPattern[patternWaveform][i]);
522522
break;
523523
default:

0 commit comments

Comments
 (0)