[ft-devel] ft_validator_run in otvalid

[Masatake YAMATO]

Hi,

ft_validator_run is defined but it not used in otvmod.c.

My patch shrinks otvmod.c 20 bytes:-P

    (* (length '("BASE" "GPOS" "GSUB" "GDEF" "JSTF"))
       (- (length "ft_setjmp( valid.jump_buffer )")
          (length "ft_validator_run( &valid )")))C-xC-e

Regards,
Masatake YAMATO

2005-07-12  Masatake YAMATO  <address@hidden>

        * src/otvalid/otvmod.c (otv_validate): Use ft_validator_run instead 
        of ft_setjmp.

*** otvmod.c.~1.2.~     2005-02-10 17:18:26.000000000 +0900
--- otvmod.c    2005-07-12 14:59:18.000000000 +0900
***************
*** 124,130 ****
      if ( base )
      {
        ft_validator_init( &valid, base, base + len_base, FT_VALIDATE_DEFAULT );
!       if ( ft_setjmp( valid.jump_buffer ) == 0 )
          otv_BASE_validate( base, &valid );
        error = valid.error;
        if ( error )
--- 124,130 ----
      if ( base )
      {
        ft_validator_init( &valid, base, base + len_base, FT_VALIDATE_DEFAULT );
!       if ( ft_validator_run( &valid ) == 0 )
          otv_BASE_validate( base, &valid );
        error = valid.error;
        if ( error )
***************
*** 134,140 ****
      if ( gpos )
      {
        ft_validator_init( &valid, gpos, gpos + len_gpos, FT_VALIDATE_DEFAULT );
!       if (ft_setjmp( valid.jump_buffer ) == 0 )
          otv_GPOS_validate( gpos, face->num_glyphs, &valid );
        error = valid.error;
        if ( error )
--- 134,140 ----
      if ( gpos )
      {
        ft_validator_init( &valid, gpos, gpos + len_gpos, FT_VALIDATE_DEFAULT );
!       if (ft_validator_run( &valid ) == 0 )
          otv_GPOS_validate( gpos, face->num_glyphs, &valid );
        error = valid.error;
        if ( error )
***************
*** 144,150 ****
      if ( gsub )
      {
        ft_validator_init( &valid, gsub, gsub + len_gsub, FT_VALIDATE_DEFAULT );
!       if ( ft_setjmp( valid.jump_buffer ) == 0 )
          otv_GSUB_validate( gsub, face->num_glyphs, &valid );
        error = valid.error;
        if ( error )
--- 144,150 ----
      if ( gsub )
      {
        ft_validator_init( &valid, gsub, gsub + len_gsub, FT_VALIDATE_DEFAULT );
!       if ( ft_validator_run( &valid ) == 0 )
          otv_GSUB_validate( gsub, face->num_glyphs, &valid );
        error = valid.error;
        if ( error )
***************
*** 154,160 ****
      if ( gdef )
      {
        ft_validator_init( &valid, gdef, gdef + len_gdef, FT_VALIDATE_DEFAULT );
!       if ( ft_setjmp( valid.jump_buffer ) == 0 )
          otv_GDEF_validate( gdef, gsub, gpos, &valid );
        error = valid.error;
        if ( error )
--- 154,160 ----
      if ( gdef )
      {
        ft_validator_init( &valid, gdef, gdef + len_gdef, FT_VALIDATE_DEFAULT );
!       if ( ft_validator_run( &valid ) == 0 )
          otv_GDEF_validate( gdef, gsub, gpos, &valid );
        error = valid.error;
        if ( error )
***************
*** 164,170 ****
      if ( jstf )
      {
        ft_validator_init( &valid, jstf, jstf + len_jstf, FT_VALIDATE_DEFAULT );
!       if ( ft_setjmp( valid.jump_buffer ) == 0 )
          otv_JSTF_validate( jstf, gsub, gpos, face->num_glyphs, &valid );
        error = valid.error;
        if ( error )
--- 164,170 ----
      if ( jstf )
      {
        ft_validator_init( &valid, jstf, jstf + len_jstf, FT_VALIDATE_DEFAULT );
!       if ( ft_validator_run( &valid ) == 0 )
          otv_JSTF_validate( jstf, gsub, gpos, face->num_glyphs, &valid );
        error = valid.error;
        if ( error )