[dotgnu-pnet-commits] pnet ChangeLog dumpasm/dump_utils.c

[Klaus Treichel]

CVSROOT:        /cvsroot/dotgnu-pnet
Module name:    pnet
Changes by:     Klaus Treichel <ktreichel>      09/05/09 11:37:25

Modified files:
        .              : ChangeLog 
        dumpasm        : dump_utils.c 

Log message:
        Dump all security items atttached to a program item instead of dumping 
only
        the first one.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/pnet/ChangeLog?cvsroot=dotgnu-pnet&r1=1.3624&r2=1.3625
http://cvs.savannah.gnu.org/viewcvs/pnet/dumpasm/dump_utils.c?cvsroot=dotgnu-pnet&r1=1.4&r2=1.5

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnet/ChangeLog,v
retrieving revision 1.3624
retrieving revision 1.3625
diff -u -b -r1.3624 -r1.3625
--- ChangeLog   9 May 2009 11:09:45 -0000       1.3624
+++ ChangeLog   9 May 2009 11:37:25 -0000       1.3625
@@ -3,6 +3,8 @@
        * codegen/cg_decls.tc (ILGenOutputAttributes): Iterate over the security
        items attached to a program item instead of dumping only the first one.
 
+       * dumpasm/dump_utils.c (ILDAsmDumpSecurity): likewise.
+
        * ilalink/link_attrs.c (_ILLinkerConvertSecurity): Iterate over the
        security items attached to a program item instead of converting only the
        first one.

Index: dumpasm/dump_utils.c
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnet/dumpasm/dump_utils.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- dumpasm/dump_utils.c        3 May 2009 12:20:35 -0000       1.4
+++ dumpasm/dump_utils.c        9 May 2009 11:37:25 -0000       1.5
@@ -129,16 +129,13 @@
                                                ILProgramItem *item, int flags)
 {
        ILDeclSecurity *security;
-       const void *blob;
-       unsigned long blobLen;
-       ILUInt16 ch;
 
        /* Get the security information, if any */
-       security = ILDeclSecurityGetFromOwner(item);
-       if(!security)
+       security = 0;
+       while((security = ILProgramItemNextDeclSecurity(item, security)) != 0)
        {
-               return;
-       }
+               const void *blob;
+               unsigned long blobLen;
 
        /* Dump the security header */
        fputs("\t.permissionset ", outstream);
@@ -160,6 +157,8 @@
        /* Dump the text version of the XML within the security blob */
        if(blob)
        {
+                       ILUInt16 ch;
+
                fputs("\t// ", outstream);
                while(blobLen >= 2)
                {
@@ -184,6 +183,7 @@
                }
                putc('\n', outstream);
        }
+       }
 }
 
 void ILDAsmDumpGenericParams(ILImage *image, FILE *outstream,