[Dotgnu-pnet-commits] CVS: pnet/image meta_build.c,1.21,1.22

[Rhys Weatherley <address@hidden>]

Update of /cvsroot/dotgnu-pnet/pnet/image
In directory subversions:/tmp/cvs-serv31396/image

Modified Files:
        meta_build.c 
Log Message:


LoadTokens: report all metadata token errors, not just the first one.


Index: meta_build.c
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnet/image/meta_build.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -r1.21 -r1.22
*** meta_build.c        26 Feb 2003 00:14:30 -0000      1.21
--- meta_build.c        28 Feb 2003 00:26:28 -0000      1.22
***************
*** 52,56 ****
        ILUInt32 *nextValues;
        ILUInt32 *tempValues;
!       int error;
  
        /* How many tokens of this type are there? */
--- 52,57 ----
        ILUInt32 *nextValues;
        ILUInt32 *tempValues;
!       int error = 0;
!       int newError;
  
        /* How many tokens of this type are there? */
***************
*** 78,85 ****
                                return IL_LOADERR_BAD_META;
                        }
!                       error = (*func)(image, currValues, nextValues, token, 
userData);
!                       if(error != 0)
                        {
!                               return error;
                        }
                        tempValues = currValues;
--- 79,89 ----
                                return IL_LOADERR_BAD_META;
                        }
!                       newError = (*func)(image, currValues, nextValues, 
token, userData);
!                       if(newError != 0)
                        {
!                               if(error == 0)
!                               {
!                                       error = newError;
!                               }
                        }
                        tempValues = currValues;
***************
*** 89,96 ****
                else
                {
!                       error = (*func)(image, currValues, 0, token, userData);
!                       if(error != 0)
                        {
!                               return error;
                        }
                }
--- 93,103 ----
                else
                {
!                       newError = (*func)(image, currValues, 0, token, 
userData);
!                       if(newError != 0)
                        {
!                               if(error == 0)
!                               {
!                                       error = newError;
!                               }
                        }
                }
***************
*** 98,102 ****
  
        /* Done */
!       return 0;
  }
  
--- 105,109 ----
  
        /* Done */
!       return error;
  }