gre-ilya/fltk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Replace remaining calls of getenv() with fl_getenv().

Browse Source 
Note: don't use fl_getenv() in Fl_System_Driver and derived classes.


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.4@12563 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Albrecht Schlosser 2017-11-17 17:25:33 +00:00
parent f300e00f79
commit 853a716610
5 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/drivers/Cocoa/Fl_Cocoa_Screen_Driver.cxx
View File

@ -3,7 +3,7 @@
//
// Definition of Apple Cocoa Screen interface.
//
// Copyright 1998-2016 by Bill Spitzak and others.
// Copyright 1998-2017 by Bill Spitzak and others.
//
// This library is free software. Distribution and use rights are outlined in
// the file "COPYING" which should have been included with this file. If this
@ -228,7 +228,7 @@ void Fl_Cocoa_Screen_Driver::get_system_colors()
const char *Fl_Cocoa_Screen_Driver::get_system_scheme()
{
return getenv("FLTK_SCHEME");
return fl_getenv("FLTK_SCHEME");
}

4
src/drivers/WinAPI/Fl_WinAPI_Screen_Driver.cxx
View File

@ -3,7 +3,7 @@
//
// Definition of MSWindows Win32/64 Screen interface
//
// Copyright 1998-2016 by Bill Spitzak and others.
// Copyright 1998-2017 by Bill Spitzak and others.
//
// This library is free software. Distribution and use rights are outlined in
// the file "COPYING" which should have been included with this file. If this
@ -356,7 +356,7 @@ void Fl_WinAPI_Screen_Driver::get_system_colors()
const char *Fl_WinAPI_Screen_Driver::get_system_scheme()
{
return getenv("FLTK_SCHEME");
return fl_getenv("FLTK_SCHEME");
}

2
src/drivers/X11/Fl_X11_Screen_Driver.cxx
View File

@ -617,7 +617,7 @@ void Fl_X11_Screen_Driver::get_system_colors()
const char *Fl_X11_Screen_Driver::get_system_scheme()
{
const char *s = 0L;
if ((s = getenv("FLTK_SCHEME")) == NULL) {
if ((s = fl_getenv("FLTK_SCHEME")) == NULL) {
const char* key = 0;
if (Fl::first_window()) key = Fl::first_window()->xclass();
if (!key) key = "fltk";

6
src/drivers/X11/Fl_X11_System_Driver.cxx
View File

@ -4,7 +4,7 @@
// Definition of Posix system driver
// for the Fast Light Tool Kit (FLTK).
//
// Copyright 2010-2016 by Bill Spitzak and others.
// Copyright 2010-2017 by Bill Spitzak and others.
//
// This library is free software. Distribution and use rights are outlined in
// the file "COPYING" which should have been included with this file. If this
@ -93,7 +93,7 @@ static char *path_find(const char *program, char *filename, int filesize) {
*end; // End of filename buffer
if ((path = getenv("PATH")) == NULL) path = "/bin:/usr/bin";
if ((path = fl_getenv("PATH")) == NULL) path = "/bin:/usr/bin";
for (ptr = filename, end = filename + filesize - 1; *path; path ++) {
if (*path == ':') {
@ -401,7 +401,7 @@ char *Fl_X11_System_Driver::preference_rootnode(Fl_Preferences *prefs, Fl_Prefer
const char *e;
switch (root) {
case Fl_Preferences::USER:
if ((e = ::getenv("HOME")) != NULL) {
if ((e = getenv("HOME")) != NULL) {
strlcpy(filename, e, sizeof(filename));
if (filename[strlen(filename)-1] != '/') {

8
test/file_chooser.cxx
View File

@ -18,13 +18,11 @@
//
// Contents:
//
// main() - Create a file chooser and wait for a selection to
// be made.
// main() - Create a file chooser and wait for a selection to be made.
// close_callback() - Close the main window...
// fc_callback() - Handle choices in the file chooser...
// pdf_check() - Check for and load the first page of a PDF file.
// ps_check() - Check for and load the first page of a PostScript
// file.
// ps_check() - Check for and load the first page of a PostScript file.
// show_callback() - Show the file chooser...
//
// extra_callback() - circle extra groups (none,group1,check_button);
@ -301,7 +299,7 @@ ps_check(const char *name, // I - Name of file
if (memcmp(header, "%!", 2) != 0)
return 0;
home = getenv("HOME");
home = fl_getenv("HOME");
sprintf(preview, "%s/.preview.ppm", home ? home : "");
if (memcmp(header, "%!PS", 4) == 0) {