- Changed strncpy to strlcpy, strncat to strlcat
- Added strlcpy and strlcat to SICS - Added a driver for the POLDI power supplies SKIPPED: psi/A1931.c psi/autowin.c psi/bruker.c psi/docho.c psi/dornier2.c psi/dspcode.c psi/ease.c psi/ecb.c psi/ecbcounter.c psi/ecbdriv.c psi/el734dc.c psi/el734driv.c psi/el734hp.c psi/el737driv.c psi/el737hpdriv.c psi/el737hpdrivsps.c psi/el737hpv2driv.c psi/el755driv.c psi/eurodriv.c psi/haakedriv.c psi/itc4driv.c psi/julcho.c psi/linadriv.c psi/lmd200.c psi/lscsupport.c psi/ltc11.c psi/make_gen psi/oicom.c psi/oxinst.c psi/pimotor.c psi/pipiezo.c psi/polterwrite.c psi/psi.c psi/sanscook.c psi/sanslirebin.c psi/sanswave.c psi/sinqhmdriv.c psi/sinqhttp.c psi/slsecho.c psi/slsmagnet.c psi/slsvme.c psi/sps.c psi/swmotor.c psi/swmotor2.c psi/tabledrive.c psi/tasscan.c psi/tdchm.c psi/velodorn.c psi/velodornier.c
This commit is contained in:
8
hmdata.c
8
hmdata.c
@ -582,7 +582,7 @@ static pNXDS subSampleCommand(pNXDS source, char *command,
|
||||
}
|
||||
|
||||
if (dim < source->rank - 1) {
|
||||
strncpy(error,
|
||||
strlcpy(error,
|
||||
"ERROR: Not enough border values specified for subsampling",
|
||||
errLen);
|
||||
return NULL;
|
||||
@ -654,7 +654,7 @@ HistInt *subSample(pHMdata self, char *command, char *error, int errLen)
|
||||
|
||||
start = hmDataToNXDataset(self);
|
||||
if (start == NULL) {
|
||||
strncpy(error, "Out-Of-Memory or no data while subsampling ", errLen);
|
||||
strlcpy(error, "Out-Of-Memory or no data while subsampling ", errLen);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
@ -666,7 +666,7 @@ HistInt *subSample(pHMdata self, char *command, char *error, int errLen)
|
||||
} else if (strstr(subCommand, "sum") != NULL) {
|
||||
result = sumCommand(source, subCommand, error, errLen);
|
||||
} else {
|
||||
strncpy(error, "ERROR: invalid subcommand to process requested",
|
||||
strlcpy(error, "ERROR: invalid subcommand to process requested",
|
||||
errLen);
|
||||
return NULL;
|
||||
}
|
||||
@ -681,7 +681,7 @@ HistInt *subSample(pHMdata self, char *command, char *error, int errLen)
|
||||
length = getNXDatasetLength(result);
|
||||
data = malloc((length + 1) * sizeof(int));
|
||||
if (data == NULL) {
|
||||
strncpy(error, "Out-Of-Mmeory in Subsample", errLen);
|
||||
strlcpy(error, "Out-Of-Mmeory in Subsample", errLen);
|
||||
dropNXDataset(result);
|
||||
return NULL;
|
||||
}
|
||||
|
Reference in New Issue
Block a user