pike.git/ src/ modules/ SANE/ sane.c

2014-08-18

2014-08-18 17:17:14 by Martin Nilsson <nilsson@opera.com>

• 6a932b9300234b195c9f2804c7af5e240e3ffa92 (17 lines) (+9/-8) ^{[ Show | Annotate ]}
  Branch: 8.0

Reuse the new type pike strings where possible and easy.

61:    push_text( "name" ); push_text( d->name );    push_text( "vendor" ); push_text( d->vendor );    push_text( "model" ); push_text( d->model ); -  push_text( "type" ); push_text( d->type ); +  ref_push_string( literal_type_string ); push_text( d->type );    f_aggregate_mapping( 8 );   }   
126:    push_text( o->desc );    else    push_int( 0 ); -  push_text( "type" ); +  ref_push_string( literal_type_string );    switch( o->type )    {    case SANE_TYPE_BOOL: push_text( "boolean" ); break; -  case SANE_TYPE_INT: push_text( "int" ); break; -  case SANE_TYPE_FIXED: push_text( "float" ); break; -  case SANE_TYPE_STRING: push_text( "string" ); break; +  case SANE_TYPE_INT: ref_push_string( literal_int_string ); break; +  case SANE_TYPE_FIXED: ref_push_string( literal_float_string ); break; +  case SANE_TYPE_STRING: ref_push_string( literal_string_string ); break;    case SANE_TYPE_BUTTON: push_text( "button" ); break;    case SANE_TYPE_GROUP: push_text( "group" ); break;    }
169:    {    case SANE_CONSTRAINT_NONE: push_int( 0 ); break;    case SANE_CONSTRAINT_RANGE: -  push_text( "type" ); push_text( "range" ); +  ref_push_string( literal_type_string ); push_text( "range" );    push_text( "min" ); push_int( o->constraint.range->min );    push_text( "max" ); push_int( o->constraint.range->max );    push_text( "quant" ); push_int( o->constraint.range->quant );    f_aggregate_mapping( 8 );    break;    case SANE_CONSTRAINT_WORD_LIST: -  push_text( "type" ); +  ref_push_string( literal_type_string );    push_text( "list" );    push_text( "list" );    for( i = 0; i<o->constraint.word_list[0]; i++ )
188:    f_aggregate_mapping( 4 );    break;    case SANE_CONSTRAINT_STRING_LIST: -  push_text( "type" ); +  ref_push_string( literal_type_string );    push_text( "list" );    push_text( "list" );    for( i = 0; o->constraint.string_list[i]; i++ )