Mercurial > octave
comparison src/mkoctfile.in.cc @ 17898:8c33abdd2f9a
maint: Avoid using NULL in C++ code.
* qtinfo/parser.cc, profiler.cc, profiler.h, txt-eng-ft.cc,
__init_fltk__.cc, ov-fcn-handle.cc, ov-java.cc, mkoctfile.in.cc:
Avoid using NULL in C++ code.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Mon, 11 Nov 2013 01:49:57 -0500 |
parents | f2b047f9b605 |
children | ee7f66925267 |
comparison
equal
deleted
inserted
replaced
17897:185038fe7a16 | 17898:8c33abdd2f9a |
---|---|
94 | 94 |
95 static string | 95 static string |
96 get_variable (const char *name, const string& defval) | 96 get_variable (const char *name, const string& defval) |
97 { | 97 { |
98 const char *val = getenv (name); | 98 const char *val = getenv (name); |
99 if (val == NULL || val[0] == '\0') | 99 if (val && *val) |
100 return string (val); | |
101 else | |
100 return defval; | 102 return defval; |
101 else | |
102 return string (val); | |
103 } | 103 } |
104 | 104 |
105 static string | 105 static string |
106 quote_path (const string& s) | 106 quote_path (const string& s) |
107 { | 107 { |