vitalif
/
mdtest
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix compilation warnings, and minor code cleanup.

master
Christopher J. Morrone 2011-10-27 14:24:51 -07:00
parent 5eed1723f0
commit 87d8bc19fb
3 changed files with 31 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/cbif/cbif.c
View File

@ -20,6 +20,7 @@
#include <fcntl.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#define ERR(MSG) do { \
fprintf(stdout, "** error **\n"); \
@ -106,7 +107,7 @@ main(int argc, char **argv)
}
/* next hex, multiple bytes */
fprintf(stdout, "0x%016x 0x", alignedOffset);
fprintf(stdout, "0x%016llx 0x", alignedOffset);
for (i = 0; i < BYTE_BOUNDARY; i++) {
fprintf(stdout, "%02x", oldBuffer[i]);
}

4
src/iordef.h
View File

@ -40,6 +40,7 @@
#else
# include <sys/param.h> /* MAXPATHLEN */
# include <unistd.h>
# include <limits.h>
#endif
#include <mpi.h>
#include <stdio.h>
@ -99,6 +100,9 @@ extern int numTasks, /* MPI variables */
#define MAX_STR 1024 /* max string length */
#define MAX_HINTS 16 /* max number of hints */
#define MAX_RETRY 10000 /* max retries for POSIX xfer */
#ifndef PATH_MAX
#define PATH_MAX 4096
#endif
#define DELIMITERS " \t\r\n=" /* ReadScript() */
#define FILENAME_DELIMITER '@' /* ParseFileName() */

42
src/utilities.c
View File

@ -311,9 +311,8 @@ ShowFileSystemSize(char *fileSystem)
{
#ifndef _WIN32 /* FIXME */
int error;
char realPath[MAX_STR];
char fileSystemUnitStr[MAX_STR] = "GiB";
char inodeUnitStr[MAX_STR] = "Mi";
char realPath[PATH_MAX];
char *fileSystemUnitStr = "GiB";
long long int fileSystemUnitVal = 1024 * 1024 * 1024;
long long int inodeUnitVal = 1024 * 1024;
long long int totalFileSystemSize,
@ -354,7 +353,7 @@ ShowFileSystemSize(char *fileSystem)
/ (double)fileSystemUnitVal;
if (totalFileSystemSizeHR > 1024) {
totalFileSystemSizeHR = totalFileSystemSizeHR / 1024;
strcpy(fileSystemUnitStr, "TiB");
fileSystemUnitStr = "TiB";
}
/* inodes */
@ -369,9 +368,8 @@ ShowFileSystemSize(char *fileSystem)
fprintf(stdout, "Path: %s\n", realPath);
fprintf(stdout, "FS: %.1f %s Used FS: %2.1f%% ", totalFileSystemSizeHR,
fileSystemUnitStr, usedFileSystemPercentage);
fprintf(stdout, "Inodes: %.1f %s Used Inodes: %2.1f%%\n",
(double)totalInodes / (double)inodeUnitVal,
inodeUnitStr, usedInodePercentage);
fprintf(stdout, "Inodes: %.1f Mi Used Inodes: %2.1f%%\n",
(double)totalInodes / (double)inodeUnitVal, usedInodePercentage);
fflush(stdout);
#endif /* _WIN32 */
@ -456,22 +454,32 @@ ModifyByteInFile(char * fileName,
int byteValue)
{
int fd;
char oldValue[1],
value[1];
int rc;
char old;
char new;
value[0] = (char)byteValue;
new = (char)byteValue;
/* open file, show old value, update to new value */
fd = open(fileName, O_RDWR);
lseek(fd, offset, SEEK_SET);
read(fd, oldValue, 1);
rc = lseek(fd, offset, SEEK_SET);
if (rc == -1)
goto out;
rc = read(fd, &old, 1);
if (rc == -1)
goto out;
rc = lseek(fd, offset, SEEK_SET);
if (rc == -1)
goto out;
rc = write(fd, &new, 1);
if (rc == -1)
goto out;
fprintf(stdout,
"** DEBUG: offset %lld in %s changed from %d to %d **\n", offset,
fileName, (unsigned char)oldValue[0], (unsigned char)value[0]);
lseek(fd, offset, SEEK_SET);
write(fd, value, 1);
close(fd);
fileName, (unsigned char)old, (unsigned char)new);
out:
close(fd);
return;
} /* ModifyByteInFile() */
#endif /* USE_UNDOC_OPT - corruptFile */
@ -525,4 +533,4 @@ int uname(struct utsname *name)
return 0;
}
#endif /* _WIN32 */
#endif /* _WIN32 */