From 5f665338d98dcec719379ec297f7ea1303f61c3d Mon Sep 17 00:00:00 2001
From: Marco Nelissen <marcone@google.com>
Date: Wed, 20 May 2009 09:02:18 -0700
Subject: [PATCH] Re-apply part of perforce CL 131021, which was lost with a
 recent integrate from master.

---
 oscl/oscl/osclio/src/oscl_file_native.cpp | 85 ++-----------------------------
 1 file changed, 3 insertions(+), 82 deletions(-)

diff --git a/oscl/oscl/osclio/src/oscl_file_native.cpp b/oscl/oscl/osclio/src/oscl_file_native.cpp
index 69cd3958..03d1bc75 100644
--- a/oscl/oscl/osclio/src/oscl_file_native.cpp
+++ b/oscl/oscl/osclio/src/oscl_file_native.cpp
@@ -155,48 +155,8 @@ int32 OsclNativeFile::Open(const oscl_wchar *filename, uint32 mode
         if (!filename || *filename == '\0') return -1; // Null string not supported in fopen, error out
 
         char openmode[4];
-        uint32 index = 0;
-
-        if (mode & Oscl_File::MODE_READWRITE)
-        {
-            if (mode & Oscl_File::MODE_APPEND)
-            {
-                openmode[index++] = 'a';
-                openmode[index++] = '+';
-            }
-            else
-            {
-                openmode[index++] = 'w';
-                openmode[index++] = '+';
-            }
-        }
-        else if (mode & Oscl_File::MODE_APPEND)
-        {
-            openmode[index++] = 'a';
-            openmode[index++] = '+';
-        }
-        else if (mode & Oscl_File::MODE_READ)
-        {
-            openmode[index++] = 'r';
-        }
-        else if (mode & Oscl_File::MODE_READ_PLUS)
-        {
-            openmode[index++] = 'r';
-            openmode[index++] = '+';
-        }
-
 
-
-        if (mode & Oscl_File::MODE_TEXT)
-        {
-            openmode[index++] = 't';
-        }
-        else
-        {
-            openmode[index++] = 'b';
-        }
-
-        openmode[index++] = '\0';
+        OpenModeToString(mode, openmode);
 
 #ifdef _UNICODE
         oscl_wchar convopenmode[4];
@@ -216,7 +176,7 @@ int32 OsclNativeFile::Open(const oscl_wchar *filename, uint32 mode
         {
             return -1;
         }
-	return OpenFileOrSharedFd(convfilename, openmode);
+        return OpenFileOrSharedFd(convfilename, openmode);
 #endif
     }
 
@@ -235,47 +195,8 @@ int32 OsclNativeFile::Open(const char *filename, uint32 mode
     if (!filename || *filename == '\0') return -1; // Null string not supported in fopen, error out
 
     char openmode[4];
-    uint32 index = 0;
-
-    if (mode & Oscl_File::MODE_READWRITE)
-    {
-	if (mode & Oscl_File::MODE_APPEND)
-	{
-	    openmode[index++] = 'a';
-	    openmode[index++] = '+';
-	}
-	else
-	{
-	    openmode[index++] = 'w';
-	    openmode[index++] = '+';
-
-	}
-    }
-    else if (mode & Oscl_File::MODE_APPEND)
-    {
-	openmode[index++] = 'a';
-	openmode[index++] = '+';
-    }
-    else if (mode & Oscl_File::MODE_READ)
-    {
-	openmode[index++] = 'r';
-    }
-    else if (mode & Oscl_File::MODE_READ_PLUS)
-    {
-	openmode[index++] = 'r';
-	openmode[index++] = '+';
-    }
-
-    if (mode & Oscl_File::MODE_TEXT)
-    {
-	openmode[index++] = 't';
-    }
-    else
-    {
-	openmode[index++] = 'b';
-    }
 
-    openmode[index++] = '\0';
+    OpenModeToString(mode, openmode);
 
     return OpenFileOrSharedFd(filename, openmode);
 
-- 
2.11.0