Skip to content

Commit fdede79

Browse files
restore spurious diffs
1 parent 95caa95 commit fdede79

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

src/fread.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ static inline uint64_t umin(uint64_t a, uint64_t b) { return a < b ? a : b; }
190190
static inline int64_t imin( int64_t a, int64_t b) { return a < b ? a : b; }
191191

192192
/** Return value of `x` clamped to the range [upper, lower] */
193-
static inline int64_t clamp_szt(int64_t x, int64_t lower, int64_t upper) {
193+
static inline int64_t clamp_i64t(int64_t x, int64_t lower, int64_t upper) {
194194
return x < lower ? lower : x > upper? upper : x;
195195
}
196196

@@ -2106,7 +2106,7 @@ int freadMain(freadMainArgs _args) {
21062106
meanLineLen = (double)sumLen/sampleLines;
21072107
estnrow = CEIL(bytesRead/meanLineLen); // only used for progress meter and verbose line below
21082108
double sd = sqrt( (sumLenSq - (sumLen*sumLen)/sampleLines)/(sampleLines-1) );
2109-
allocnrow = clamp_szt((size_t)(bytesRead / fmax(meanLineLen - 2*sd, minLen)),
2109+
allocnrow = clamp_i64t((size_t)(bytesRead / fmax(meanLineLen - 2*sd, minLen)),
21102110
(size_t)(1.1*estnrow), 2*estnrow);
21112111
// sd can be very close to 0.0 sometimes, so apply a +10% minimum
21122112
// blank lines have length 1 so for fill=true apply a +100% maximum. It'll be grown if needed.

src/freadR.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -726,4 +726,4 @@ void halt__(bool warn, const char *format, ...) {
726726
void prepareThreadContext(ThreadLocalFreadParsingContext *ctx) {}
727727
void postprocessBuffer(ThreadLocalFreadParsingContext *ctx) {}
728728
void orderBuffer(ThreadLocalFreadParsingContext *ctx) {}
729-
void freeThreadContext(ThreadLocalFreadParsingContext *ctx) {}
729+
void freeThreadContext(ThreadLocalFreadParsingContext *ctx) {}

0 commit comments

Comments
 (0)