diff options
Diffstat (limited to 'Source/WebCore/platform/android')
3 files changed, 7 insertions, 32 deletions
diff --git a/Source/WebCore/platform/android/FileSystemAndroid.cpp b/Source/WebCore/platform/android/FileSystemAndroid.cpp index 9ed43f0..5efba84 100644 --- a/Source/WebCore/platform/android/FileSystemAndroid.cpp +++ b/Source/WebCore/platform/android/FileSystemAndroid.cpp @@ -55,26 +55,25 @@ CString fileSystemRepresentation(const String& path) return path.utf8(); } -CString openTemporaryFile(const char* prefix, PlatformFileHandle& handle) +String openTemporaryFile(const String& prefix, PlatformFileHandle& handle) { int number = rand() % 10000 + 1; - CString filename; + String filename; do { StringBuilder builder; builder.append(sPluginPath); builder.append('/'); builder.append(prefix); builder.append(String::number(number)); - filename = builder.toString().utf8(); - const char* fstr = filename.data(); - handle = open(filename.data(), O_WRONLY | O_CREAT | O_EXCL, S_IRUSR | S_IWUSR); + filename = builder.toString(); + handle = open(filename.utf8().data(), O_WRONLY | O_CREAT | O_EXCL, S_IRUSR | S_IWUSR); number++; if (handle != -1) return filename; } while (errno == EEXIST); - return CString(); + return String(); } bool unloadModule(PlatformModule module) @@ -87,30 +86,6 @@ String homeDirectoryPath() return sPluginPath; } -Vector<String> listDirectory(const String& path, const String& filter) -{ - Vector<String> entries; - CString cpath = path.utf8(); - CString cfilter = filter.utf8(); - DIR* dir = opendir(cpath.data()); - if (dir) { - struct dirent* dp; - while ((dp = readdir(dir))) { - const char* name = dp->d_name; - if (!strcmp(name, ".") || !strcmp(name, "..")) - continue; - if (fnmatch(cfilter.data(), name, 0)) - continue; - char filePath[1024]; - if (static_cast<int>(sizeof(filePath) - 1) < snprintf(filePath, sizeof(filePath), "%s/%s", cpath.data(), name)) - continue; // buffer overflow - entries.append(filePath); - } - closedir(dir); - } - return entries; -} - // We define our own pathGetFileName rather than use the POSIX versions as we // may get passed a content URI representing the path to the file. We pass // the input through fileSystemRepresentation before using it to resolve it if diff --git a/Source/WebCore/platform/android/LocalizedStringsAndroid.cpp b/Source/WebCore/platform/android/LocalizedStringsAndroid.cpp index 5a96cf6..e5a733a 100644 --- a/Source/WebCore/platform/android/LocalizedStringsAndroid.cpp +++ b/Source/WebCore/platform/android/LocalizedStringsAndroid.cpp @@ -230,7 +230,7 @@ String contextMenuItemTagSearchWeb() return String(); } -String contextMenuItemTagLookUpInDictionary() +String contextMenuItemTagLookUpInDictionary(const String&) { notImplemented(); return String(); diff --git a/Source/WebCore/platform/android/TemporaryLinkStubs.cpp b/Source/WebCore/platform/android/TemporaryLinkStubs.cpp index ede06dc..ca9f24d 100644 --- a/Source/WebCore/platform/android/TemporaryLinkStubs.cpp +++ b/Source/WebCore/platform/android/TemporaryLinkStubs.cpp @@ -396,7 +396,7 @@ PassRefPtr<SharedBuffer> SharedBuffer::createWithContentsOfFile(const String&) #if USE(JSC) namespace JSC { namespace Bindings { -bool dispatchJNICall(ExecState*, const void* targetAppletView, jobject obj, bool isStatic, JNIType returnType, +bool dispatchJNICall(ExecState*, const void* targetAppletView, jobject obj, bool isStatic, JavaType returnType, jmethodID methodID, jvalue* args, jvalue& result, const char* callingURL, JSValue& exceptionDescription) { notImplemented(); |