Mercurial > octave-nkf

comparison libinterp/octave.cc @ 15490:dbc6b6b18286

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
remove useless initialize_pathsearch function * octave.cc (initialize_pathsearch): Delete. (octave_initialize_interpreter): Remove call to it.
author Jordi Gutiérrez Hermoso <jordigh@octave.org>
date Fri, 05 Oct 2012 08:27:56 -0400
parents c7d7d43f26bb
children 6ea536cb7360 534b6f7108b7
comparison
equal deleted inserted replaced
15489:720a3bd76492 15490:dbc6b6b18286
41 #include "f77-fcn.h" 41 #include "f77-fcn.h"
42 #include "file-ops.h" 42 #include "file-ops.h"
43 #include "file-stat.h" 43 #include "file-stat.h"
44 #include "lo-error.h" 44 #include "lo-error.h"
45 #include "oct-env.h" 45 #include "oct-env.h"
46 #include "pathsearch.h"
47 #include "str-vec.h" 46 #include "str-vec.h"
48 47
49 #include "builtins.h" 48 #include "builtins.h"
50 #include "defaults.h" 49 #include "defaults.h"
51 #include "Cell.h" 50 #include "Cell.h"
250 while (--i > 0) 249 while (--i > 0)
251 octave_argv[i-1] = *(argv+i); 250 octave_argv[i-1] = *(argv+i);
252 } 251 }
253 } 252 }
254 253
255 static void
256 initialize_pathsearch (void)
257 {
258 // This may seem odd, but doing it this way means that we don't have
259 // to modify the kpathsea library...
260
261 std::string odb = octave_env::getenv ("OCTAVE_DB_PATH");
262
263 // For backward compatibility.
264
265 if (odb.empty ())
266 odb = octave_env::getenv ("OCTAVE_DB_DIR");
267
268 if (odb.empty ())
269 odb = Vdata_dir + file_ops::dir_sep_str () + "octave:"
270 + Vlibexec_dir + file_ops::dir_sep_str () + "octave";
271 }
272
273 DEFUN (__version_info__, args, , 254 DEFUN (__version_info__, args, ,
274 "-*- texinfo -*-\n\ 255 "-*- texinfo -*-\n\
275 @deftypefn {Built-in Function} {retval =} __version_info__ (@var{name}, @var{version}, @var{release}, @var{date})\n\ 256 @deftypefn {Built-in Function} {retval =} __version_info__ (@var{name}, @var{version}, @var{release}, @var{date})\n\
276 Undocumented internal function.\n\ 257 Undocumented internal function.\n\
277 @end deftypefn") 258 @end deftypefn")
891 872
892 initialize_error_handlers (); 873 initialize_error_handlers ();
893 874
894 initialize_default_warning_state (); 875 initialize_default_warning_state ();
895 876
896 initialize_pathsearch ();
897
898 if (! embedded) 877 if (! embedded)
899 install_signal_handlers (); 878 install_signal_handlers ();
900 else 879 else
901 quit_allowed = false; 880 quit_allowed = false;
902 881