pike.git/ lib/ master.pike.in

2000-09-05

2000-09-05 02:17:09 by Fredrik Hübinette (Hubbe) <hubbe@hubbe.net>

• 586d1c713b36cd1d10bd4a57fe42ffb3358c388d (12 lines) (+6/-6) ^{[ Show | Annotate ]}
  Branch: 7.9

fixed duplicate variable

Rev: lib/master.pike.in:1.129
Rev: lib/modules/_Image_XPM.pmod:1.10
Rev: src/modules/call_out/test_co.pike:1.5
Rev: src/post_modules/GTK/docs.pike:1.4

1:   /* -*- Pike -*-    * -  * $Id: master.pike.in,v 1.128 2000/08/29 21:54:01 mast Exp $ +  * $Id: master.pike.in,v 1.129 2000/09/05 02:15:53 hubbe Exp $    *    * Master-file for Pike.    *
974:   {    array(string) argv=copy_value(orig_argv);    int i,debug,trace; -  object script; +     object tmp;    string a,b;    array q;
1174:       argv[0]=combine_path_with_cwd(argv[0]);    -  program tmp; +  program prog;       mixed err = catch { -  tmp=(program)argv[0]; +  prog=(program)argv[0];    };       if (err) {
1187:    }       // FIXME: Isn't the following code dead? -  if(!tmp) +  if(!prog)    {    werror("Pike: Couldn't find script to execute\n(%O)\n",argv[0]);    exit(1);    }    -  object script=tmp(); +  object script=prog();      #if constant(_debug)    if(debug) _debug(debug);