Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-08 19:04:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1851709 - Remove unused hunspell fopen hook. r=masayuki

Browse Source 
A long time ago, the hook was use to make myopen use a different
fopen, but since then, myopen switched to STL iostreams, but also,
Firefox doesn't use myopen anymore.

Differential Revision: https://phabricator.services.mozilla.com/D187515
This commit is contained in:
Mike Hommey 2023-09-06 02:07:54 +00:00
parent db5d6233c9
commit 3a359850b8
2 changed files with 1 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
extensions/spellcheck/hunspell/glue/common.mozbuild
View File

@ -6,4 +6,4 @@
@template
def HunspellIncludes():
ForceInclude('hunspell_alloc_hooks.h', 'hunspell_fopen_hooks.h')
ForceInclude('hunspell_alloc_hooks.h')

81
extensions/spellcheck/hunspell/glue/hunspell_fopen_hooks.h
View File

@ -1,81 +0,0 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#ifndef fopen_hooks_h__
#define fopen_hooks_h__
/**
* This file is force-included in hunspell code. Its purpose is to add
* readahead to fopen() calls in hunspell without modifying its code, in order
* to ease future upgrades.
*/
#include "mozilla/FileUtils.h"
#include <stdio.h>
#include <string.h>
#if defined(XP_WIN)
# include "nsNativeCharsetUtils.h"
# include "nsString.h"
# include <fcntl.h>
# include <windows.h>
// Hunspell defines a function named near. Windef.h #defines near.
# undef near
// mozHunspell defines a function named RemoveDirectory.
# undef RemoveDirectory
#endif /* defined(XP_WIN) */
inline FILE* hunspell_fopen_readahead(const char* filename, const char* mode) {
if (!filename || !mode) {
return nullptr;
}
// Fall back to libc's fopen for modes not supported by ReadAheadFile
if (!strchr(mode, 'r') || strchr(mode, '+')) {
return fopen(filename, mode);
}
int fd = -1;
#if defined(XP_WIN)
// filename is obtained via the nsIFile::nativePath attribute, so
// it is using the Windows ANSI code page, NOT UTF-8!
nsAutoString utf16Filename;
nsresult rv =
NS_CopyNativeToUnicode(nsDependentCString(filename), utf16Filename);
if (NS_FAILED(rv)) {
return nullptr;
}
HANDLE handle = INVALID_HANDLE_VALUE;
mozilla::ReadAheadFile(utf16Filename.get(), 0, SIZE_MAX, &handle);
if (handle == INVALID_HANDLE_VALUE) {
return nullptr;
}
int flags = _O_RDONLY;
// MSVC CRT's _open_osfhandle only supports adding _O_TEXT, not _O_BINARY
if (strchr(mode, 't')) {
// Force translated mode
flags |= _O_TEXT;
}
// Import the Win32 fd into the CRT
fd = _open_osfhandle((intptr_t)handle, flags);
if (fd < 0) {
CloseHandle(handle);
return nullptr;
}
#else
mozilla::ReadAheadFile(filename, 0, SIZE_MAX, &fd);
if (fd < 0) {
return nullptr;
}
#endif /* defined(XP_WIN) */
FILE* file = fdopen(fd, mode);
if (!file) {
close(fd);
}
return file;
}
#define fopen(filename, mode) hunspell_fopen_readahead(filename, mode)
#endif /* fopen_hooks_h__ */