[NaCl SDK] nacl_io: fix TTY warning messages when using naclterm/hterm.

native_client_sdk/src/libraries/ppapi_simple/ps_instance.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <errno.h>
 #include <fcntl.h>
 #include <pthread.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <sys/ioctl.h>
@@ skipping 391 matching lines @@
   assert(message.is_string());
   pthread_mutex_lock(&exit_lock_);
   pthread_cond_signal(&exit_cond_);
   pthread_mutex_unlock(&exit_lock_);
 }
 
 void PSInstance::MessageHandlerInput(const pp::Var& key,
                                      const pp::Var& message) {
   std::string key_string = key.AsString();
 
-  // Legacy support for passing TTY data as a string, rather than a array
-  // buffer. TODO(sbc): remove this in a future release.
   if (message.is_string() && key_string == tty_prefix_) {
     std::string buffer = message.AsString();
-    Warn("Passing TTY input as a string is deprected.  Please use a "
-         "JavaScript ArrayBuffer instead");
 
     // Since our message may contain null characters, we can't send it as a
     // naked C string, so we package it up in this struct before sending it
     // to the ioctl.
     struct tioc_nacl_input_string ioctl_message;
     ioctl_message.length = buffer.size();
     ioctl_message.buffer = buffer.c_str();
-    int ret =
-      ioctl(tty_fd_, TIOCNACLINPUT, &ioctl_message);
+    int ret = ioctl(tty_fd_, TIOCNACLINPUT, &ioctl_message);
     if (ret != 0 && errno != ENOTTY) {
       Error("ioctl returned unexpected error: %d.\n", ret);
     }
+    return;
   }
 
   if (!message.is_array_buffer()) {
     Error("Expected ArrayBuffer object but got: %d", message.pp_var().type);
     return;
   }
 
   const char* filename = NULL;
   if (key_string == tty_prefix_) {
     filename = "/dev/tty";
@@ skipping 85 matching lines @@
   message_handlers_[message_name] = message_handler;
 }
 
 void PSInstance::PostEvent(PSEventType type, const PP_Var& var) {
   assert(PSE_INSTANCE_HANDLEMESSAGE == type);
 
   pp::Var event(var);
   // Legacy support for passing TTY input as a string <prefix>:<payload>
   // TODO(sbc): remove this in a future release.
   if (tty_fd_ >= 0 && event.is_string()) {
-    Warn("passing TTY data using a string prefix is deprected."
-         " Use a JavaScript dictionary instead.");
     std::string message = event.AsString();
     size_t prefix_len = strlen(tty_prefix_);
     if (message.size() > prefix_len) {
       if (!strncmp(message.c_str(), tty_prefix_, prefix_len)) {
+        LOG_WARN("Passing TTY data using a string prefix is deprected. "

[binji, 2014/06/06 23:34:20]

sp: deprecated

[Sam Clegg, 2014/06/07 00:10:43]

Done.

+                 "Use a JavaScript dictionary instead.");
         MessageHandlerInput(pp::Var(message.substr(0, prefix_len)),
                             pp::Var(message.substr(prefix_len)));
         return;
       }
     }
   }
 
   // If the message is a dictionary then see if it matches one
   // of the specific handlers, then call that handler rather than
   // queuing an event.
@@ skipping 90 matching lines @@
 
 void PSInstance::Graphics3DContextLost() {
   Log("Graphics3DContextLost\n");
   PostEvent(PSE_GRAPHICS3D_GRAPHICS3DCONTEXTLOST);
 }
 
 void PSInstance::MouseLockLost() {
   Log("MouseLockLost\n");
   PostEvent(PSE_MOUSELOCK_MOUSELOCKLOST);
 }