diff --git a/src/fastMatch.c b/src/fastMatch.c index cec75b2fa..667583ecc 100644 --- a/src/fastMatch.c +++ b/src/fastMatch.c @@ -29,7 +29,7 @@ SEXP fastMatch(SEXP x, SEXP y, SEXP xidx, SEXP yidx, SEXP xolength, SEXP tol) { struct idxStruct * pidxS = (struct idxStruct *) calloc(nx, sizeof(struct idxStruct)); if (pidxS == NULL) - error("fastMatch/calloc: memory could not be allocated ! (%llu bytes)\n", nx * sizeof(struct idxStruct) ); + error("fastMatch/calloc: memory could not be allocated ! (%lu bytes)\n", nx * sizeof(struct idxStruct) ); for (xi=0;xi < nx;xi++) pidxS[xi].from = ny+1; diff --git a/src/mzROI.c b/src/mzROI.c index a308ae142..19333b469 100644 --- a/src/mzROI.c +++ b/src/mzROI.c @@ -76,7 +76,7 @@ struct mzROIStruct * checkmzROIBufSize(struct mzROIStruct *mzROI, const unsigned mzROI = (struct mzROIStruct *) realloc(mzROI, newLength * sizeof(struct mzROIStruct)); if (mzROI == NULL) - error("findmzROI/realloc: buffer memory could not be allocated ! (%llu bytes)\n", newLength * sizeof(struct mzROIStruct) ); + error("findmzROI/realloc: buffer memory could not be allocated ! (%lu bytes)\n", newLength * sizeof(struct mzROIStruct) ); mzLength->mzROITotal = newLength; } @@ -99,7 +99,7 @@ struct mzROIStruct * checkmzvalBufSize(struct mzROIStruct *mzval, const unsigned mzval = (struct mzROIStruct *) realloc(mzval, newLength * sizeof(struct mzROIStruct)); if (mzval == NULL) - error("findmzROI/realloc: buffer memory could not be allocated ! (%llu bytes)\n", newLength * sizeof(struct mzROIStruct)); + error("findmzROI/realloc: buffer memory could not be allocated ! (%lu bytes)\n", newLength * sizeof(struct mzROIStruct)); mzLength->mzvalTotal = newLength; } @@ -328,7 +328,7 @@ int i,p,del=0; p=0; struct mzROIStruct * tmp = (struct mzROIStruct *) calloc(mzLength->mzval - del, sizeof(struct mzROIStruct)); if (tmp == NULL) - error("findmzROI/cleanup: buffer memory could not be allocated ! (%llu bytes)\n", (mzLength->mzval - del) * sizeof(struct mzROIStruct)); + error("findmzROI/cleanup: buffer memory could not be allocated ! (%lu bytes)\n", (mzLength->mzval - del) * sizeof(struct mzROIStruct)); for (i=0; i < mzLength->mzval; i++) { if (mzval[i].deleteMe == FALSE) { tmp[p].mz = mzval[i].mz; @@ -626,11 +626,11 @@ SEXP findmzROI(SEXP mz, SEXP intensity, SEXP scanindex, SEXP mzrange, struct mzROIStruct * mzROI = (struct mzROIStruct *) calloc(ROI_INIT_LENGTH, sizeof(struct mzROIStruct)); if (mzROI == NULL) - error("findmzROI/calloc: buffer memory could not be allocated ! (%llu bytes)\n",ROI_INIT_LENGTH * sizeof(struct mzROIStruct) ); + error("findmzROI/calloc: buffer memory could not be allocated ! (%lu bytes)\n",ROI_INIT_LENGTH * sizeof(struct mzROIStruct) ); struct mzROIStruct * mzval = (struct mzROIStruct *) calloc(MZVAL_INIT_LENGTH, sizeof(struct mzROIStruct)); if (mzval == NULL) - error("findmzROI/calloc: buffer memory could not be allocated ! (%llu bytes)\n",MZVAL_INIT_LENGTH * sizeof(struct mzROIStruct) ); + error("findmzROI/calloc: buffer memory could not be allocated ! (%lu bytes)\n",MZVAL_INIT_LENGTH * sizeof(struct mzROIStruct) ); mzLength.mzvalTotal = MZVAL_INIT_LENGTH; mzLength.mzROITotal = ROI_INIT_LENGTH;