projects
/
oweals
/
cde.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
dtprintinfo: Coverity 89561
[oweals/cde.git]
/
cde
/
programs
/
dtsearchpath
/
dtsp
/
SearchPath.C
diff --git
a/cde/programs/dtsearchpath/dtsp/SearchPath.C
b/cde/programs/dtsearchpath/dtsp/SearchPath.C
index 5e9d3f83596a2bcf26fbfbe10afd5a55f228b3b8..55334856dedac954867c2b4c58769f992614827a 100644
(file)
--- a/
cde/programs/dtsearchpath/dtsp/SearchPath.C
+++ b/
cde/programs/dtsearchpath/dtsp/SearchPath.C
@@
-16,7
+16,7
@@
* details.
*
* You should have received a copy of the GNU Lesser General Public
* details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with these librar
ar
ies and programs; if not, write
+ * License along with these libraries and programs; if not, write
* to the Free Software Foundation, Inc., 51 Franklin Street, Fifth
* Floor, Boston, MA 02110-1301 USA
*/
* to the Free Software Foundation, Inc., 51 Franklin Street, Fifth
* Floor, Boston, MA 02110-1301 USA
*/
@@
-387,7
+387,7
@@
void SearchPath::Print()
*
****************************************************************/
*
****************************************************************/
-#if defined(
linux
)
+#if defined(
__linux__) || defined(CSRG_BASED) || defined(sun
)
void SearchPath::PrettyPrint
(
std::ostream & os
void SearchPath::PrettyPrint
(
std::ostream & os
@@
-402,14
+402,14
@@
void SearchPath::PrettyPrint
CTokenizedString path (GetSearchPath(), Separator().data());
CString subpath = path.next();
while (!subpath.isNull()) {
CTokenizedString path (GetSearchPath(), Separator().data());
CString subpath = path.next();
while (!subpath.isNull()) {
-#if defined(
linux
)
+#if defined(
__linux__) || defined(CSRG_BASED) || defined(sun
)
os << " " << subpath << std::endl;
#else
os << " " << subpath << endl;
#endif
subpath = path.next();
}
os << " " << subpath << std::endl;
#else
os << " " << subpath << endl;
#endif
subpath = path.next();
}
-#if defined(
linux
)
+#if defined(
__linux__) || defined(CSRG_BASED) || defined(sun
)
os << std::endl;
#else
os << endl;
os << std::endl;
#else
os << endl;
@@
-424,7
+424,7
@@
void SearchPath::PrettyPrint
*
****************************************************************/
*
****************************************************************/
-#if defined(
linux
)
+#if defined(
__linux__) || defined(CSRG_BASED) || defined(sun
)
std::ostream & operator<<
(
std::ostream & os,
std::ostream & operator<<
(
std::ostream & os,
@@
-438,7
+438,7
@@
ostream & operator<<
)
#endif
{
)
#endif
{
-#if defined(
linux
)
+#if defined(
__linux__) || defined(CSRG_BASED) || defined(sun
)
os << sp.GetEnvVar() << "SEARCHPATH:" << std::endl;
#else
os << sp.GetEnvVar() << "SEARCHPATH:" << endl;
os << sp.GetEnvVar() << "SEARCHPATH:" << std::endl;
#else
os << sp.GetEnvVar() << "SEARCHPATH:" << endl;