[NaCl SDK] Cleanup examples.

native_client_sdk/src/examples/tutorial/dlopen/dlopen.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.
 
 /// @file

[noelallen1, 2013/05/07 19:07:29]

@file?  Didn't you get rid of these?

[binji, 2013/05/07 20:37:35]

Done.

 /// This example demonstrates building a dynamic library which is loaded by the
 /// NaCl module.  To load the NaCl module, the browser first looks for the
 /// CreateModule() factory method (at the end of this file).  It calls
 /// CreateModule() once to load the module code from your .nexe.  After the
 /// .nexe code is loaded, CreateModule() is not called again.
 ///
 /// Once the .nexe code is loaded, the browser then calls the CreateInstance()
 /// method on the object returned by CreateModule().  If the CreateInstance
 /// returns successfully, then Init function is called, which will load the
 /// shared object on a worker thread.  We use a worker because dlopen is
@@ skipping 17 matching lines @@
 #if defined(NACL_SDK_DEBUG)
 #define CONFIG_NAME "Debug"
 #else
 #define CONFIG_NAME "Release"
 #endif
 
 #define XSTRINGIFY(x) STRINGIFY(x)
 #define STRINGIFY(x) #x
 #define NACL_ARCH_STRING XSTRINGIFY(NACL_ARCH)
 
-class DlopenInstance : public pp::Instance {
+class DlOpenInstance : public pp::Instance {
  public:
-  explicit DlopenInstance(PP_Instance instance)
+  explicit DlOpenInstance(PP_Instance instance)
       : pp::Instance(instance),
         eightball_so_(NULL),
         reverse_so_(NULL),
         eightball_(NULL),
         reverse_(NULL),
         tid_(NULL) {}
 
-  virtual ~DlopenInstance() {}
-  ;
+  virtual ~DlOpenInstance() {}
 
   // Helper function to post a message back to the JS and stdout functions.
   void logmsg(const char* pStr) {
     PostMessage(pp::Var(std::string("log:") + pStr));
     fprintf(stdout, pStr);
   }
 
   // Initialize the module, staring a worker thread to load the shared object.
   virtual bool Init(uint32_t argc, const char* argn[], const char* argv[]) {
     nacl_io_init_ppapi(pp_instance(),
@@ skipping 95 matching lines @@
 
       logmsg(message.c_str());
     } else {
       std::string errormsg = "Unexpected message: ";
       errormsg += message + "\n";
       logmsg(errormsg.c_str());
     }
   }
 
   static void* LoadLibrariesOnWorker(void* pInst) {
-    DlopenInstance* inst = static_cast<DlopenInstance*>(pInst);
+    DlOpenInstance* inst = static_cast<DlOpenInstance*>(pInst);
     inst->LoadLibrary();
     return NULL;
   }
 
   static void LoadDoneCB(void* pInst, int32_t result) {
-    DlopenInstance* inst = static_cast<DlopenInstance*>(pInst);
+    DlOpenInstance* inst = static_cast<DlOpenInstance*>(pInst);
     inst->UseLibrary();
   }
 
  private:
   void* eightball_so_;
   void* reverse_so_;
   TYPE_eightball eightball_;
   TYPE_reverse reverse_;
   pthread_t tid_;
 };
 
-// The Module class.  The browser calls the CreateInstance() method to create
-// an instance of your NaCl module on the web page.  The browser creates a new
-// instance for each <embed> tag with type="application/x-nacl".
-class dlOpenModule : public pp::Module {
+class DlOpenModule : public pp::Module {
  public:
-  dlOpenModule() : pp::Module() {}
-  virtual ~dlOpenModule() {}
+  DlOpenModule() : pp::Module() {}
+  virtual ~DlOpenModule() {}
 
-  // Create and return a DlopenInstance object.
+  // Create and return a DlOpenInstance object.
   virtual pp::Instance* CreateInstance(PP_Instance instance) {
-    return new DlopenInstance(instance);
+    return new DlOpenInstance(instance);
   }
 };
 
-// Factory function called by the browser when the module is first loaded.
-// The browser keeps a singleton of this module.  It calls the
-// CreateInstance() method on the object you return to make instances.  There
-// is one instance per <embed> tag on the page.  This is the main binding
-// point for your NaCl module with the browser.
 namespace pp {
-Module* CreateModule() { return new dlOpenModule(); }
+Module* CreateModule() { return new DlOpenModule(); }
 }  // namespace pp