[Gnash-commit] /srv/bzr/gnash/trunk r9630: Drop temporary debug logging, add ostream operator<< for event_id.

[Benjamin Wolsey]

------------------------------------------------------------
revno: 9630
committer: Benjamin Wolsey <address@hidden>
branch nick: trunk
timestamp: Thu 2008-08-21 12:08:14 +0200
message:
  Drop temporary debug logging, add ostream operator<< for event_id.
modified:
  libcore/asobj/xmlsocket.cpp
  libcore/button_character_instance.cpp
  libcore/character.cpp
  libcore/event_id.h
  libcore/movie_root.cpp
  libcore/sprite_instance.cpp
  libcore/swf/PlaceObject2Tag.cpp
  libcore/vm/action.cpp
    ------------------------------------------------------------
    revno: 9629.1.1
    committer: Benjamin Wolsey <address@hidden>
    branch nick: work
    timestamp: Thu 2008-08-21 12:06:20 +0200
    message:
      Add ostream operator<< for event_id, drop temporary debugging.
    modified:
      libcore/asobj/xmlsocket.cpp
      libcore/button_character_instance.cpp
      libcore/character.cpp
      libcore/event_id.h
      libcore/movie_root.cpp
      libcore/sprite_instance.cpp
      libcore/swf/PlaceObject2Tag.cpp
      libcore/vm/action.cpp

=== modified file 'libcore/asobj/xmlsocket.cpp'
--- a/libcore/asobj/xmlsocket.cpp       2008-08-20 14:00:11 +0000
+++ b/libcore/asobj/xmlsocket.cpp       2008-08-21 10:06:20 +0000
@@ -222,10 +222,16 @@
         processing(true);
 
         ret = read(_sockfd, buf.get(), bufSize - 1);
-        buf[ret + 1] = 0;
+        
+        if (buf[ret] != 0)
+        {
+            // We received a partial message, so bung
+            // a null-terminator on the end.
+            buf[ret + 1] = 0;
+        }
 
         char* ptr = buf.get();
-        while (ptr -buf.get() < ret )
+        while (ptr - buf.get() < ret )
         {
             msgs.push_back(ptr);
             ptr += strlen(ptr) + 1;

=== modified file 'libcore/button_character_instance.cpp'
--- a/libcore/button_character_instance.cpp     2008-08-18 23:53:04 +0000
+++ b/libcore/button_character_instance.cpp     2008-08-21 10:06:20 +0000
@@ -359,7 +359,7 @@
                // See bug #22982
 #if 0 // debugging..
                log_debug("Button %s received %s event while unloaded: ignored",
-                       getTarget(), id.get_function_name());
+                       getTarget(), id);
 #endif
                return false; 
        }
@@ -476,7 +476,7 @@
                // We dont' respond to events while unloaded
                // See bug #22982
                log_debug("Button %s received %s button event while unloaded: 
ignored",
-                       getTarget(), event.get_function_name());
+                       getTarget(), event);
                return;
        }
 
@@ -505,7 +505,7 @@
 
        default:
                //abort();      // missed a case?
-               log_error(_("Unhandled button event %s"), 
event.get_function_name());
+               log_error(_("Unhandled button event %s"), event);
                break;
        };
        
@@ -579,21 +579,21 @@
        std::auto_ptr<ExecutableCode> code ( get_event_handler(event) );
        if ( code.get() )
        {
-               //log_debug(_("Got statically-defined handler for event: %s"), 
event.get_function_name());
+               //log_debug(_("Got statically-defined handler for event: %s"), 
event);
                mr.pushAction(code, movie_root::apDOACTION);
                //code->execute();
        }
-       //else log_debug(_("No statically-defined handler for event: %s"), 
event.get_function_name());
+       //else log_debug(_("No statically-defined handler for event: %s"), 
event);
 
        // Call conventional attached method.
        boost::intrusive_ptr<as_function> method = 
getUserDefinedEventHandler(event.get_function_key());
        if ( method )
        {
-               //log_debug(_("Got user-defined handler for event: %s"), 
event.get_function_name());
+               //log_debug(_("Got user-defined handler for event: %s"), event);
                mr.pushAction(method, this, movie_root::apDOACTION);
                //call_method0(as_value(method.get()), &(get_environment()), 
this);
        }
-       //else log_debug(_("No statically-defined handler for event: %s"), 
event.get_function_name());
+       //else log_debug(_("No statically-defined handler for event: %s"), 
event);
 }
 
 void 

=== modified file 'libcore/character.cpp'
--- a/libcore/character.cpp     2008-08-18 23:53:04 +0000
+++ b/libcore/character.cpp     2008-08-21 10:06:20 +0000
@@ -654,7 +654,7 @@
 {
        _event_handlers[id].push_back(&code);
 
-       //log_debug(_("Setting handler for event %s"), 
id.get_function_name().c_str());
+       //log_debug(_("Setting handler for event %s"), id);
 
        // Set the character as a listener iff the
        // kind of event is a KEY or MOUSE one 

=== modified file 'libcore/event_id.h'
--- a/libcore/event_id.h        2008-08-19 20:37:40 +0000
+++ b/libcore/event_id.h        2008-08-21 10:06:20 +0000
@@ -172,6 +172,8 @@
        id_code id() const { return m_id; }
 };
 
+std::ostream& operator<< (std::ostream& o, const event_id& ev);
+
 }      // end namespace gnash
 
 

=== modified file 'libcore/movie_root.cpp'
--- a/libcore/movie_root.cpp    2008-08-18 23:53:04 +0000
+++ b/libcore/movie_root.cpp    2008-08-21 10:06:20 +0000
@@ -1302,7 +1302,7 @@
 movie_root::notify_mouse_listeners(const event_id& event)
 {
        //log_debug("Notifying %d listeners about %s",
-       //              m_mouse_listeners.size(), event.get_function_name());
+       //              m_mouse_listeners.size(), event);
 
        CharacterList copy = m_mouse_listeners;
        for (CharacterList::iterator iter = copy.begin(), itEnd=copy.end();

=== modified file 'libcore/sprite_instance.cpp'
--- a/libcore/sprite_instance.cpp       2008-08-18 23:53:04 +0000
+++ b/libcore/sprite_instance.cpp       2008-08-21 10:06:20 +0000
@@ -2846,7 +2846,7 @@
   testInvariant();
 
 #ifdef GNASH_DEBUG
-  log_debug(_("Event %s invoked for sprite %s"), id.get_function_name(), 
getTarget());
+  log_debug(_("Event %s invoked for sprite %s"), id, getTarget());
 #endif
 
   // We do not execute ENTER_FRAME if unloaded
@@ -2862,7 +2862,7 @@
   {
 #ifdef GNASH_DEBUG
     log_debug(_("Sprite %s ignored button-like event %s as not 'enabled'"),
-      getTarget(), id.get_function_name());
+      getTarget(), id);
 #endif
     return false;
   }

=== modified file 'libcore/swf/PlaceObject2Tag.cpp'
--- a/libcore/swf/PlaceObject2Tag.cpp   2008-08-18 23:53:04 +0000
+++ b/libcore/swf/PlaceObject2Tag.cpp   2008-08-21 10:06:20 +0000
@@ -219,7 +219,7 @@
                     action_buffer* thisAction = _actionBuffers.back();
                     std::auto_ptr<swf_event> ev ( new 
swf_event(s_code_bits[i], *thisAction) );
                     IF_VERBOSE_PARSE (
-                    log_parse("---- actions for event %s", 
ev->event().get_function_name().c_str());
+                    log_parse("---- actions for event %s", ev->event());
                     );
     
                     if (i == 17)    // has KeyPress event

=== modified file 'libcore/vm/action.cpp'
--- a/libcore/vm/action.cpp     2008-08-19 20:37:40 +0000
+++ b/libcore/vm/action.cpp     2008-08-21 10:06:20 +0000
@@ -184,8 +184,6 @@
                NSV::PROP_ON_KILL_FOCUS         // onKillFocus
        };
 
-    log_debug("m_id: %d", m_id);
-
        assert(m_id > INVALID && m_id < EVENT_COUNT);
        return function_keys[m_id];
 }
@@ -243,6 +241,11 @@
        }
 }
 
+std::ostream& operator<< (std::ostream& o, const event_id& ev)
+{
+    return (o << ev.get_function_name());
+}
+
 } // end of namespace gnash
 
 // Local Variables: