Remove internal read_ function (emscripten-core#22080)

The last internal usage of this function was removed in emscripten-core#22079.

Author: sbc100

ChangeLog.md

@@ -4,26 +4,19 @@
  * SPDX-License-Identifier: MIT
  */
 
-read_ = (filename, binary) => {
+readBinary = (filename) => {
   // We need to re-wrap `file://` strings to URLs. Normalizing isn't
   // necessary in that case, the path should already be absolute.
   filename = isFileURI(filename) ? new URL(filename) : nodePath.normalize(filename);
-  return fs.readFileSync(filename, binary ? undefined : 'utf8');
-};
-
-readBinary = (filename) => {
-  var ret = read_(filename, true);
-  if (!ret.buffer) {
-    ret = new Uint8Array(ret);
-  }
+  var ret = fs.readFileSync(filename);
 #if ASSERTIONS
   assert(ret.buffer);
 #endif
   return ret;
 };
 
 readAsync = (filename, binary = true) => {
-  // See the comment in the `read_` function.
+  // See the comment in the `readBinary` function.
   filename = isFileURI(filename) ? new URL(filename) : nodePath.normalize(filename);
   return new Promise((resolve, reject) => {
     fs.readFile(filename, binary ? undefined : 'utf8', (err, data) => {

src/node_shell_read.js

@@ -215,9 +215,7 @@ function locateFile(path) {
 }
 
 // Hooks that are implemented differently in different runtime environments.
-var read_,
-    readAsync,
-    readBinary;
+var readAsync, readBinary;
 
 #if ENVIRONMENT_MAY_BE_NODE
 if (ENVIRONMENT_IS_NODE) {
@@ -311,10 +309,6 @@ if (ENVIRONMENT_IS_SHELL) {
 #endif
 
 #if ENVIRONMENT_MAY_BE_SHELL
-  if (typeof read != 'undefined') {
-    read_ = read;
-  }
-
   readBinary = (f) => {
     if (typeof readbuffer == 'function') {
       return new Uint8Array(readbuffer(f));
@@ -492,13 +486,12 @@ assert(typeof Module['memoryInitializerPrefixURL'] == 'undefined', 'Module.memor
 assert(typeof Module['pthreadMainPrefixURL'] == 'undefined', 'Module.pthreadMainPrefixURL option was removed, use Module.locateFile instead');
 assert(typeof Module['cdInitializerPrefixURL'] == 'undefined', 'Module.cdInitializerPrefixURL option was removed, use Module.locateFile instead');
 assert(typeof Module['filePackagePrefixURL'] == 'undefined', 'Module.filePackagePrefixURL option was removed, use Module.locateFile instead');
-assert(typeof Module['read'] == 'undefined', 'Module.read option was removed (modify read_ in JS)');
+assert(typeof Module['read'] == 'undefined', 'Module.read option was removed');
 assert(typeof Module['readAsync'] == 'undefined', 'Module.readAsync option was removed (modify readAsync in JS)');
 assert(typeof Module['readBinary'] == 'undefined', 'Module.readBinary option was removed (modify readBinary in JS)');
 assert(typeof Module['setWindowTitle'] == 'undefined', 'Module.setWindowTitle option was removed (modify emscripten_set_window_title in JS)');
 assert(typeof Module['TOTAL_MEMORY'] == 'undefined', 'Module.TOTAL_MEMORY has been renamed Module.INITIAL_MEMORY');
 {{{ makeRemovedModuleAPIAssert('asm', 'wasmExports', false) }}}
-{{{ makeRemovedModuleAPIAssert('read', 'read_') }}}
 {{{ makeRemovedModuleAPIAssert('readAsync') }}}
 {{{ makeRemovedModuleAPIAssert('readBinary') }}}
 {{{ makeRemovedModuleAPIAssert('setWindowTitle') }}}

src/shell.js

@@ -4,13 +4,6 @@
  * SPDX-License-Identifier: MIT
  */
 
-  read_ = (url) => {
-    var xhr = new XMLHttpRequest();
-    xhr.open('GET', url, false);
-    xhr.send(null);
-    return xhr.responseText;
-  }
-
   if (ENVIRONMENT_IS_WORKER) {
     readBinary = (url) => {
       var xhr = new XMLHttpRequest();

src/web_or_worker_shell_read.js

@@ -1 +1 @@
-9802
+9756

test/other/metadce/test_metadce_cxx_ctors1.gzsize

@@ -1 +1 @@
-24080
+23909

test/other/metadce/test_metadce_cxx_ctors1.jssize

@@ -1 +1 @@
-9786
+9740

test/other/metadce/test_metadce_cxx_ctors2.gzsize

@@ -1 +1 @@
-24048
+23877

test/other/metadce/test_metadce_cxx_ctors2.jssize

@@ -1 +1 @@
-10884
+10838

test/other/metadce/test_metadce_cxx_except.gzsize

@@ -1 +1 @@
-27986
+27815