+// © 2016 and later: Unicode, Inc. and others.
+// License & terms of use: http://www.unicode.org/copyright.html
/*
**********************************************************************
- * Copyright (C) 2004-2010, International Business Machines
+ * Copyright (C) 2004-2016, International Business Machines
* Corporation and others. All Rights Reserved.
**********************************************************************
* file name: filetst.c
- * encoding: US-ASCII
+ * encoding: UTF-8
* tab size: 8 (not used)
* indentation:4
*
* created by: George Rhoten
*/
+#include "cmemory.h"
#include "iotest.h"
#include "unicode/ustdio.h"
#include "unicode/ustring.h"
const char *STANDARD_TEST_FILE = "iotest-c.txt";
+const char *STANDARD_TEST_LOCALE = "en_US_POSIX";
+
#if !UCONFIG_NO_FORMATTING
static void TestFileFromICU(UFILE *myFile) {
U_STRING_DECL(myStringOrig, "My-String", 9);
U_STRING_INIT(myStringOrig, "My-String", 9);
- u_memset(myUString, 0x2a, sizeof(myUString)/sizeof(*myUString));
- u_memset(uStringBuf, 0x2a, sizeof(uStringBuf)/sizeof(*uStringBuf));
- memset(myString, '*', sizeof(myString)/sizeof(*myString));
- memset(testBuf, '*', sizeof(testBuf)/sizeof(*testBuf));
+ u_memset(myUString, 0x2a, UPRV_LENGTHOF(myUString));
+ u_memset(uStringBuf, 0x2a, UPRV_LENGTHOF(uStringBuf));
+ memset(myString, '*', UPRV_LENGTHOF(myString));
+ memset(testBuf, '*', UPRV_LENGTHOF(testBuf));
if (myFile == NULL) {
log_err("Can't write test file.\n");
fprintf(u_fgetfile(myFile), "\tNormal fprintf count value: n=%d\n", (int)*n); /* Should be 27 as stated later on. */
u_fclose(myFile);
- myFile = u_fopen(STANDARD_TEST_FILE, "r", "en_US_POSIX", NULL);
+ myFile = u_fopen(STANDARD_TEST_FILE, "r", STANDARD_TEST_LOCALE, NULL);
if (myFile == NULL) {
log_err("Can't read test file.");
log_err("%%s Got: %s, Expected: My String\n", myString);
}
u_fscanf(myFile, "Unicode String %%S: %S\n", myUString);
- u_austrncpy(myString, myUString, sizeof(myUString)/sizeof(*myUString));
+ u_austrncpy(myString, myUString, UPRV_LENGTHOF(myUString));
if (strcmp(myString, "My-String")) {
log_err("%%S Got: %S, Expected: My String\n", myUString);
}
u_fscanf(myFile, "NULL Unicode String %%S: %S\n", myUString);
- u_austrncpy(myString, myUString, sizeof(myUString)/sizeof(*myUString));
+ u_austrncpy(myString, myUString, UPRV_LENGTHOF(myUString));
if (strcmp(myString, "(null)")) {
log_err("%%S Got: %S, Expected: My String\n", myUString);
}
u_fgets(myUString, 4, myFile);
myString[2] = '!';
myString[3] = '!';
- u_austrncpy(myString, myUString, sizeof(myUString)/sizeof(*myUString));
- if (myString == NULL || strcmp(myString, "\t\n") != 0) {
+ u_austrncpy(myString, myUString, UPRV_LENGTHOF(myUString));
+ if (strcmp(myString, "\t\n") != 0) {
log_err("u_fgets got \"%s\"\n", myString);
}
- if (u_fgets(myUString, sizeof(myUString)/sizeof(*myUString), myFile) != myUString) {
+ if (u_fgets(myUString, UPRV_LENGTHOF(myUString), myFile) != myUString) {
log_err("u_fgets did not return myUString\n");
}
- u_austrncpy(myString, myUString, sizeof(myUString)/sizeof(*myUString));
- if (myString == NULL || strcmp(myString, "Pointer to integer (Count) %n: n=1 n=1\n") != 0) {
+ u_austrncpy(myString, myUString, UPRV_LENGTHOF(myUString));
+ if (strcmp(myString, "Pointer to integer (Count) %n: n=1 n=1\n") != 0) {
log_err("u_fgets got \"%s\"\n", myString);
}
- if (u_fgets(myUString, sizeof(myUString)/sizeof(*myUString), myFile) != myUString) {
+ if (u_fgets(myUString, UPRV_LENGTHOF(myUString), myFile) != myUString) {
log_err("u_fgets did not return myUString\n");
}
- u_austrncpy(myString, myUString, sizeof(myUString)/sizeof(*myUString));
- if (myString == NULL || strcmp(myString, "Pointer to integer Value: 37\n") != 0) {
+ u_austrncpy(myString, myUString, UPRV_LENGTHOF(myUString));
+ if (strcmp(myString, "Pointer to integer Value: 37\n") != 0) {
log_err("u_fgets got \"%s\"\n", myString);
}
- if (u_fgets(myUString, sizeof(myUString)/sizeof(*myUString), myFile) != myUString) {
+ if (u_fgets(myUString, UPRV_LENGTHOF(myUString), myFile) != myUString) {
log_err("u_fgets did not return myUString\n");
}
- u_austrncpy(myString, myUString, sizeof(myUString)/sizeof(*myUString));
- if (myString == NULL || strcmp(myString, "This is a long test123456789012345678901234567890123456789012345678901234567890\n") != 0) {
+ u_austrncpy(myString, myUString, UPRV_LENGTHOF(myUString));
+ if (strcmp(myString, "This is a long test123456789012345678901234567890123456789012345678901234567890\n") != 0) {
log_err("u_fgets got \"%s\"\n", myString);
}
if (u_fgets(myUString, 1, myFile) != myUString) {
log_err("u_fgets did not return myUString\n");
}
- u_austrncpy(myString, myUString, sizeof(myUString)/sizeof(*myUString));
- if (myString == NULL || strcmp(myString, "") != 0) {
+ u_austrncpy(myString, myUString, UPRV_LENGTHOF(myUString));
+ if (strcmp(myString, "") != 0) {
log_err("u_fgets got \"%s\"\n", myString);
}
if (u_fgets(myUString, 2, myFile) != myUString) {
log_err("u_fgets did not return myUString\n");
}
- u_austrncpy(myString, myUString, sizeof(myUString)/sizeof(*myUString));
- if (myString == NULL || strcmp(myString, "\t") != 0) {
+ u_austrncpy(myString, myUString, UPRV_LENGTHOF(myUString));
+ if (strcmp(myString, "\t") != 0) {
log_err("u_fgets got \"%s\"\n", myString);
}
- u_austrncpy(myString, u_fgets(myUString, sizeof(myUString)/sizeof(*myUString), myFile),
- sizeof(myUString)/sizeof(*myUString));
+ u_austrncpy(myString, u_fgets(myUString, UPRV_LENGTHOF(myUString), myFile),
+ UPRV_LENGTHOF(myUString));
if (strcmp(myString, "Normal fprintf count: n=1 n=1\n") != 0) {
log_err("u_fgets got \"%s\"\n", myString);
}
if (u_feof(myFile)) {
log_err("Got feof while reading the file and not at the end of the file.\n");
}
- u_austrncpy(myString, u_fgets(myUString, sizeof(myUString)/sizeof(*myUString), myFile),
- sizeof(myUString)/sizeof(*myUString));
+ u_austrncpy(myString, u_fgets(myUString, UPRV_LENGTHOF(myUString), myFile),
+ UPRV_LENGTHOF(myUString));
if (strcmp(myString, "\tNormal fprintf count value: n=27\n") != 0) {
log_err("u_fgets got \"%s\"\n", myString);
}
}
static void TestFile(void) {
-/* FILE *standardFile;*/
log_verbose("Testing u_fopen\n");
- TestFileFromICU(u_fopen(STANDARD_TEST_FILE, "w", "en_US_POSIX", NULL));
+ TestFileFromICU(u_fopen(STANDARD_TEST_FILE, "w", STANDARD_TEST_LOCALE, NULL));
+}
+
+static void TestFinit(void) {
+ FILE *standardFile;
-/* Don't know how to make this work without stdout or stderr */
-/*
log_verbose("Testing u_finit\n");
- standardFile = fopen(STANDARD_TEST_FILE, "wb");
- TestFileFromICU(u_finit(standardFile, NULL, NULL));
+ standardFile = fopen(STANDARD_TEST_FILE, "w");
+ TestFileFromICU(u_finit(standardFile, STANDARD_TEST_LOCALE, NULL));
fclose(standardFile);
+}
+
+static void TestFadopt(void) {
+ FILE *standardFile;
log_verbose("Testing u_fadopt\n");
- standardFile = fopen(STANDARD_TEST_FILE, "wb");
- TestFileFromICU(u_fadopt(standardFile, NULL, NULL));
-*/
+ standardFile = fopen(STANDARD_TEST_FILE, "w");
+ TestFileFromICU(u_fadopt(standardFile, STANDARD_TEST_LOCALE, NULL));
}
#endif
buff[0] = 0x40;
buff[1] = 0;
- u_fgets(buff, sizeof(buff)/sizeof(buff[0]), uStdIn);
+ u_fgets(buff, UPRV_LENGTHOF(buff), uStdIn);
u_fprintf(uStdOut, "%S\n", buff);
u_fscanf(uStdIn, "%d", &num);
u_fprintf(uStdOut, "%d\n", num);
log_err("u_fputc should return U_EOF for 0xFFFFFFFF.\n");
}
u_fputc(0xFF41, myFile);
- u_memset(buffer, 0xBEEF, sizeof(buffer)/sizeof(buffer[0]));
- u_memset(expectedBuffer, 0, sizeof(expectedBuffer)/sizeof(expectedBuffer[0]));
+ u_memset(buffer, 0xBEEF, UPRV_LENGTHOF(buffer));
+ u_memset(expectedBuffer, 0, UPRV_LENGTHOF(expectedBuffer));
u_uastrncpy(buffer, testStr, expectedSize+1);
for (repetitions = 0; repetitions < 16; repetitions++) {
u_file_write(buffer, expectedSize, myFile);
}
u_fclose(myFile);
- u_memset(buffer, 0xBEEF, sizeof(buffer)/sizeof(buffer[0]));
+ u_memset(buffer, 0xBEEF, UPRV_LENGTHOF(buffer));
myFile = u_fopen(STANDARD_TEST_FILE, "r", NULL, "UTF-16");
if (u_fgetc(myFile) != 0x3BC) {
log_err("The first character is wrong\n");
if (u_fgetc(myFile) != 0xFF41) {
log_err("The second character is wrong\n");
}
- if (u_fgets(buffer, sizeof(buffer)/sizeof(buffer[0]), myFile) != buffer) {
+ if (u_fgets(buffer, UPRV_LENGTHOF(buffer), myFile) != buffer) {
log_err("Didn't get the buffer back\n");
return;
}
u_fputc(0x3BC, myFile);
u_fputc(0xFF41, myFile);
- u_memset(buffer, 0xBEEF, sizeof(buffer)/sizeof(buffer[0]));
- u_memset(expectedBuffer, 0, sizeof(expectedBuffer)/sizeof(expectedBuffer[0]));
+ u_memset(buffer, 0xBEEF, UPRV_LENGTHOF(buffer));
+ u_memset(expectedBuffer, 0, UPRV_LENGTHOF(expectedBuffer));
u_uastrncpy(buffer, testStr, expectedSize+1);
for (repetitions = 0; repetitions < 16; repetitions++) {
u_file_write(buffer, expectedSize, myFile);
}
u_fclose(myFile);
- u_memset(buffer, 0xBEEF, sizeof(buffer)/sizeof(buffer[0]));
+ u_memset(buffer, 0xBEEF, UPRV_LENGTHOF(buffer));
myFile = u_fopen(STANDARD_TEST_FILE, "r", NULL, "UTF-8");
if (strcmp(u_fgetcodepage(myFile), "UTF-8") != 0) {
log_err("Got %s instead of UTF-8\n", u_fgetcodepage(myFile));
if (u_fgetc(myFile) != 0xFF41) {
log_err("The second character is wrong\n");
}
- if (u_fgets(buffer, sizeof(buffer)/sizeof(buffer[0]), myFile) != buffer) {
+ if (u_fgets(buffer, UPRV_LENGTHOF(buffer), myFile) != buffer) {
log_err("Didn't get the buffer back\n");
return;
}
myFile = u_fopen(STANDARD_TEST_FILE, "w", NULL, "UTF-8");
u_fputc(0xFF41, myFile);
- u_memset(buffer, 0xBEEF, sizeof(buffer)/sizeof(buffer[0]));
- u_memset(expectedBuffer, 0, sizeof(expectedBuffer)/sizeof(expectedBuffer[0]));
+ u_memset(buffer, 0xBEEF, UPRV_LENGTHOF(buffer));
+ u_memset(expectedBuffer, 0, UPRV_LENGTHOF(expectedBuffer));
u_uastrncpy(buffer, testStr, expectedSize+1);
for (repetitions = 0; repetitions < 1; repetitions++) {
u_file_write(buffer, expectedSize, myFile);
}
u_fclose(myFile);
- u_memset(buffer, 0xBEEF, sizeof(buffer)/sizeof(buffer[0]));
+ u_memset(buffer, 0xBEEF, UPRV_LENGTHOF(buffer));
myFile = u_fopen(STANDARD_TEST_FILE, "r", NULL, "UTF-8");
if (u_fgets(buffer, 2, myFile) != buffer) {
log_err("Didn't get the buffer back\n");
int32_t how_many;
int32_t repetitions;
- u_memset(buffer, 0xBEEF, sizeof(buffer)/sizeof(buffer[0]));
+ u_memset(buffer, 0xBEEF, UPRV_LENGTHOF(buffer));
for (repetitions = 0; repetitions < 2; repetitions++) {
- u_file_write(buffer, sizeof(buffer)/sizeof(buffer[0]), myFile);
+ u_file_write(buffer, UPRV_LENGTHOF(buffer), myFile);
}
u_fclose(myFile);
- u_memset(buffer, 0xDEAD, sizeof(buffer)/sizeof(buffer[0]));
+ u_memset(buffer, 0xDEAD, UPRV_LENGTHOF(buffer));
myFile = u_fopen(STANDARD_TEST_FILE, "r", NULL, "UTF-16");
how_many = u_file_read(buffer, 1024, myFile);
if (how_many != 1024 || buffer[1023] != 0xBEEF) {
log_err("Can't write test file.\n");
return;
}
- u_memset(expectedBuffer, 0, sizeof(expectedBuffer)/sizeof(expectedBuffer[0]));
+ u_memset(expectedBuffer, 0, UPRV_LENGTHOF(expectedBuffer));
for (repetitions = 0; repetitions < 16; repetitions++) {
fwrite(testStr, sizeof(testStr[0]), expectedSize, stdFile);
char *returnedCharBuffer;
UChar *returnedUCharBuffer;
- u_memset(buffer, 0xBEEF, sizeof(buffer)/sizeof(buffer[0]));
- returnedCharBuffer = fgets(charBuffer, sizeof(charBuffer)/sizeof(charBuffer[0]), stdFile);
- returnedUCharBuffer = u_fgets(buffer, sizeof(buffer)/sizeof(buffer[0]), myFile);
+ u_memset(buffer, 0xBEEF, UPRV_LENGTHOF(buffer));
+ returnedCharBuffer = fgets(charBuffer, UPRV_LENGTHOF(charBuffer), stdFile);
+ returnedUCharBuffer = u_fgets(buffer, UPRV_LENGTHOF(buffer), myFile);
if (!returnedCharBuffer && !returnedUCharBuffer) {
/* Both returned NULL. stop. */
log_err("Can't write test file.\n");
return;
}
- for (lineIdx = 0; lineIdx < (int32_t)(sizeof(testUStr)/sizeof(testUStr[0])); lineIdx++) {
+ for (lineIdx = 0; lineIdx < UPRV_LENGTHOF(testUStr); lineIdx++) {
u_file_write(testUStr[lineIdx], u_strlen(testUStr[lineIdx]), myFile);
}
u_fclose(myFile);
myFile = u_fopen(STANDARD_TEST_FILE, "rb", NULL, "UTF-8");
- for (lineIdx = 0; lineIdx < (int32_t)(sizeof(testUStr)/sizeof(testUStr[0])); lineIdx++) {
+ for (lineIdx = 0; lineIdx < UPRV_LENGTHOF(testUStr); lineIdx++) {
UChar *returnedUCharBuffer;
- u_memset(buffer, 0xBEEF, sizeof(buffer)/sizeof(buffer[0]));
- returnedUCharBuffer = u_fgets(buffer, sizeof(buffer)/sizeof(buffer[0]), myFile);
+ u_memset(buffer, 0xBEEF, UPRV_LENGTHOF(buffer));
+ returnedUCharBuffer = u_fgets(buffer, UPRV_LENGTHOF(buffer), myFile);
if (!returnedUCharBuffer) {
/* Returned NULL. stop. */
log_err("u_fgets wrote too much\n");
}
}
- if (lineIdx != (int32_t)(sizeof(testUStr)/sizeof(testUStr[0]))) {
+ if (lineIdx != UPRV_LENGTHOF(testUStr)) {
log_err("u_fgets read too much\n");
}
- if (u_fgets(buffer, sizeof(buffer)/sizeof(buffer[0]), myFile) != NULL) {
+ if (u_fgets(buffer, UPRV_LENGTHOF(buffer), myFile) != NULL) {
log_err("u_file_write wrote too much\n");
}
u_fclose(myFile);
static void TestLineCount(const char *prefixLine, const char *line, int32_t numRepititions) {
UChar buffer[64];
UChar expectedBuffer[64];
- int32_t lineLen = strlen(line);
+ int32_t lineLen = (int32_t)strlen(line);
UChar *returnedUCharBuffer;
int32_t repetitions;
UFILE *myFile = NULL;
/* Read the prefix line. This can make sure that a Windows newline is either on a boundary or before it. */
u_uastrncpy(expectedBuffer, prefixLine, (int32_t)strlen(prefixLine)+1);
- returnedUCharBuffer = u_fgets(buffer, sizeof(buffer)/sizeof(buffer[0]), myFile);
+ returnedUCharBuffer = u_fgets(buffer, UPRV_LENGTHOF(buffer), myFile);
if (u_strcmp(returnedUCharBuffer, expectedBuffer) != 0) {
log_err("prefix buffer is different. prefix=\"%s\"\n", prefixLine);
return;
u_uastrncpy(expectedBuffer, line, (int32_t)strlen(line)+1);
for (repetitions = 0; ; repetitions++) {
- u_memset(buffer, 0xBEEF, sizeof(buffer)/sizeof(buffer[0]));
- returnedUCharBuffer = u_fgets(buffer, sizeof(buffer)/sizeof(buffer[0]), myFile);
+ u_memset(buffer, 0xBEEF, UPRV_LENGTHOF(buffer));
+ returnedUCharBuffer = u_fgets(buffer, UPRV_LENGTHOF(buffer), myFile);
if (!returnedUCharBuffer) {
/* returned NULL. stop. */
log_err("Can't write test file.\n");
return;
}
- u_memset(buffer, 0xBEEF, sizeof(buffer)/sizeof(buffer[0]));
+ u_memset(buffer, 0xBEEF, UPRV_LENGTHOF(buffer));
/* Write one very long line */
- for (repetitions = 0; repetitions < ((sizeof(buffer)/sizeof(buffer[0]))*2); repetitions++) {
+ for (repetitions = 0; repetitions < (UPRV_LENGTHOF(buffer)*2); repetitions++) {
fwrite(repetitions ? "1" : "2", 1, 1, stdFile);
}
fclose(stdFile);
}
/* Read part of one very long line */
- returnedUCharBuffer = u_fgets(buffer, (sizeof(buffer)/sizeof(buffer[0]))-1, myFile);
- if (u_strlen(returnedUCharBuffer) != ((sizeof(buffer)/sizeof(buffer[0]))-2)) {
+ returnedUCharBuffer = u_fgets(buffer, UPRV_LENGTHOF(buffer)-1, myFile);
+ if (u_strlen(returnedUCharBuffer) != (UPRV_LENGTHOF(buffer)-2)) {
log_err("Line is wrong length. Got %d. Expected %d.\n",
- u_strlen(returnedUCharBuffer), ((sizeof(buffer)/sizeof(buffer[0]))-2));
+ u_strlen(returnedUCharBuffer), (UPRV_LENGTHOF(buffer)-2));
}
/* We better not read too much */
- if (buffer[(sizeof(buffer)/sizeof(buffer[0]))-1] != 0xBEEF) {
+ if (buffer[UPRV_LENGTHOF(buffer)-1] != 0xBEEF) {
log_err("Too much data was written\n");
}
UFILE *myFile = NULL;
static const UChar strABAccentA[] = { 0x0041, 0x0042, 0x00C1, 0x0043, 0};
static const UChar strBadConversion[] = { 0x0041, 0x0042, 0xfffd, 0x0043, 0};
- UChar testBuf[sizeof(strABAccentA)/sizeof(strABAccentA[0])*2]; /* *2 to see if too much was */
+ UChar testBuf[UPRV_LENGTHOF(strABAccentA)*2]; /* *2 to see if too much was */
char convName[UCNV_MAX_CONVERTER_NAME_LENGTH];
int32_t retVal;
UErrorCode status = U_ZERO_ERROR;
}
static void TestCodepageFlush(void) {
-#if UCONFIG_NO_LEGACY_CONVERSION
- log_verbose("Skipping, legacy conversion is disabled.");
+#if UCONFIG_NO_LEGACY_CONVERSION || UCONFIG_NO_FORMATTING
+ log_verbose("Skipping, legacy conversion or formatting is disabled.");
#else
UChar utf16String[] = { 0x39, 0x39, 0x39, 0x20, 0x65E0, 0x6CD6, 0x5728, 0x0000 };
uint8_t inBuf[200];
size_t inLen =0;
const char *enc = "IBM-1388"; /* GBK EBCDIC stateful */
- UFILE *myFile = u_fopen(STANDARD_TEST_FILE, "wb", "en_US_POSIX", enc);
+ UFILE *myFile = u_fopen(STANDARD_TEST_FILE, "wb", STANDARD_TEST_LOCALE, enc);
FILE *myCFile;
int shift = 0;
- int i;
+ int32_t i;
if (myFile == NULL) {
log_err("Can't write test file %s\n", STANDARD_TEST_FILE);
}
/* check if shift in and out */
- for(i=0;i<inLen;i++) {
+ for(i=0;i<(int32_t)inLen;i++) {
if(inBuf[i]==0x0E) { /* SO */
shift= 1;
} else if(inBuf[i]==0x0F) { /* SI */
#if !UCONFIG_NO_FORMATTING
static void TestFilePrintCompatibility(void) {
- UFILE *myFile = u_fopen(STANDARD_TEST_FILE, "wb", "en_US_POSIX", NULL);
+ UFILE *myFile = u_fopen(STANDARD_TEST_FILE, "wb", STANDARD_TEST_LOCALE, NULL);
FILE *myCFile;
int32_t num;
char cVal;
static const UChar emptyStr[] = {0};
char readBuf[512] = "";
char testBuf[512] = "";
+ int32_t n = 0;
if (myFile == NULL) {
log_err("Can't write test file.\n");
return;
}
#if !UCONFIG_NO_FORMATTING
- if (strcmp(u_fgetlocale(myFile), "en_US_POSIX") != 0) {
+ if (strcmp(u_fgetlocale(myFile), STANDARD_TEST_LOCALE) != 0) {
log_err("Got %s instead of en_US_POSIX for locale\n", u_fgetlocale(myFile));
}
#endif
}
for (num = -STANDARD_TEST_NUM_RANGE; num < STANDARD_TEST_NUM_RANGE; num++) {
- fscanf(myCFile, "%s", readBuf);
+ /* Note: gcc on Ubuntu complains if return value of scanf is ignored. */
+ n += fscanf(myCFile, "%s", readBuf);
sprintf(testBuf, "%x", (int)num);
if (strcmp(readBuf, testBuf) != 0) {
log_err("%%x Got: \"%s\", Expected: \"%s\"\n", readBuf, testBuf);
}
- fscanf(myCFile, "%s", readBuf);
+ n += fscanf(myCFile, "%s", readBuf);
sprintf(testBuf, "%X", (int)num);
if (strcmp(readBuf, testBuf) != 0) {
log_err("%%X Got: \"%s\", Expected: \"%s\"\n", readBuf, testBuf);
}
- fscanf(myCFile, "%s", readBuf);
+ n += fscanf(myCFile, "%s", readBuf);
sprintf(testBuf, "%o", (int)num);
if (strcmp(readBuf, testBuf) != 0) {
log_err("%%o Got: \"%s\", Expected: \"%s\"\n", readBuf, testBuf);
}
/* fprintf is not compatible on all platforms e.g. the iSeries */
- fscanf(myCFile, "%s", readBuf);
+ n += fscanf(myCFile, "%s", readBuf);
sprintf(testBuf, "%d", (int)num);
if (strcmp(readBuf, testBuf) != 0) {
log_err("%%d Got: \"%s\", Expected: \"%s\"\n", readBuf, testBuf);
}
- fscanf(myCFile, "%s", readBuf);
+ n += fscanf(myCFile, "%s", readBuf);
sprintf(testBuf, "%i", (int)num);
if (strcmp(readBuf, testBuf) != 0) {
log_err("%%i Got: \"%s\", Expected: \"%s\"\n", readBuf, testBuf);
}
- fscanf(myCFile, "%s", readBuf);
+ n += fscanf(myCFile, "%s", readBuf);
sprintf(testBuf, "%f", (double)num);
if (strcmp(readBuf, testBuf) != 0) {
log_err("%%f Got: \"%s\", Expected: \"%s\"\n", readBuf, testBuf);
log_err("%%E Got: \"%s\", Expected: \"%s\"\n", readBuf, testBuf);
}*/
- fscanf(myCFile, "%s", readBuf);
+ n += fscanf(myCFile, "%s", readBuf);
sprintf(testBuf, "%g", (double)num);
if (strcmp(readBuf, testBuf) != 0) {
log_err("%%g Got: \"%s\", Expected: \"%s\"\n", readBuf, testBuf);
}
- fscanf(myCFile, "%s", readBuf);
+ n += fscanf(myCFile, "%s", readBuf);
sprintf(testBuf, "%G", (double)num);
if (strcmp(readBuf, testBuf) != 0) {
log_err("%%G Got: \"%s\", Expected: \"%s\"\n", readBuf, testBuf);
/* Properly eat the newlines */
for (num = 0; num < (int32_t)strlen(C_NEW_LINE); num++) {
- fscanf(myCFile, "%c", &cVal);
+ n += fscanf(myCFile, "%c", &cVal);
if (cVal != C_NEW_LINE[num]) {
log_err("OS newline error\n");
}
}
for (num = 0; num < (int32_t)strlen(C_NEW_LINE); num++) {
- fscanf(myCFile, "%c", &cVal);
+ n += fscanf(myCFile, "%c", &cVal);
if (cVal != C_NEW_LINE[num]) {
log_err("ustdio newline error\n");
}
for (num = 0; num < 0x80; num++) {
cVal = -1;
- fscanf(myCFile, "%c", &cVal);
+ n += fscanf(myCFile, "%c", &cVal);
if (num != cVal) {
log_err("%%c Got: 0x%x, Expected: 0x%x\n", cVal, num);
}
}
+ (void)n;
fclose(myCFile);
}
#endif
-#define TestFPrintFormat(uFormat, uValue, cFormat, cValue) \
- myFile = u_fopen(STANDARD_TEST_FILE, "w", "en_US_POSIX", NULL);\
+#define TestFPrintFormat(uFormat, uValue, cFormat, cValue) UPRV_BLOCK_MACRO_BEGIN { \
+ myFile = u_fopen(STANDARD_TEST_FILE, "w", STANDARD_TEST_LOCALE, NULL);\
if (myFile == NULL) {\
log_err("Can't write test file for %s.\n", uFormat);\
return;\
}\
/* Reinitialize the buffer to verify null termination works. */\
- u_memset(uBuffer, 0x2a, sizeof(uBuffer)/sizeof(*uBuffer));\
- memset(buffer, '*', sizeof(buffer)/sizeof(*buffer));\
+ u_memset(uBuffer, 0x2a, UPRV_LENGTHOF(uBuffer));\
+ memset(buffer, '*', UPRV_LENGTHOF(buffer));\
\
uNumPrinted = u_fprintf(myFile, uFormat, uValue);\
u_fclose(myFile);\
- myFile = u_fopen(STANDARD_TEST_FILE, "r", "en_US_POSIX", NULL);\
- u_fgets(uBuffer, sizeof(uBuffer)/sizeof(*uBuffer), myFile);\
+ myFile = u_fopen(STANDARD_TEST_FILE, "r", STANDARD_TEST_LOCALE, NULL);\
+ u_fgets(uBuffer, UPRV_LENGTHOF(uBuffer), myFile);\
u_fclose(myFile);\
- u_austrncpy(compBuffer, uBuffer, sizeof(uBuffer)/sizeof(*uBuffer));\
+ u_austrncpy(compBuffer, uBuffer, UPRV_LENGTHOF(uBuffer));\
cNumPrinted = sprintf(buffer, cFormat, cValue);\
if (strcmp(buffer, compBuffer) != 0) {\
log_err("%" uFormat " Got: \"%s\", Expected: \"%s\"\n", compBuffer, buffer);\
if (buffer[uNumPrinted+1] != '*') {\
log_err("%" uFormat " too much stored\n");\
}\
+} UPRV_BLOCK_MACRO_END
#if !UCONFIG_NO_FORMATTING
static void TestFprintfFormat(void) {
TestFPrintFormat("%3f", 1.234, "%3f", 1.234);
TestFPrintFormat("%3f", -1.234, "%3f", -1.234);
- myFile = u_fopen(STANDARD_TEST_FILE, "w", "en_US_POSIX", NULL);
+ myFile = u_fopen(STANDARD_TEST_FILE, "w", STANDARD_TEST_LOCALE, NULL);
/* Reinitialize the buffer to verify null termination works. */
- u_memset(uBuffer, 0x2a, sizeof(uBuffer)/sizeof(*uBuffer));
- memset(buffer, '*', sizeof(buffer)/sizeof(*buffer));
+ u_memset(uBuffer, 0x2a, UPRV_LENGTHOF(uBuffer));
+ memset(buffer, '*', UPRV_LENGTHOF(buffer));
uNumPrinted = u_fprintf(myFile, "%d % d %d", -1234, 1234, 1234);
u_fclose(myFile);
- myFile = u_fopen(STANDARD_TEST_FILE, "r", "en_US_POSIX", NULL);
- u_fgets(uBuffer, sizeof(uBuffer)/sizeof(*uBuffer), myFile);
+ myFile = u_fopen(STANDARD_TEST_FILE, "r", STANDARD_TEST_LOCALE, NULL);
+ u_fgets(uBuffer, UPRV_LENGTHOF(uBuffer), myFile);
u_fclose(myFile);
- u_austrncpy(compBuffer, uBuffer, sizeof(uBuffer)/sizeof(*uBuffer));
+ u_austrncpy(compBuffer, uBuffer, UPRV_LENGTHOF(uBuffer));
cNumPrinted = sprintf(buffer, "%d % d %d", -1234, 1234, 1234);
if (strcmp(buffer, compBuffer) != 0) {
log_err("%%d %% d %%d Got: \"%s\", Expected: \"%s\"\n", compBuffer, buffer);
return;
}
/* Reinitialize the buffer to verify null termination works. */
- u_memset(uBuffer, 0x2a, sizeof(uBuffer)/sizeof(*uBuffer));
- uBuffer[sizeof(uBuffer)/sizeof(*uBuffer)-1] = 0;
- memset(buffer, '*', sizeof(buffer)/sizeof(*buffer));
- buffer[sizeof(buffer)/sizeof(*buffer)-1] = 0;
+ u_memset(uBuffer, 0x2a, UPRV_LENGTHOF(uBuffer));
+ uBuffer[UPRV_LENGTHOF(uBuffer)-1] = 0;
+ memset(buffer, '*', UPRV_LENGTHOF(buffer));
+ buffer[UPRV_LENGTHOF(buffer)-1] = 0;
u_fprintf(myFile, "%S", uValue);
u_fclose(myFile);
- myFile = u_fopen(STANDARD_TEST_FILE, "r", "en_US_POSIX", NULL);
+ myFile = u_fopen(STANDARD_TEST_FILE, "r", STANDARD_TEST_LOCALE, NULL);
uNumScanned = u_fscanf(myFile, format, uBuffer);
u_fclose(myFile);
if (expectedToPass) {
- u_austrncpy(compBuffer, uBuffer, sizeof(uBuffer)/sizeof(*uBuffer));
+ u_austrncpy(compBuffer, uBuffer, UPRV_LENGTHOF(uBuffer));
cNumScanned = sscanf(cValue, format, buffer);
- if (strncmp(buffer, compBuffer, sizeof(buffer)/sizeof(*buffer)) != 0) {
+ if (strncmp(buffer, compBuffer, UPRV_LENGTHOF(buffer)) != 0) {
log_err("%s Got: \"%s\", Expected: \"%s\"\n", format, compBuffer, buffer);
}
if (cNumScanned != uNumScanned) {
#endif
#if !UCONFIG_NO_FORMATTING
static void TestBadFScanfFormat(const char *format, const UChar *uValue, const char *cValue) {
+ (void)cValue; // suppress compiler warnings about unused variable
UFILE *myFile;
UChar uBuffer[256];
int32_t uNumScanned;
return;
}
/* Reinitialize the buffer to verify null termination works. */
- u_memset(uBuffer, 0x2a, sizeof(uBuffer)/sizeof(*uBuffer));
- uBuffer[sizeof(uBuffer)/sizeof(*uBuffer)-1] = 0;
+ u_memset(uBuffer, 0x2a, UPRV_LENGTHOF(uBuffer));
+ uBuffer[UPRV_LENGTHOF(uBuffer)-1] = 0;
u_fprintf(myFile, "%S", uValue);
u_fclose(myFile);
- myFile = u_fopen(STANDARD_TEST_FILE, "r", "en_US_POSIX", NULL);
+ myFile = u_fopen(STANDARD_TEST_FILE, "r", STANDARD_TEST_LOCALE, NULL);
uNumScanned = u_fscanf(myFile, format, uBuffer);
u_fclose(myFile);
if (uNumScanned != 0 || uBuffer[0] != 0x2a || uBuffer[1] != 0x2a) {
int32_t count;
UFILE *myFile;
- myFile = u_fopen(STANDARD_TEST_FILE, "w", "en_US_POSIX", "UTF-8");
+ myFile = u_fopen(STANDARD_TEST_FILE, "w", STANDARD_TEST_LOCALE, "UTF-8");
if (!myFile) {
log_err("Test file can't be opened\n");
return;
va_start(ap, format);
count = u_vfprintf(myFile, format, ap);
+ (void)count; /* Suppress set but not used warning. */
va_end(ap);
u_fclose(myFile);
- myFile = u_fopen(STANDARD_TEST_FILE, "r", "en_US_POSIX", "UTF-8");
+ myFile = u_fopen(STANDARD_TEST_FILE, "r", STANDARD_TEST_LOCALE, "UTF-8");
if (!myFile) {
log_err("Test file can't be opened\n");
return;
}
- u_fgets(uBuffer, sizeof(uBuffer)/sizeof(*uBuffer), myFile);
+ u_fgets(uBuffer, UPRV_LENGTHOF(uBuffer), myFile);
u_uastrcpy(uBuffer2, expectedResult);
if (u_strcmp(uBuffer, uBuffer2) != 0) {
log_err("Got two different results for \"%s\" expected \"%s\"\n", format, expectedResult);
u_fclose(myFile);
- myFile = u_fopen(STANDARD_TEST_FILE, "w", "en_US_POSIX", NULL);
+ myFile = u_fopen(STANDARD_TEST_FILE, "w", STANDARD_TEST_LOCALE, NULL);
if (!myFile) {
log_err("Test file can't be opened\n");
return;
u_fclose(myFile);
- myFile = u_fopen(STANDARD_TEST_FILE, "r", "en_US_POSIX", NULL);
+ myFile = u_fopen(STANDARD_TEST_FILE, "r", STANDARD_TEST_LOCALE, NULL);
if (!myFile) {
log_err("Test file can't be opened\n");
return;
}
- u_fgets(uBuffer, sizeof(uBuffer)/sizeof(*uBuffer), myFile);
+ u_fgets(uBuffer, UPRV_LENGTHOF(uBuffer), myFile);
u_uastrcpy(uBuffer2, expectedResult);
if (u_strcmp(uBuffer, uBuffer2) != 0) {
log_err("Got two different results for \"%s\" expected \"%s\"\n", format, expectedResult);
static const UChar TEST_STR[] = { 0x03BC, 0x0025, 0x0024, 0};
static const UChar PERCENT_S[] = { 0x03BC, 0x0025, 0x0053, 0};
- u_memset(myUString, 0x2a, sizeof(myUString)/sizeof(*myUString));
+ u_memset(myUString, 0x2a, UPRV_LENGTHOF(myUString));
myFile = u_fopen(STANDARD_TEST_FILE, "w", NULL, "UTF-8");
if (!myFile) {
addFileTest(TestNode** root) {
#if !UCONFIG_NO_FORMATTING
addTest(root, &TestFile, "file/TestFile");
+ addTest(root, &TestFinit, "file/TestFinit");
+ addTest(root, &TestFadopt, "file/TestFadopt");
#endif
addTest(root, &StdinBuffering, "file/StdinBuffering");
addTest(root, &TestfgetsBuffers, "file/TestfgetsBuffers");
projects / apple / icu.git / blobdiff