[Gnash-commit] gnash utilities/dumpshm.cpp ChangeLog

[Rob Savoye]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Rob Savoye <rsavoye>    07/12/31 03:53:36

Modified files:
        utilities      : dumpshm.cpp 
        .              : ChangeLog 

Log message:
                * utilities/dumpshm.cpp: Don't use ipc_perm if the __key field
                doesn't exist.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/utilities/dumpshm.cpp?cvsroot=gnash&r1=1.18&r2=1.19
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.5279&r2=1.5280

Patches:
Index: utilities/dumpshm.cpp
===================================================================
RCS file: /sources/gnash/gnash/utilities/dumpshm.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- utilities/dumpshm.cpp       30 Dec 2007 16:23:28 -0000      1.18
+++ utilities/dumpshm.cpp       31 Dec 2007 03:53:35 -0000      1.19
@@ -354,7 +354,6 @@
        return;
     }
 
-#if 0
     Listener list(reinterpret_cast<boost::uint8_t *>(shmaddr));
     vector<string>::const_iterator it;
     vector<string> *listeners = list.listListeners();
@@ -369,7 +368,6 @@
            }
         }
     }
-#endif
     
     cout << "There are " << total << " Listeners listening" << endl; 
     // If the -c convert options was specified, dump the memory segment to 
disk.
@@ -429,6 +427,7 @@
        if (shmid < 0) {
            continue;
        }
+#ifdef IPC_PERM_KEY
        if (shmseg.shm_segsz == 64528) {
            cout << "Found it! \"set LCShmKey 0x"
                 << hex << shmseg.shm_perm.IPC_PERM_KEY
@@ -438,6 +437,7 @@
            cout << "Last detached on: " << ctime(&shmseg.shm_dtime);
            return shmseg.shm_perm.__key;
        }
+#endif
     }
 #else
 #error "No supported shared memory type for this platform"

Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.5279
retrieving revision 1.5280
diff -u -b -r1.5279 -r1.5280
--- ChangeLog   31 Dec 2007 02:17:01 -0000      1.5279
+++ ChangeLog   31 Dec 2007 03:53:35 -0000      1.5280
@@ -1,5 +1,8 @@
 2007-12-30  Rob Savoye  <address@hidden>
 
+       * utilities/dumpshm.cpp: Don't use ipc_perm if the __key field
+       doesn't exist.
+
        * server/asobj/SharedObject.cpp: Handle the second argument to
        getLocal() correctly, which doesn't add either the domain nor the
        swf file name. Fixes the Shared Object part of #21377, which now