# HG changeset patch
# User jwe
# Date 784418111 0
# Node ID 0f3237aa35b7cdae3250ca8e91b712ebaa80c64e
# Parent  3470f1e25a79b8de983df850aeec7cf90baef78d
[project @ 1994-11-09 21:49:34 by jwe]

diff --git a/src/error.cc b/src/error.cc
--- a/src/error.cc
+++ b/src/error.cc
@@ -77,6 +77,7 @@
 {
   va_list args;
   va_start (args, fmt);
+  error_state = -1;
   verror ("usage", fmt, args);
   va_end (args);
 }
@@ -107,7 +108,7 @@
   va_list args;
   va_start (args, fmt);
 
-  int len;
+  int len = 0;
   if (fmt && *fmt && fmt[(len = strlen (fmt)) - 1] == '\n')
     {
       error_state = -2;
diff --git a/src/parse.y b/src/parse.y
--- a/src/parse.y
+++ b/src/parse.y
@@ -969,7 +969,7 @@
 			    id_name = $1->name ();
 			  }
 
-			$4->stash_fcn_file_name (curr_fcn_file_name);
+			$4->stash_fcn_file_name ();
 			$4->stash_fcn_file_time (time (0));
 			$4->mark_as_system_fcn_file ();
 		      }
diff --git a/src/pt-exp-base.cc b/src/pt-exp-base.cc
--- a/src/pt-exp-base.cc
+++ b/src/pt-exp-base.cc
@@ -2529,10 +2529,10 @@
 }
 
 void
-tree_function::stash_fcn_file_name (char *s)
+tree_function::stash_fcn_file_name (void)
 {
   delete [] file_name;
-  file_name = strsave (s);
+  file_name = fcn_name ? fcn_fie_in_path (fcn_name) : 0
 }
 
 void
diff --git a/src/pt-exp-base.h b/src/pt-exp-base.h
--- a/src/pt-exp-base.h
+++ b/src/pt-exp-base.h
@@ -839,7 +839,7 @@
   tree_function *define_param_list (tree_parameter_list *t);
   tree_function *define_ret_list (tree_parameter_list *t);
 
-  void stash_fcn_file_name (char * s);
+  void stash_fcn_file_name (void);
 
   void stash_fcn_file_time (time_t t)
     { t_parsed = t; }