Cleaup SbFile usage.

Change-Id: Ie0da2d423cb30500608fc434f3d30805174c3945
youtube · Jul 13, 2024 · e0f8599 · e0f8599
1 parent 2ae8495
commit e0f8599
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/starboard/loader_app/drain_file.cc b/starboard/loader_app/drain_file.cc
@@ -177,11 +177,10 @@ bool TryDrain(const char* dir, const char* app_key) {
   path.append(filename);
 
   SbFileError error = kSbFileOk;
-  SbFile file = SbFileOpen(path.c_str(), kSbFileCreateAlways | kSbFileWrite,
-                           NULL, &error);
+  int file = open(path.c_str(), O_CREAT | O_WRONLY);
 
-  SB_DCHECK(error == kSbFileOk);
-  SB_DCHECK(SbFileClose(file));
+  SB_DCHECK(file >= 0);
+  SB_DCHECK(close(file));
 
   SB_LOG(INFO) << "Created drain file at '" << path << "'";
 

diff --git a/starboard/nplb/file_open_test.cc b/starboard/nplb/file_open_test.cc
@@ -12,6 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#if SB_API_VERSION < 16
+
 #include <sys/stat.h>
 
 #include <iomanip>
@@ -165,3 +167,5 @@ TEST(SbFileOpenTest, OpenOnlyDoesNotOpenNonExistingStaticContentFile) {
 }  // namespace
 }  // namespace nplb
 }  // namespace starboard
+
+#endif  // SB_API_VERSION < 16
diff --git a/third_party/boringssl/src/crypto/bio/file.c b/third_party/boringssl/src/crypto/bio/file.c
@@ -177,6 +177,7 @@ BIO *BIO_new_file(const char *filename, const char *mode) {
 #if defined(OPENSSL_SYS_STARBOARD)
   SbFile sb_file = kSbFileInvalid;
   SbFileError error = kSbFileOk;
+  int file = open(filename, SbFileModeStringToFlags(mode));
   sb_file = SbFileOpen(filename, SbFileModeStringToFlags(mode), NULL, &error);
   if (!SbFileIsValid(sb_file)) {
     OPENSSL_PUT_SYSTEM_ERROR();