| Index: native_client_sdk/src/examples/hello_nacl_io/example.js
|
| diff --git a/native_client_sdk/src/examples/hello_nacl_io/example.js b/native_client_sdk/src/examples/hello_nacl_io/example.js
|
| index c355b4d08a426a9351e8ce4ed3d7868ddad9d492..e764c21fc84df35923f867ecc4b730326ed8bc52 100644
|
| --- a/native_client_sdk/src/examples/hello_nacl_io/example.js
|
| +++ b/native_client_sdk/src/examples/hello_nacl_io/example.js
|
| @@ -78,7 +78,7 @@ function fopen_result(filename, filehandle) {
|
| filehandle_map[filehandle] = filename;
|
|
|
| addFilenameToSelectElements(filehandle, filename)
|
| - logMessage('File ' + filename + ' opened successfully.');
|
| + common.logMessage('File ' + filename + ' opened successfully.\n');
|
| }
|
|
|
| function fclose(e) {
|
| @@ -89,7 +89,7 @@ function fclose(e) {
|
| function fclose_result(filehandle) {
|
| var filename = filehandle_map[filehandle];
|
| removeFilenameFromSelectElements(filehandle, filename);
|
| - logMessage('File ' + filename + ' closed successfully.');
|
| + common.logMessage('File ' + filename + ' closed successfully.\n');
|
| }
|
|
|
| function fread(e) {
|
| @@ -100,7 +100,7 @@ function fread(e) {
|
|
|
| function fread_result(filehandle, data) {
|
| var filename = filehandle_map[filehandle];
|
| - logMessage('Read "' + data + '" from file ' + filename + '.');
|
| + common.logMessage('Read "' + data + '" from file ' + filename + '.\n');
|
| }
|
|
|
| function fwrite(e) {
|
| @@ -111,7 +111,8 @@ function fwrite(e) {
|
|
|
| function fwrite_result(filehandle, bytes_written) {
|
| var filename = filehandle_map[filehandle];
|
| - logMessage('Wrote ' + bytes_written + ' bytes to file ' + filename + '.');
|
| + common.logMessage('Wrote ' + bytes_written + ' bytes to file ' + filename +
|
| + '.\n');
|
| }
|
|
|
| function fseek(e) {
|
| @@ -123,7 +124,8 @@ function fseek(e) {
|
|
|
| function fseek_result(filehandle, filepos) {
|
| var filename = filehandle_map[filehandle];
|
| - logMessage('Seeked to location ' + filepos + ' in file ' + filename + '.');
|
| + common.logMessage('Seeked to location ' + filepos + ' in file ' + filename +
|
| + '.\n');
|
| }
|
|
|
| /**
|
| @@ -138,19 +140,6 @@ function startsWith(s, prefix) {
|
| return s.lastIndexOf(prefix, 0) === 0;
|
| }
|
|
|
| -function logMessage(msg) {
|
| - var logEl = document.getElementById('log');
|
| -
|
| - // Perform some basic escaping.
|
| - msg = msg.replace(/&/g, '&')
|
| - .replace(/</g, '<')
|
| - .replace(/>/g, '>')
|
| - .replace(/"/g, '"')
|
| - .replace(/'/g, ''');
|
| -
|
| - logEl.innerHTML += msg + '<br>';
|
| -}
|
| -
|
| function makeCall(func) {
|
| var message = func;
|
| for (var i = 1; i < arguments.length; ++i) {
|
| @@ -164,7 +153,7 @@ function makeCall(func) {
|
| function handleMessage(message_event) {
|
| var msg = message_event.data;
|
| if (startsWith(msg, 'Error:')) {
|
| - logMessage(msg);
|
| + common.logMessage(msg + '\n');
|
| } else {
|
| // Result from a function call.
|
| var params = msg.split('\1');
|
| @@ -173,7 +162,7 @@ function handleMessage(message_event) {
|
| var result_func = window[func_result_name];
|
|
|
| if (!result_func) {
|
| - logMessage('Error: Bad message received from NaCl module.');
|
| + common.logMessage('Error: Bad message received from NaCl module.\n');
|
| return;
|
| }
|
|
|
|
|