Skip to content

Commit 5586d5c

Browse files
authored
Remove internal usage of read_ function. NFC (emscripten-core#22079)
1 parent ebe6f83 commit 5586d5c

File tree

3 files changed

+9
-15
lines changed

3 files changed

+9
-15
lines changed

src/library_fs.js

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1634,20 +1634,18 @@ FS.staticInit();` +
16341634
// been loaded successfully. No-op for files that have been loaded already.
16351635
forceLoadFile(obj) {
16361636
if (obj.isDevice || obj.isFolder || obj.link || obj.contents) return true;
1637+
#if FS_DEBUG
1638+
dbg(`forceLoadFile: ${obj.url}`)
1639+
#endif
16371640
if (typeof XMLHttpRequest != 'undefined') {
16381641
throw new Error("Lazy loading should have been performed (contents set) in createLazyFile, but it was not. Lazy loading only works in web workers. Use --embed-file or --preload-file in emcc on the main thread.");
1639-
} else if (read_) {
1640-
// Command-line.
1642+
} else { // Command-line.
16411643
try {
1642-
// WARNING: Can't read binary files in V8's d8 or tracemonkey's js, as
1643-
// read() will try to parse UTF8.
1644-
obj.contents = intArrayFromString(read_(obj.url), true);
1644+
obj.contents = readBinary(obj.url);
16451645
obj.usedBytes = obj.contents.length;
16461646
} catch (e) {
16471647
throw new FS.ErrnoError({{{ cDefs.EIO }}});
16481648
}
1649-
} else {
1650-
throw new Error('Cannot load without read() or XMLHttpRequest.');
16511649
}
16521650
},
16531651
// Creates a file record for lazy-loading from a URL. XXX This requires a synchronous

src/source_map_support.js

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -102,11 +102,8 @@ if (!isDataURI(wasmSourceMapFile)) {
102102
}
103103

104104
function getSourceMap() {
105-
try {
106-
return JSON.parse(read_(wasmSourceMapFile));
107-
} catch (err) {
108-
abort(err);
109-
}
105+
var buf = readBinary(wasmSourceMapFile);
106+
return JSON.parse(UTF8ArrayToString(buf, 0, buf.length));
110107
}
111108

112109
function getSourceMapPromise() {

test/test_core.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6813,12 +6813,11 @@ def test_poppler(self):
68136813
# See https://github.com/emscripten-core/emscripten/issues/20757
68146814
self.emcc_args.append('-Wno-deprecated-declarations')
68156815
poppler = self.get_poppler_library()
6816-
pdf_data = read_binary(test_file('poppler/paper.pdf'))
6817-
create_file('paper.pdf.js', str(list(bytearray(pdf_data))))
6816+
shutil.copyfile(test_file('poppler/paper.pdf'), 'paper.pdf')
68186817

68196818
create_file('pre.js', '''
68206819
Module.preRun = () => {
6821-
FS.createDataFile('/', 'paper.pdf', eval(read_('paper.pdf.js')), true, false, false);
6820+
FS.createDataFile('/', 'paper.pdf', readBinary('paper.pdf'), true, false, false);
68226821
};
68236822
Module.postRun = () => {
68246823
var FileData = Array.from(MEMFS.getFileDataAsTypedArray(FS.root.contents['filename-1.ppm']));

0 commit comments

Comments
 (0)