From 719eacfd9b63cbed2e85474b5e03b3551a699a11 Mon Sep 17 00:00:00 2001
From: George Rhoten <grhoten@users.noreply.github.com>
Date: Wed, 30 Aug 2000 01:11:09 +0000
Subject: [PATCH] ICU-535 fixed some compiler warnings

X-SVN-Rev: 2390
---
 icu4c/source/test/cintltst/udatatst.c | 747 +++++++++++++-------------
 1 file changed, 374 insertions(+), 373 deletions(-)

diff --git a/icu4c/source/test/cintltst/udatatst.c b/icu4c/source/test/cintltst/udatatst.c
index 49ebb27938..c91de60ce9 100644
--- a/icu4c/source/test/cintltst/udatatst.c
+++ b/icu4c/source/test/cintltst/udatatst.c
@@ -9,7 +9,7 @@
 * Modification History:
 *
 *   Date          Name        Description
-*   02/22/2000    Madhu	      Creation 
+*   02/22/2000    Madhu       Creation
 *******************************************************************************
 */
 
@@ -33,114 +33,114 @@ void TestErrorConditions();
 void
 addUDataTest(TestNode** root)
 {
-  addTest(root, &TestUDataOpen,       "udatatst/TestUDataOpen"      );
-  addTest(root, &TestUDataOpenChoiceDemo1, "udatatst/TestUDataOpenChoiceDemo1");
-  addTest(root, &TestUDataOpenChoiceDemo2, "udatatst/TestUDataOpenChoiceDemo2"); 
-  addTest(root, &TestUDataGetInfo,    "udatatst/TestUDataGetInfo"   );
-  addTest(root, &TestUDataGetMemory,  "udatatst/TestUDataGetMemory" );
-  addTest(root, &TestErrorConditions, "udatatst/TestErrorConditions");
+    addTest(root, &TestUDataOpen,       "udatatst/TestUDataOpen"      );
+    addTest(root, &TestUDataOpenChoiceDemo1, "udatatst/TestUDataOpenChoiceDemo1");
+    addTest(root, &TestUDataOpenChoiceDemo2, "udatatst/TestUDataOpenChoiceDemo2"); 
+    addTest(root, &TestUDataGetInfo,    "udatatst/TestUDataGetInfo"   );
+    addTest(root, &TestUDataGetMemory,  "udatatst/TestUDataGetMemory" );
+    addTest(root, &TestErrorConditions, "udatatst/TestErrorConditions");
 
 
 }
 
 void TestUDataOpen(){
-   int i;
-   UDataMemory *result;
-   UErrorCode status=U_ZERO_ERROR;
-   const char* memMap[][2]={
-       {"tz", "dat"},
-       {"cnvalias", "dat"},
-       {"unames",   "dat"},
-       {"ibm-1141", "cnv"}
-   };
-   const char* name = "test";
-   const char* type="dat";
-   
-   char* path=(char*)malloc(sizeof(char) * (strlen(u_getDataDirectory()) + strlen("icudata") +1 ) );
-   char* testPath=(char*)malloc(sizeof(char) * (strlen(u_getDataDirectory()) + strlen("base") +1 ) );
+    int i;
+    UDataMemory *result;
+    UErrorCode status=U_ZERO_ERROR;
+    const char* memMap[][2]={
+        {"tz", "dat"},
+        {"cnvalias", "dat"},
+        {"unames",   "dat"},
+        {"ibm-1141", "cnv"}
+    };
+    const char* name = "test";
+    const char* type="dat";
 
-   strcat(strcpy(path, u_getDataDirectory()), "icudata");
-   strcat(strcpy(testPath, u_getDataDirectory()), "base");
+    char* path=(char*)malloc(sizeof(char) * (strlen(u_getDataDirectory()) + strlen("icudata") +1 ) );
+    char* testPath=(char*)malloc(sizeof(char) * (strlen(u_getDataDirectory()) + strlen("base") +1 ) );
 
-    
-   log_verbose("Testing udata_open()\n");
-   result=udata_open(testPath, type, name, &status);
-   if(U_FAILURE(status)){
- 	  log_err("FAIL: udata_open() failed for path = %s, name=%s, type=%s, \n errorcode=%s\n", testPath, name, type, myErrorName(status));
-   } else {
-	   log_verbose("PASS: udata_open worked\n");
-	   udata_close(result);
-   }
+    strcat(strcpy(path, u_getDataDirectory()), "icudata");
+    strcat(strcpy(testPath, u_getDataDirectory()), "base");
 
-   for(i=0; i<sizeof(memMap)/sizeof(memMap[0]); i++){
-	    status=U_ZERO_ERROR;
-        result=udata_open(path, memMap[i][1], memMap[i][0], &status);
-		if(U_FAILURE(status)) {
- 			log_err("FAIL: udata_open() failed for path = %s, name=%s, type=%s, \n errorcode=%s\n", path, memMap[i][0], memMap[i][1], myErrorName(status));
-		} else {
-			log_verbose("PASS: udata_open worked for path = %s, name=%s, type=%s\n",  path, memMap[i][0], memMap[i][1]);
-			udata_close(result);
-		}
+
+    log_verbose("Testing udata_open()\n");
+    result=udata_open(testPath, type, name, &status);
+    if(U_FAILURE(status)){
+        log_err("FAIL: udata_open() failed for path = %s, name=%s, type=%s, \n errorcode=%s\n", testPath, name, type, myErrorName(status));
+    } else {
+        log_verbose("PASS: udata_open worked\n");
+        udata_close(result);
+    }
+
+    for(i=0; i<sizeof(memMap)/sizeof(memMap[0]); i++){
+        status=U_ZERO_ERROR;
+        result=udata_open(path, memMap[i][1], memMap[i][0], &status);
+        if(U_FAILURE(status)) {
+            log_err("FAIL: udata_open() failed for path = %s, name=%s, type=%s, \n errorcode=%s\n", path, memMap[i][0], memMap[i][1], myErrorName(status));
+        } else {
+            log_verbose("PASS: udata_open worked for path = %s, name=%s, type=%s\n",  path, memMap[i][0], memMap[i][1]);
+            udata_close(result);
+        }
+    }
+
+    log_verbose("Testing udata_open() with a non existing binary file\n");
+    result=udata_open(path, "tst", "nonexist", &status);
+    if(status==U_FILE_ACCESS_ERROR){
+        log_verbose("Opening udata_open with non-existing file handled correctly.\n");
+        status=U_ZERO_ERROR;
+    } else {
+        log_err("calling udata_open with non-existing file not handled correctly\n.  Expected: U_FILE_ACCESS_ERROR, Got: %s\n", myErrorName(status));
+        if(U_SUCCESS(status)) {
+            udata_close(result);
+        }
     }
- 
-   log_verbose("Testing udata_open() with a non existing binary file\n");
-	result=udata_open(path, "tst", "nonexist", &status);
-	if(status==U_FILE_ACCESS_ERROR){
-		log_verbose("Opening udata_open with non-existing file handled correctly.\n");
-		status=U_ZERO_ERROR;
-	} else {
-		log_err("calling udata_open with non-existing file not handled correctly\n.  Expected: U_FILE_ACCESS_ERROR, Got: %s\n", myErrorName(status));
-		if(U_SUCCESS(status)) {
-			udata_close(result);
-		}
-	}
 
     if(result != NULL){
-		log_err("calling udata_open with non-existing file didn't return a null value\n");
-	} else {
-		log_verbose("calling udat_open with non-existing file returned null as expected\n");
-	}
+        log_err("calling udata_open with non-existing file didn't return a null value\n");
+    } else {
+        log_verbose("calling udat_open with non-existing file returned null as expected\n");
+    }
 
-	free(path);
-	free(testPath);
+    free(path);
+    free(testPath);
 }
 static UBool
 isAcceptable1(void *context,
              const char *type, const char *name,
              const UDataInfo *pInfo) {
-	
-    if(
-        pInfo->size>=20 &&
+
+    if( pInfo->size>=20 &&
         pInfo->isBigEndian==U_IS_BIG_ENDIAN &&
         pInfo->charsetFamily==U_CHARSET_FAMILY &&
         pInfo->dataFormat[0]==0x43 &&   /* dataFormat="CvAl" */
         pInfo->dataFormat[1]==0x76 &&
         pInfo->dataFormat[2]==0x41 &&
         pInfo->dataFormat[3]==0x6c &&
-        pInfo->formatVersion[0]==2 ){
-		log_verbose("The data from \"%s.%s\" IS acceptable using the verifing function isAcceptable1()\n", name, type);
-		return TRUE;
-	} else {
-		log_verbose("The data from \"%s.%s\" IS NOT acceptable using the verifing function isAcceptable1():-\n"
-			"\tsize              = %d\n"
-			"\tisBigEndian       = %d\n"
-			"\tcharsetFamily     = %d\n"
-			"\tformatVersion[0]  = %d\n"
-		  	"\tdataVersion[0]    = %d\n"
-			"\tdataFormat        = %c%c%c%c\n",
-			  name, type, pInfo->size,  pInfo->isBigEndian, pInfo->charsetFamily, pInfo->formatVersion[0], 
-			  pInfo->dataVersion[0], pInfo->dataFormat[0], pInfo->dataFormat[1], pInfo->dataFormat[2], 
-			  pInfo->dataFormat[3]);  
-		log_verbose("Call another verifing function to accept the data\n");
-		return FALSE;
-	}
+        pInfo->formatVersion[0]==2 )
+    {
+        log_verbose("The data from \"%s.%s\" IS acceptable using the verifing function isAcceptable1()\n", name, type);
+        return TRUE;
+    } else {
+        log_verbose("The data from \"%s.%s\" IS NOT acceptable using the verifing function isAcceptable1():-\n"
+            "\tsize              = %d\n"
+            "\tisBigEndian       = %d\n"
+            "\tcharsetFamily     = %d\n"
+            "\tformatVersion[0]  = %d\n"
+            "\tdataVersion[0]    = %d\n"
+            "\tdataFormat        = %c%c%c%c\n",
+            name, type, pInfo->size,  pInfo->isBigEndian, pInfo->charsetFamily, pInfo->formatVersion[0], 
+            pInfo->dataVersion[0], pInfo->dataFormat[0], pInfo->dataFormat[1], pInfo->dataFormat[2], 
+            pInfo->dataFormat[3]);  
+        log_verbose("Call another verifing function to accept the data\n");
+        return FALSE;
+    }
 }
 
 static UBool
 isAcceptable2(void *context, 
-			 const char *type, const char *name,
-			 const UDataInfo *pInfo){
-	if(	pInfo->size>=20 &&
+             const char *type, const char *name,
+             const UDataInfo *pInfo){
+    if( pInfo->size>=20 &&
         pInfo->isBigEndian==U_IS_BIG_ENDIAN &&
         pInfo->charsetFamily==U_CHARSET_FAMILY &&
         pInfo->dataFormat[0]==0x75 &&   /* dataFormat="unam" */
@@ -148,23 +148,24 @@ isAcceptable2(void *context,
         pInfo->dataFormat[2]==0x61 &&
         pInfo->dataFormat[3]==0x6d &&
         pInfo->formatVersion[0]==1 &&
-		pInfo->dataVersion[0]==3 ) {
-		log_verbose("The data from \"%s.%s\" IS acceptable using the verifing function isAcceptable2()\n", name, type);
-		return TRUE;
-	} else {
-		log_verbose("The data from \"%s.%s\" IS NOT acceptable using the verifing function isAcceptable2()\n", name, type);
+        pInfo->dataVersion[0]==3 )
+    {
+        log_verbose("The data from \"%s.%s\" IS acceptable using the verifing function isAcceptable2()\n", name, type);
+        return TRUE;
+    } else {
+        log_verbose("The data from \"%s.%s\" IS NOT acceptable using the verifing function isAcceptable2()\n", name, type);
 
-		return FALSE;
-	}
+        return FALSE;
+    }
 
 
 }
 static UBool
 isAcceptable3(void *context, 
-			 const char *type, const char *name,
-			 const UDataInfo *pInfo){
-	
-	if(	pInfo->size>=20 &&
+             const char *type, const char *name,
+             const UDataInfo *pInfo){
+
+    if( pInfo->size>=20 &&
         pInfo->isBigEndian==U_IS_BIG_ENDIAN &&
         pInfo->charsetFamily==U_CHARSET_FAMILY &&
         pInfo->dataFormat[0]==0x54 &&   /* dataFormat="test" */
@@ -172,76 +173,76 @@ isAcceptable3(void *context,
         pInfo->dataFormat[2]==0x73 &&
         pInfo->dataFormat[3]==0x74 &&
         pInfo->formatVersion[0]==1 &&
-		pInfo->dataVersion[0]==1   ) {
-   		log_verbose("The data from \"%s.%s\" IS acceptable using the verifing function isAcceptable3()\n", name, type);
+        pInfo->dataVersion[0]==1   ) {
+        log_verbose("The data from \"%s.%s\" IS acceptable using the verifing function isAcceptable3()\n", name, type);
+
+        return TRUE;
+    } else {
+        log_verbose("The data from \"%s.%s\" IS NOT acceptable using the verifing function isAcceptable3()\n", name, type);
+        return FALSE;
+    }
 
-		return TRUE;
-	} else {
-		log_verbose("The data from \"%s.%s\" IS NOT acceptable using the verifing function isAcceptable3()\n", name, type);
-		return FALSE;
-	}
 
-			
 }
 
 void TestUDataOpenChoiceDemo1() {
    
     UDataMemory *result;
-    UErrorCode status=U_ZERO_ERROR;	
+    UErrorCode status=U_ZERO_ERROR;
  
     const char* name[]={
-		"cnvalias",
-		"unames",
-		"test"
-	};
-    char* type="dat";
-   
-   char* testPath=(char*)malloc(sizeof(char) * (strlen(u_getDataDirectory()) + strlen("base") +1 ) );
+        "cnvalias",
+        "unames",
+        "test"
+    };
+    const char* type="dat";
 
-   strcat(strcpy(testPath, u_getDataDirectory()), "base");
+    char* testPath=(char*)malloc(sizeof(char) * (strlen(u_getDataDirectory()) + strlen("base") +1 ) );
+
+    strcat(strcpy(testPath, u_getDataDirectory()), "base");
 
     result=udata_openChoice(NULL, type, name[0], isAcceptable1, NULL, &status);
     if(U_FAILURE(status)){
         log_err("FAIL: udata_openChoice() failed name=%s, type=%s, \n errorcode=%s\n", name[0], type, myErrorName(status));
-	} else {
-	    log_verbose("PASS: udata_openChoice worked\n");
-		udata_close(result);
-	}
-     
-	result=udata_openChoice(NULL, type, name[1], isAcceptable1, NULL, &status);
-	if(U_FAILURE(status)){
-		status=U_ZERO_ERROR;
-		result=udata_openChoice(NULL, type, name[1], isAcceptable2, NULL, &status);
-		if(U_FAILURE(status)){
-			log_err("FAIL: udata_openChoice() failed name=%s, type=%s, \n errorcode=%s\n", name[1], type, myErrorName(status));
-		}
+    } else {
+        log_verbose("PASS: udata_openChoice worked\n");
+        udata_close(result);
+    }
+
+    result=udata_openChoice(NULL, type, name[1], isAcceptable1, NULL, &status);
+    if(U_FAILURE(status)){
+        status=U_ZERO_ERROR;
+        result=udata_openChoice(NULL, type, name[1], isAcceptable2, NULL, &status);
+        if(U_FAILURE(status)){
+            log_err("FAIL: udata_openChoice() failed name=%s, type=%s, \n errorcode=%s\n", name[1], type, myErrorName(status));
+        }
+    }
+
+    if(U_SUCCESS(status)){
+        udata_close(result);
     }
-	
-	if(U_SUCCESS(status)){
-		udata_close(result);
-	}
 
     result=udata_openChoice(testPath, type, name[2], isAcceptable1, NULL, &status);
-	if(U_FAILURE(status)){
-		status=U_ZERO_ERROR;
-		result=udata_openChoice(testPath, type, name[2], isAcceptable3, NULL, &status);
-		if(U_FAILURE(status)){
-			log_err("FAIL: udata_openChoice() failed path=%s name=%s, type=%s, \n errorcode=%s\n", testPath, name[2], type, myErrorName(status));
-		}
+    if(U_FAILURE(status)){
+        status=U_ZERO_ERROR;
+        result=udata_openChoice(testPath, type, name[2], isAcceptable3, NULL, &status);
+        if(U_FAILURE(status)){
+            log_err("FAIL: udata_openChoice() failed path=%s name=%s, type=%s, \n errorcode=%s\n", testPath, name[2], type, myErrorName(status));
+        }
     }
-    
-	if(U_SUCCESS(status)){
-		udata_close(result);
-	}
 
-	free(testPath);
+    if(U_SUCCESS(status)){
+        udata_close(result);
+    }
+
+    free(testPath);
 
 }
 static UBool
 isAcceptable(void *context, 
-			 const char *type, const char *name,
-			 const UDataInfo *pInfo){
-	if(	pInfo->size>=20 &&
+             const char *type, const char *name,
+             const UDataInfo *pInfo){
+    if( pInfo->size>=20 &&
         pInfo->isBigEndian==U_IS_BIG_ENDIAN &&
         pInfo->charsetFamily==U_CHARSET_FAMILY &&
         pInfo->dataFormat[0]==0x54 &&   /* dataFormat="test" */
@@ -249,83 +250,83 @@ isAcceptable(void *context,
         pInfo->dataFormat[2]==0x73 &&
         pInfo->dataFormat[3]==0x74 &&
         pInfo->formatVersion[0]==1 &&
-		pInfo->dataVersion[0]==1   &&
-		*((int*)context) == 2 ) {
-   		log_verbose("The data from\"%s.%s\" IS acceptable using the verifing function isAcceptable()\n", name, type);
+        pInfo->dataVersion[0]==1   &&
+        *((int*)context) == 2 ) {
+        log_verbose("The data from\"%s.%s\" IS acceptable using the verifing function isAcceptable()\n", name, type);
 
-		return TRUE;
-	} else {
-		log_verbose("The data from \"%s.%s\" IS NOT acceptable using the verifing function isAcceptable()\n", name, type);
-		return FALSE;
-	}
+        return TRUE;
+    } else {
+        log_verbose("The data from \"%s.%s\" IS NOT acceptable using the verifing function isAcceptable()\n", name, type);
+        return FALSE;
+    }
 }
 
 void TestUDataOpenChoiceDemo2() {
-	UDataMemory *result;
-    UErrorCode status=U_ZERO_ERROR;	
-	int i;
-	int p=2;
- 
+    UDataMemory *result;
+    UErrorCode status=U_ZERO_ERROR;
+    int i;
+    int p=2;
+
     const char* name="test";
-    char* type="dat";
+    const char* type="dat";
 
-      const char* base[]={  /* these are the common base names to use for the test */
-	"base",   /* corresponds to something like 'base.dat', 'base.dll', 'libbase.so', etc.. */
-	"base_test"  /* libbase_test.so, libbase_test.a, etc... */
-	};
-	
-	char* path=(char*)malloc(sizeof(char) * (strlen(u_getDataDirectory()) + strlen(base[0]) + 1) );
+    const char* base[]={  /* these are the common base names to use for the test */
+        "base",   /* corresponds to something like 'base.dat', 'base.dll', 'libbase.so', etc.. */
+        "base_test"  /* libbase_test.so, libbase_test.a, etc... */
+    };
+
+    char* path=(char*)malloc(sizeof(char) * (strlen(u_getDataDirectory()) + strlen(base[0]) + 1) );
     strcpy(path, u_getDataDirectory());
-	strcat(path, base[0]);	
-	
-	result=udata_openChoice(path, type, name, isAcceptable, &p, &status);
-	if(U_FAILURE(status)){
-		log_err("failed to load data at p=%s t=%s n=%s, isAcceptable", path, type, name);
-	}
-	if(U_SUCCESS(status) ) {
-		udata_close(result);
-	}
-	strcpy(path, "");
-	
-	p=0;
-	for(i=0;i<sizeof(base)/sizeof(base[0]); i++){
-		path=(char*)realloc(path, sizeof(char) * (strlen(u_getDataDirectory()) + strlen(base[i]) +1 ) );
-		strcat(strcpy(path, u_getDataDirectory()), base[i]);
-		result=udata_openChoice(path, type, name, isAcceptable, &p, &status);
-		if(p<2) {
-			if(U_FAILURE(status) && status==U_INVALID_FORMAT_ERROR){
-				log_verbose("Loads the data but rejects it as expected %s\n", myErrorName(status));
-				status=U_ZERO_ERROR;
-				p++;
-			}
-			else {
-				log_err("ERROR: failed to either load the data or to reject the loaded data. ERROR=%s\n", myErrorName(status) );
-			}
-		}	
-		else if(p == 2) {
-			if(U_FAILURE(status)) {
-				log_err("ERROR: failed to load the data and accept it.  ERROR=%s\n", myErrorName(status) );
-			}
-			else {
-			log_verbose("Loads the data and accepts it for p==2 as expected\n");
-			udata_close(result);
-			}
-		}
-		strcpy(path, "");
-		    
-	}
+    strcat(path, base[0]);
 
-   free(path);  
+    result=udata_openChoice(path, type, name, isAcceptable, &p, &status);
+    if(U_FAILURE(status)){
+        log_err("failed to load data at p=%s t=%s n=%s, isAcceptable", path, type, name);
+    }
+    if(U_SUCCESS(status) ) {
+        udata_close(result);
+    }
+    strcpy(path, "");
+
+    p=0;
+    for(i=0;i<sizeof(base)/sizeof(base[0]); i++){
+        path=(char*)realloc(path, sizeof(char) * (strlen(u_getDataDirectory()) + strlen(base[i]) +1 ) );
+        strcat(strcpy(path, u_getDataDirectory()), base[i]);
+        result=udata_openChoice(path, type, name, isAcceptable, &p, &status);
+        if(p<2) {
+            if(U_FAILURE(status) && status==U_INVALID_FORMAT_ERROR){
+                log_verbose("Loads the data but rejects it as expected %s\n", myErrorName(status));
+                status=U_ZERO_ERROR;
+                p++;
+            }
+            else {
+                log_err("ERROR: failed to either load the data or to reject the loaded data. ERROR=%s\n", myErrorName(status) );
+            }
+        }
+        else if(p == 2) {
+            if(U_FAILURE(status)) {
+                log_err("ERROR: failed to load the data and accept it.  ERROR=%s\n", myErrorName(status) );
+            }
+            else {
+                log_verbose("Loads the data and accepts it for p==2 as expected\n");
+                udata_close(result);
+            }
+        }
+        strcpy(path, "");
+
+    }
+
+   free(path);
 
 }
-    
+
 
 
 void TestUDataGetInfo() {
 
-	UDataMemory *result;
-	/* UDataInfo cf. udata.h */
-	static UDataInfo dataInfo={
+    UDataMemory *result;
+    /* UDataInfo cf. udata.h */
+    static UDataInfo dataInfo={
     30,    /*sizeof(UDataInfo),*/
     0,
 
@@ -337,79 +338,80 @@ void TestUDataGetInfo() {
     0x54, 0x65, 0x73, 0x74,     /* dataFormat="Test" */
     9, 0, 0, 0,                 /* formatVersion */
     4, 0, 0, 0                  /* dataVersion */
-	};
+    };
     UErrorCode status=U_ZERO_ERROR;
-	const char* name="cnvalias";
-	const char* name2="test";
+    const char* name="cnvalias";
+    const char* name2="test";
     const char* type="dat";
-    
-	char* path=(char*)malloc(sizeof(char) * (strlen(u_getDataDirectory()) + strlen("icudata") +1 ) );
-	char* testPath=(char*)malloc(sizeof(char) * (strlen(u_getDataDirectory()) + strlen("base") +1 ) );
 
-	strcat(strcpy(path, u_getDataDirectory()), "icudata");
-	strcat(strcpy(testPath, u_getDataDirectory()), "base");
+    char* path=(char*)malloc(sizeof(char) * (strlen(u_getDataDirectory()) + strlen("icudata") +1 ) );
+    char* testPath=(char*)malloc(sizeof(char) * (strlen(u_getDataDirectory()) + strlen("base") +1 ) );
+
+    strcat(strcpy(path, u_getDataDirectory()), "icudata");
+    strcat(strcpy(testPath, u_getDataDirectory()), "base");
 
 
     log_verbose("Testing udata_getInfo() for cnvalias.dat\n");
     result=udata_open(path, type, name, &status);
     if(U_FAILURE(status)){
-		log_err("FAIL: udata_open() failed for path = %s, name=%s, type=%s, \n errorcode=%s\n", path, name, type, myErrorName(status));
-		return;
+        log_err("FAIL: udata_open() failed for path = %s, name=%s, type=%s, \n errorcode=%s\n", path, name, type, myErrorName(status));
+        return;
     }
-	udata_getInfo(result, &dataInfo);
-			if(dataInfo.size==20            &&  dataInfo.size!=30 &&
-				dataInfo.isBigEndian==U_IS_BIG_ENDIAN       &&  
-				dataInfo.charsetFamily==U_CHARSET_FAMILY    &&
-				dataInfo.dataFormat[0]==0x43 &&  dataInfo.dataFormat[0]!=0x54 && /* dataFormat="CvAl" and not "Test". The values are set for cnvalias.dat*/
-				dataInfo.dataFormat[1]==0x76 &&  dataInfo.dataFormat[1]!=0x65 &&
-				dataInfo.dataFormat[2]==0x41 &&  dataInfo.dataFormat[2]!=0x73 &&
-				dataInfo.dataFormat[3]==0x6c &&  dataInfo.dataFormat[3]!=0x74 &&
-				dataInfo.formatVersion[0]!=9 && /*formatVersion is also set to the one for cnvalias*/
-				dataInfo.dataVersion[0]!=4   && /*dataVersion*/
-				dataInfo.dataVersion[1]!=0   ){
-					log_verbose("PASS: udata_getInfo() filled in the right values\n");
-			} else {
-				log_err("FAIL: udata_getInfo() filled in the wrong values\n");
-			}
-	udata_close(result);
-	
+    udata_getInfo(result, &dataInfo);
+    if(dataInfo.size==20            &&  dataInfo.size!=30 &&
+        dataInfo.isBigEndian==U_IS_BIG_ENDIAN       &&  
+        dataInfo.charsetFamily==U_CHARSET_FAMILY    &&
+        dataInfo.dataFormat[0]==0x43 &&  dataInfo.dataFormat[0]!=0x54 && /* dataFormat="CvAl" and not "Test". The values are set for cnvalias.dat*/
+        dataInfo.dataFormat[1]==0x76 &&  dataInfo.dataFormat[1]!=0x65 &&
+        dataInfo.dataFormat[2]==0x41 &&  dataInfo.dataFormat[2]!=0x73 &&
+        dataInfo.dataFormat[3]==0x6c &&  dataInfo.dataFormat[3]!=0x74 &&
+        dataInfo.formatVersion[0]!=9 && /*formatVersion is also set to the one for cnvalias*/
+        dataInfo.dataVersion[0]!=4   && /*dataVersion*/
+        dataInfo.dataVersion[1]!=0   ){
+            log_verbose("PASS: udata_getInfo() filled in the right values\n");
+    } else {
+        log_err("FAIL: udata_getInfo() filled in the wrong values\n");
+    }
+    udata_close(result);
+
 
     log_verbose("Testing udata_getInfo() for test.dat\n");
-	result=udata_open(testPath, type, name2, &status);
+    result=udata_open(testPath, type, name2, &status);
     if(U_FAILURE(status)) {
-	   log_err("FAIL: udata_open() failed for path=%s name2=%s, type=%s, \n errorcode=%s\n", testPath, name2, type, myErrorName(status));
-	   return;
-	}
-	udata_getInfo(result, &dataInfo);
-			if(dataInfo.size==20             &&
-				dataInfo.isBigEndian==U_IS_BIG_ENDIAN       &&  
-				dataInfo.charsetFamily==U_CHARSET_FAMILY    &&
-				dataInfo.dataFormat[0]==0x54 &&   /* dataFormat="Test". The values are set for test.dat*/
-				dataInfo.dataFormat[1]==0x65 && 
-				dataInfo.dataFormat[2]==0x73 &&  
-				dataInfo.dataFormat[3]==0x74 &&  
-				dataInfo.formatVersion[0]==1 &&  /*formatVersion is also set to the one for test*/
-				dataInfo.dataVersion[0]==1   &&  /*dataVersion*/
-				dataInfo.dataVersion[1]==0   ) {
-					log_verbose("PASS: udata_getInfo() filled in the right values\n");
-			} else {
-				log_err("FAIL: udata_getInfo() filled in the wrong values\n");
-			}
-	udata_close(result);
-	free(path);
-	free(testPath);
+       log_err("FAIL: udata_open() failed for path=%s name2=%s, type=%s, \n errorcode=%s\n", testPath, name2, type, myErrorName(status));
+       return;
+    }
+    udata_getInfo(result, &dataInfo);
+    if(dataInfo.size==20             &&
+        dataInfo.isBigEndian==U_IS_BIG_ENDIAN       &&  
+        dataInfo.charsetFamily==U_CHARSET_FAMILY    &&
+        dataInfo.dataFormat[0]==0x54 &&   /* dataFormat="Test". The values are set for test.dat*/
+        dataInfo.dataFormat[1]==0x65 && 
+        dataInfo.dataFormat[2]==0x73 &&  
+        dataInfo.dataFormat[3]==0x74 &&  
+        dataInfo.formatVersion[0]==1 &&  /*formatVersion is also set to the one for test*/
+        dataInfo.dataVersion[0]==1   &&  /*dataVersion*/
+        dataInfo.dataVersion[1]==0   )
+    {
+        log_verbose("PASS: udata_getInfo() filled in the right values\n");
+    } else {
+        log_err("FAIL: udata_getInfo() filled in the wrong values\n");
+    }
+    udata_close(result);
+    free(path);
+    free(testPath);
 }
 
 void TestUDataGetMemory() {
 
-	UDataMemory *result;
-	const uint16_t *table=NULL;
-	uint16_t* intValue=0;
+    UDataMemory *result;
+    const uint16_t *table=NULL;
+    uint16_t* intValue=0;
     UErrorCode status=U_ZERO_ERROR;
-	const char* name="cnvalias";
+    const char* name="cnvalias";
     const char* type="dat";
 
-	const char* name2="test";
+    const char* name2="test";
 
    char* testPath=(char*)malloc(sizeof(char) * (strlen(u_getDataDirectory()) + strlen("base") +1 ) );
 
@@ -418,148 +420,147 @@ void TestUDataGetMemory() {
     log_verbose("Testing udata_getMemory for \"cnvalias.dat()\"\n");
     result=udata_openChoice(NULL, type, name, isAcceptable1, NULL, &status);
     if(U_FAILURE(status)){
-		 log_err("FAIL: udata_openChoice() failed for name=%s, type=%s, \n errorcode=%s\n", name, type, myErrorName(status));
-         return;
-	}
+        log_err("FAIL: udata_openChoice() failed for name=%s, type=%s, \n errorcode=%s\n", name, type, myErrorName(status));
+        return;
+    }
     table=(const uint16_t *)udata_getMemory(result);
-	
+
     if(ucnv_countAvailable() !=  table[1+2*(*table)])      /*???*/
-		 log_err("FAIL: udata_getMemory() failed ucnv_countAvailable returned = %d, expected = %d ", ucnv_countAvailable(), table[1+2*(*table)]);
-	 
-	udata_close(result);
-    
+        log_err("FAIL: udata_getMemory() failed ucnv_countAvailable returned = %d, expected = %d ", ucnv_countAvailable(), table[1+2*(*table)]);
+
+    udata_close(result);
+
     log_verbose("Testing udata_getMemory for \"test.dat\"()\n");
     result=udata_openChoice(testPath, type, name2, isAcceptable3, NULL, &status);
     if(U_FAILURE(status)){
-		 log_err("FAIL: udata_openChoice() failed for path=%s name=%s, type=%s, \n errorcode=%s\n", testPath, name2, type, myErrorName(status));
-         return;
-	}
+        log_err("FAIL: udata_openChoice() failed for path=%s name=%s, type=%s, \n errorcode=%s\n", testPath, name2, type, myErrorName(status));
+        return;
+    }
     intValue=(uint16_t *)udata_getMemory(result);
     /*printf("%d ..... %s", *(intValue), intValue+1));*/
-	if( *intValue != 2000 || strcmp((char*)(intValue+1), "YEAR") != 0 )
-		log_err("FAIL: udata_getMemory() failed: intValue :- Expected:2000 Got:%d \n\tstringValue:- Expected:YEAR Got:%s\n", *intValue, (intValue+1));
-    
-   	 udata_close(result);
+    if( *intValue != 2000 || strcmp((char*)(intValue+1), "YEAR") != 0 )
+        log_err("FAIL: udata_getMemory() failed: intValue :- Expected:2000 Got:%d \n\tstringValue:- Expected:YEAR Got:%s\n", *intValue, (intValue+1));
 
-	 free(testPath);
+    udata_close(result);
+
+    free(testPath);
  }
 void TestErrorConditions(){
-   
-   UDataMemory *result=NULL;
-   UErrorCode status=U_ZERO_ERROR;
-   uint16_t* intValue=0;
-   static UDataInfo dataInfo={
-    30,    /*sizeof(UDataInfo),*/
-    0,
 
-    U_IS_BIG_ENDIAN,
-    U_CHARSET_FAMILY,
-    sizeof(UChar),
-    0,
+    UDataMemory *result=NULL;
+    UErrorCode status=U_ZERO_ERROR;
+    uint16_t* intValue=0;
+    static UDataInfo dataInfo={
+        30,    /*sizeof(UDataInfo),*/
+        0,
 
-    0x54, 0x65, 0x73, 0x74,     /* dataFormat="Test" */
-    9, 0, 0, 0,                 /* formatVersion */
-    4, 0, 0, 0                  /* dataVersion */
-	};
+        U_IS_BIG_ENDIAN,
+        U_CHARSET_FAMILY,
+        sizeof(UChar),
+        0,
 
-   const char* name = "test";
-   const char* type="dat";
-   
-   char* path=(char*)malloc(sizeof(char) * (strlen(u_getDataDirectory()) + strlen("icudata") +1 ) );
-   char* testPath=(char*)malloc(sizeof(char) * (strlen(u_getDataDirectory()) + strlen("base") +1 ) );
+        0x54, 0x65, 0x73, 0x74,     /* dataFormat="Test" */
+        9, 0, 0, 0,                 /* formatVersion */
+        4, 0, 0, 0                  /* dataVersion */
+    };
 
-   strcat(strcpy(path, u_getDataDirectory()), "icudata");
-   strcat(strcpy(testPath, u_getDataDirectory()), "base");
+    const char* name = "test";
+    const char* type="dat";
 
-   status = U_ILLEGAL_ARGUMENT_ERROR;
-   /*Try udata_open with status != U_ZERO_ERROR*/
-   log_verbose("Testing udata_open() with status != U_ZERO_ERROR\n");
-   result=udata_open(testPath, type, name, &status);
-   if(result != NULL){
- 	  log_err("FAIL: udata_open() is supposed to fail for path = %s, name=%s, type=%s, \n errorcode !=U_ZERO_ERROR\n", testPath, name, type);
-      udata_close(result);
- 
-   } else {
-	   log_verbose("PASS: udata_open with errorCode != U_ZERO_ERROR failed as expected\n");
-   }
-   
-   /*Try udata_open with data name=NULL*/
-   log_verbose("Testing udata_open() with data name=NULL\n");
-   status=U_ZERO_ERROR;
-   result=udata_open(testPath, type, NULL, &status);
-   if(U_FAILURE(status)){
-       if(status != U_ILLEGAL_ARGUMENT_ERROR || result != NULL){
+    char* path=(char*)malloc(sizeof(char) * (strlen(u_getDataDirectory()) + strlen("icudata") +1 ) );
+    char* testPath=(char*)malloc(sizeof(char) * (strlen(u_getDataDirectory()) + strlen("base") +1 ) );
+
+    strcat(strcpy(path, u_getDataDirectory()), "icudata");
+    strcat(strcpy(testPath, u_getDataDirectory()), "base");
+
+    status = U_ILLEGAL_ARGUMENT_ERROR;
+    /*Try udata_open with status != U_ZERO_ERROR*/
+    log_verbose("Testing udata_open() with status != U_ZERO_ERROR\n");
+    result=udata_open(testPath, type, name, &status);
+    if(result != NULL){
+        log_err("FAIL: udata_open() is supposed to fail for path = %s, name=%s, type=%s, \n errorcode !=U_ZERO_ERROR\n", testPath, name, type);
+        udata_close(result);
+
+    } else {
+        log_verbose("PASS: udata_open with errorCode != U_ZERO_ERROR failed as expected\n");
+    }
+
+    /*Try udata_open with data name=NULL*/
+    log_verbose("Testing udata_open() with data name=NULL\n");
+    status=U_ZERO_ERROR;
+    result=udata_open(testPath, type, NULL, &status);
+    if(U_FAILURE(status)){
+        if(status != U_ILLEGAL_ARGUMENT_ERROR || result != NULL){
             log_err("FAIL: udata_open() with name=NULL should return NULL and errocode U_ILLEGAL_ARGUMENT_ERROR, GOT: errorcode=%s\n", myErrorName(status));
-       }else{
+        }else{
             log_verbose("PASS: udata_open with name=NULL failed as expected and errorcode = %s as expected\n", myErrorName(status));
-       }    
-   }else{
-       log_err("FAIL: udata_open() with data name=NULL is supposed to fail for path = %s, name=NULL type=%s errorcode=U_ZERO_ERROR \n", testPath, type);
-       udata_close(result);
-   }
+        }
+    }else{
+        log_err("FAIL: udata_open() with data name=NULL is supposed to fail for path = %s, name=NULL type=%s errorcode=U_ZERO_ERROR \n", testPath, type);
+        udata_close(result);
+    }
 
 
-     /*Try udata_openChoice with status != U_ZERO_ERROR*/
-   log_verbose("Testing udata_openChoice() with status != U_ZERO_ERROR\n");
-   status=U_ILLEGAL_ARGUMENT_ERROR;
-   result=udata_openChoice(testPath, type, name, isAcceptable3, NULL, &status);
-   if(result != NULL){
- 	  log_err("FAIL: udata_openChoice() is supposed to fail for path = %s, name=%s, type=%s, \n errorcode != U_ZERO_ERROR\n", testPath, name, type);
-      udata_close(result);
- 
-   } else {
-	   log_verbose("PASS: udata_openChoice() with errorCode != U_ZERO_ERROR failed as expected\n");
-   }
+    /*Try udata_openChoice with status != U_ZERO_ERROR*/
+    log_verbose("Testing udata_openChoice() with status != U_ZERO_ERROR\n");
+    status=U_ILLEGAL_ARGUMENT_ERROR;
+    result=udata_openChoice(testPath, type, name, isAcceptable3, NULL, &status);
+    if(result != NULL){
+        log_err("FAIL: udata_openChoice() is supposed to fail for path = %s, name=%s, type=%s, \n errorcode != U_ZERO_ERROR\n", testPath, name, type);
+        udata_close(result);
+    } else {
+        log_verbose("PASS: udata_openChoice() with errorCode != U_ZERO_ERROR failed as expected\n");
+    }
 
-   /*Try udata_open with data name=NULL*/
-   log_verbose("Testing udata_openChoice() with data name=NULL\n");
-   status=U_ZERO_ERROR;
-   result=udata_openChoice(testPath, type, NULL, isAcceptable3, NULL, &status);
-   if(U_FAILURE(status)){
-       if(status != U_ILLEGAL_ARGUMENT_ERROR || result != NULL){
+    /*Try udata_open with data name=NULL*/
+    log_verbose("Testing udata_openChoice() with data name=NULL\n");
+    status=U_ZERO_ERROR;
+    result=udata_openChoice(testPath, type, NULL, isAcceptable3, NULL, &status);
+    if(U_FAILURE(status)){
+        if(status != U_ILLEGAL_ARGUMENT_ERROR || result != NULL){
             log_err("FAIL: udata_openChoice() with name=NULL should return NULL and errocode U_ILLEGAL_ARGUMENT_ERROR, GOT: errorcode=%s\n", myErrorName(status));
-       }else{
+        }else{
             log_verbose("PASS: udata_openChoice with name=NULL failed as expected and errorcode = %s as expected\n", myErrorName(status));
-       }    
-   }else{
-       log_err("FAIL: udata_openChoice() with data name=NULL is supposed to fail for path = %s, name=NULL type=%s errorcode=U_ZERO_ERROR \n", testPath, type);
-       udata_close(result);
-   }
+        }    
+    }else{
+        log_err("FAIL: udata_openChoice() with data name=NULL is supposed to fail for path = %s, name=NULL type=%s errorcode=U_ZERO_ERROR \n", testPath, type);
+        udata_close(result);
+    }
 
-   /*Try udata_getMemory with UDataMemory=NULL*/
-   log_verbose("Testing udata_getMemory with UDataMemory=NULL\n");
-   intValue=(uint16_t*)udata_getMemory(NULL);
-   if(intValue != NULL){
-       log_err("FAIL: udata_getMemory with UDataMemory = NULL is supposed to fail\n");
-   }
-  
-   /*Try udata_getInfo with UDataMemory=NULL*/
-   status=U_ZERO_ERROR;
-   udata_getInfo(NULL, &dataInfo);
-   if(dataInfo.size != 0){
-       log_err("FAIL : udata_getInfo with UDataMemory = NULL us supposed to fail\n");
-   }
+    /*Try udata_getMemory with UDataMemory=NULL*/
+    log_verbose("Testing udata_getMemory with UDataMemory=NULL\n");
+    intValue=(uint16_t*)udata_getMemory(NULL);
+    if(intValue != NULL){
+        log_err("FAIL: udata_getMemory with UDataMemory = NULL is supposed to fail\n");
+    }
 
-   /*Try udata_openChoice with a non existing binary file*/
-   log_verbose("Testing udata_openChoice() with a non existing binary file\n");
-   result=udata_openChoice(testPath, "tst", "nonexist", isAcceptable3, NULL, &status);
-   if(status==U_FILE_ACCESS_ERROR){
-	  log_verbose("Opening udata_openChoice with non-existing file handled correctly.\n");
-	  status=U_ZERO_ERROR;
-   } else {
-	  log_err("calling udata_open with non-existing file not handled correctly\n.  Expected: U_FILE_ACCESS_ERROR, Got: %s\n", myErrorName(status));
-		 if(U_SUCCESS(status)) {
-			udata_close(result);
-         }
-   }
+    /*Try udata_getInfo with UDataMemory=NULL*/
+    status=U_ZERO_ERROR;
+    udata_getInfo(NULL, &dataInfo);
+    if(dataInfo.size != 0){
+        log_err("FAIL : udata_getInfo with UDataMemory = NULL us supposed to fail\n");
+    }
 
-   if(result != NULL){
-	  log_err("calling udata_open with non-existing file didn't return a null value\n");
-   } else {
-		log_verbose("calling udat_open with non-existing file returned null as expected\n");
-   }
+    /*Try udata_openChoice with a non existing binary file*/
+    log_verbose("Testing udata_openChoice() with a non existing binary file\n");
+    result=udata_openChoice(testPath, "tst", "nonexist", isAcceptable3, NULL, &status);
+    if(status==U_FILE_ACCESS_ERROR){
+        log_verbose("Opening udata_openChoice with non-existing file handled correctly.\n");
+        status=U_ZERO_ERROR;
+    } else {
+        log_err("calling udata_open with non-existing file not handled correctly\n.  Expected: U_FILE_ACCESS_ERROR, Got: %s\n", myErrorName(status));
+        if(U_SUCCESS(status)) {
+            udata_close(result);
+        }
+    }
+
+    if(result != NULL){
+        log_err("calling udata_open with non-existing file didn't return a null value\n");
+    } else {
+        log_verbose("calling udat_open with non-existing file returned null as expected\n");
+    }
     free(path);
     free(testPath);
-      
+
 }