Changeset 247477 in webkit

Timestamp:

Jul 16, 2019 1:09:52 AM (5 years ago)

Author:

Michael Catanzaro

Message:

[WPE][GTK] Improvements and fixes in FileSystemGlib.cpp
​https://bugs.webkit.org/show_bug.cgi?id=199800

Reviewed by Carlos Garcia Campos.

Use nullptr.

Fix a GFileInfo leak in getFileSize.

Use GRefPtr to clarify ownership of the GFileIOStream in openFile.

• wtf/glib/FileSystemGlib.cpp:

(WTF::FileSystemImpl::getFileSize):
(WTF::FileSystemImpl::getVolumeFreeSpace):
(WTF::FileSystemImpl::openTemporaryFile):
(WTF::FileSystemImpl::openFile):
(WTF::FileSystemImpl::seekFile):
(WTF::FileSystemImpl::writeToFile):
(WTF::FileSystemImpl::readFromFile):

Location:

trunk/Source/WTF

Files:

• ChangeLog (modified) (1 diff)
• wtf/glib/FileSystemGlib.cpp (modified) (7 diffs)

trunk/Source/WTF/ChangeLog

@@ +1 @@
+2019-07-16  Michael Catanzaro  <mcatanzaro@igalia.com>
+
+        [WPE][GTK] Improvements and fixes in FileSystemGlib.cpp
+        https://bugs.webkit.org/show_bug.cgi?id=199800
+
+        Reviewed by Carlos Garcia Campos.
+
+        Use nullptr.
+
+        Fix a GFileInfo leak in getFileSize.
+
+        Use GRefPtr to clarify ownership of the GFileIOStream in openFile.
+
+        * wtf/glib/FileSystemGlib.cpp:
+        (WTF::FileSystemImpl::getFileSize):
+        (WTF::FileSystemImpl::getVolumeFreeSpace):
+        (WTF::FileSystemImpl::openTemporaryFile):
+        (WTF::FileSystemImpl::openFile):
+        (WTF::FileSystemImpl::seekFile):
+        (WTF::FileSystemImpl::writeToFile):
+        (WTF::FileSystemImpl::readFromFile):
+
 2019-07-15  Myles C. Maxfield  <mmaxfield@apple.com>
 

trunk/Source/WTF/wtf/glib/FileSystemGlib.cpp

@@ -167 +167 @@
 bool getFileSize(PlatformFileHandle handle, long long& resultSize)
 {
-    auto info = g_file_io_stream_query_info(handle, G_FILE_ATTRIBUTE_STANDARD_SIZE, nullptr, nullptr);
+    GRefPtr<GFileInfo> info = adoptGRef(g_file_io_stream_query_info(handle, G_FILE_ATTRIBUTE_STANDARD_SIZE, nullptr, nullptr));
     if (!info)
         return false;
 
-    resultSize = g_file_info_get_size(info);
+    resultSize = g_file_info_get_size(info.get());
     return true;
 }
@@ -285 +285 @@
 
     GRefPtr<GFile> file = adoptGRef(g_file_new_for_path(filename.data()));
-    GRefPtr<GFileInfo> fileInfo = adoptGRef(g_file_query_filesystem_info(file.get(), G_FILE_ATTRIBUTE_FILESYSTEM_FREE, 0, 0));
+    GRefPtr<GFileInfo> fileInfo = adoptGRef(g_file_query_filesystem_info(file.get(), G_FILE_ATTRIBUTE_FILESYSTEM_FREE, nullptr, nullptr));
     if (!fileInfo)
         return false;
@@ -330 +330 @@
 {
     GUniquePtr<gchar> filename(g_strdup_printf("%s%s", prefix.utf8().data(), createCanonicalUUIDString().utf8().data()));
-    GUniquePtr<gchar> tempPath(g_build_filename(g_get_tmp_dir(), filename.get(), NULL));
+    GUniquePtr<gchar> tempPath(g_build_filename(g_get_tmp_dir(), filename.get(), nullptr));
     GRefPtr<GFile> file = adoptGRef(g_file_new_for_path(tempPath.get()));
 
-    handle = g_file_create_readwrite(file.get(), G_FILE_CREATE_NONE, 0, 0);
+    handle = g_file_create_readwrite(file.get(), G_FILE_CREATE_NONE, nullptr, nullptr);
     if (!isHandleValid(handle))
         return String();
@@ -346 +346 @@
 
     GRefPtr<GFile> file = adoptGRef(g_file_new_for_path(filename.data()));
-    GFileIOStream* ioStream = 0;
+    GRefPtr<GFileIOStream> ioStream;
     if (mode == FileOpenMode::Read)
-        ioStream = g_file_open_readwrite(file.get(), 0, 0);
+        ioStream = adoptGRef(g_file_open_readwrite(file.get(), nullptr, nullptr));
     else if (mode == FileOpenMode::Write) {
         if (g_file_test(filename.data(), static_cast<GFileTest>(G_FILE_TEST_EXISTS | G_FILE_TEST_IS_REGULAR)))
-            ioStream = g_file_open_readwrite(file.get(), 0, 0);
+            ioStream = adoptGRef(g_file_open_readwrite(file.get(), nullptr, nullptr));
         else
-            ioStream = g_file_create_readwrite(file.get(), G_FILE_CREATE_NONE, 0, 0);
+            ioStream = adoptGRef(g_file_create_readwrite(file.get(), G_FILE_CREATE_NONE, nullptr, nullptr));
     }
 
-    return ioStream;
+    return ioStream.leakRef();
 }
 
@@ -386 +386 @@
     }
 
-    if (!g_seekable_seek(G_SEEKABLE(g_io_stream_get_input_stream(G_IO_STREAM(handle))),
-        offset, seekType, 0, 0))
-    {
+    if (!g_seekable_seek(G_SEEKABLE(g_io_stream_get_input_stream(G_IO_STREAM(handle))), offset, seekType, nullptr, nullptr))
         return -1;
-    }
     return g_seekable_tell(G_SEEKABLE(g_io_stream_get_input_stream(G_IO_STREAM(handle))));
 }
@@ -398 +395 @@
     gsize bytesWritten;
     g_output_stream_write_all(g_io_stream_get_output_stream(G_IO_STREAM(handle)),
-        data, length, &bytesWritten, 0, 0);
+        data, length, &bytesWritten, nullptr, nullptr);
     return bytesWritten;
 }
@@ -407 +404 @@
     do {
         gssize bytesRead = g_input_stream_read(g_io_stream_get_input_stream(G_IO_STREAM(handle)),
-            data, length, 0, &error.outPtr());
+            data, length, nullptr, &error.outPtr());
         if (bytesRead >= 0)
             return bytesRead;