Skip to content
This repository was archived by the owner on Feb 24, 2018. It is now read-only.

assorted memory leak cleanups #20

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

assorted memory leak cleanups #20

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 10 additions & 12 deletions src/ior.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -898,6 +898,7 @@ static void GetTestFileName(char *testFileName, IOR_param_t * test)
sprintf(tmpString, ".%d", test->repCounter);
strcat(testFileName, tmpString);
}
free (fileNames);
}

/*
Expand Down Expand Up @@ -926,18 +927,15 @@ static double GetTimeStamp(void)
}

/*
* Convert IOR_offset_t value to human readable string.
* Convert IOR_offset_t value to human readable string. This routine uses a
* statically-allocated buffer internally and so is not re-entrant.
*/
static char *HumanReadable(IOR_offset_t value, int base)
{
char *valueStr;
static char valueStr[MAX_STR];
int m = 0, g = 0;
char m_str[8], g_str[8];

valueStr = (char *)malloc(MAX_STR);
if (valueStr == NULL)
ERR("out of memory");

if (base == BASE_TWO) {
m = MEBIBYTE;
g = GIBIBYTE;
Expand All @@ -952,22 +950,22 @@ static char *HumanReadable(IOR_offset_t value, int base)

if (value >= g) {
if (value % (IOR_offset_t) g) {
sprintf(valueStr, "%.2f %s",
snprintf(valueStr, MAX_STR-1, "%.2f %s",
(double)((double)value / g), g_str);
} else {
sprintf(valueStr, "%d %s", (int)(value / g), g_str);
snprintf(valueStr, MAX_STR-1, "%d %s", (int)(value / g), g_str);
}
} else if (value >= m) {
if (value % (IOR_offset_t) m) {
sprintf(valueStr, "%.2f %s",
snprintf(valueStr, MAX_STR-1, "%.2f %s",
(double)((double)value / m), m_str);
} else {
sprintf(valueStr, "%d %s", (int)(value / m), m_str);
snprintf(valueStr, MAX_STR-1, "%d %s", (int)(value / m), m_str);
}
} else if (value >= 0) {
sprintf(valueStr, "%d bytes", (int)value);
snprintf(valueStr, MAX_STR-1, "%d bytes", (int)value);
} else {
sprintf(valueStr, "-");
snprintf(valueStr, MAX_STR-1, "-");
}
return valueStr;
}
Expand Down