pike.git/ src/ program.c

Branch: Tag:

2000-09-05

2000-09-05 20:24:42 by Henrik Grubbström (Grubba) <grubba@grubba.org>

Fixed a few warnings.

Rev: src/program.c:1.271

5:   \*/   /**/   #include "global.h" - RCSID("$Id: program.c,v 1.270 2000/09/05 02:18:13 hubbe Exp $"); + RCSID("$Id: program.c,v 1.271 2000/09/05 20:24:42 grubba Exp $");   #include "program.h"   #include "object.h"   #include "dynamic_buffer.h"
267:    int num_used_modules,    struct svalue *modules)   { -  struct node_s *ret; -  JMP_BUF tmp; -  +     if(*module_index_cache)    {    struct svalue *tmp=low_mapping_string_lookup(*module_index_cache,ident);
283:      /* fprintf(stderr,"index_module: %s\n",ident->str); */    +  { +  JMP_BUF tmp;       if(SETJMP(tmp))    { -  ONERROR tmp; -  SET_ONERROR(tmp,exit_on_error,"Error in handle_error in master object!"); -  assign_svalue_no_free(Pike_sp++, & throw_value); +  ONERROR tmp2; +  SET_ONERROR(tmp2, exit_on_error, +  "Error in handle_error in master object!"); +  assign_svalue_no_free(Pike_sp++, &throw_value);    APPLY_MASTER("handle_error", 1);    pop_stack(); -  UNSET_ONERROR(tmp); +  UNSET_ONERROR(tmp2);    yyerror("Couldn't index module."); -  }else{ -  int e=num_used_modules; -  modules-=num_used_modules; +  } else { +  int e = num_used_modules; +  struct svalue *m = modules - num_used_modules; +     while(--e>=0)    { -  push_svalue(modules+e); +  push_svalue(m+e);    ref_push_string(ident);    f_index(2);       if(!IS_UNDEFINED(Pike_sp-1))    { -  +  struct node_s *ret; +     UNSETJMP(tmp);    if(!*module_index_cache) -  *module_index_cache=allocate_mapping(10); +  *module_index_cache = allocate_mapping(10);    mapping_string_insert(*module_index_cache, ident, Pike_sp-1); -  ret=mksvaluenode(Pike_sp-1); +  ret = mksvaluenode(Pike_sp-1);    pop_stack();    return ret;    }
316:    }    }    UNSETJMP(tmp); +  }      /* fprintf(stderr,"***Undefined.\n"); */