Use min and max instead of the non-standard MIN and MAX macros.
Commit
64b00c3a1a87739621f58c777fc3cc54fb15a0af removed inclusion of
rx_packet.h, which included definitions of MIN and MAX on various platforms.
Change-Id: I3d3c75af375704b8baddd72aec3aecf3c4fd43d7
Reviewed-on: http://gerrit.openafs.org/6924
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Alistair Ferguson <alistair.ferguson@mac.com>
Reviewed-by: Derrick Brashear <shadow@dementix.org>
offset = 0;
while (fileSize != 0) {
- chunkSize = MIN(fileSize, bufferSize);
+ chunkSize = min(fileSize, bufferSize);
code =
fread(charList.charListT_val, sizeof(char), chunkSize,
ctPtr->textStream);
if (code)
ERROR(code);
- writeSize = MIN(textSize, BLOCK_DATA_SIZE);
+ writeSize = min(textSize, BLOCK_DATA_SIZE);
if (!writeSize)
break;
/* compute minimum of remaining text or user buffer */
textRemaining = ntohl(tbPtr->size) - offset;
- transferSize = MIN(textRemaining, maxLength);
+ transferSize = min(textRemaining, maxLength);
/* allocate the transfer storage */
if (transferSize <= 0) {
while (textLength) {
/* compute the transfer size */
remainingInBlock = (BLOCK_DATA_SIZE - (offset % BLOCK_DATA_SIZE));
- chunkSize = MIN(remainingInBlock, textLength);
+ chunkSize = min(remainingInBlock, textLength);
/* copy in the data */
memcpy(&diskBlock.a[offset % BLOCK_DATA_SIZE], textptr, chunkSize);
size = ntohl(tbPtr->size);
blockAddr = ntohl(tbPtr->textAddr);
while (size) {
- chunkSize = MIN(BLOCK_DATA_SIZE, size);
+ chunkSize = min(BLOCK_DATA_SIZE, size);
dbread(ut, blockAddr, (char *)&block, sizeof(block));
write(fid, &block.a[0], chunkSize);
blockAddr = ntohl(block.h.next);
*/
fdMaxCacheSize /= 4;
#endif
- fdMaxCacheSize = MIN(fdMaxCacheSize, vol_io_params.fd_max_cachesize);
+ fdMaxCacheSize = min(fdMaxCacheSize, vol_io_params.fd_max_cachesize);
osi_Assert(fdMaxCacheSize > 0);
}
#elif defined(AFS_HPUX_ENV)
fdMaxCacheSize = 0;
#else
{
- long fdMax = MAX(sysconf(_SC_OPEN_MAX) - vol_io_params.fd_handle_setaside,
+ long fdMax = max(sysconf(_SC_OPEN_MAX) - vol_io_params.fd_handle_setaside,
0);
- fdMaxCacheSize = (int)MIN(fdMax, vol_io_params.fd_max_cachesize);
+ fdMaxCacheSize = (int)min(fdMax, vol_io_params.fd_max_cachesize);
}
#endif
- fdCacheSize = MIN(fdMaxCacheSize, vol_io_params.fd_initial_cachesize);
+ fdCacheSize = min(fdMaxCacheSize, vol_io_params.fd_initial_cachesize);
{
#ifdef AFS_PTHREAD_ENV
}
}
} else {
- Parallel = MIN(DEFAULT_PARALLELISM, MAXPARALLEL);
+ Parallel = min(DEFAULT_PARALLELISM, MAXPARALLEL);
}
if ((ti = as->parms[10].items)) { /* -tmpdir */
DIR *dirp;
queue_Append(¶ms,dpq);
}
- threads = MIN(parts, vol_attach_threads);
+ threads = min(parts, vol_attach_threads);
if (threads > 1) {
/* spawn off a bunch of initialization threads */
}
/* number of worker threads; at least one, not to exceed the number of partitions */
- threads = MIN(parts, vol_attach_threads);
+ threads = min(parts, vol_attach_threads);
/* create volume work queue */
queue_Init(&vq);