[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] gnash ChangeLog gui/fb.cpp gui/gnash.cpp libbas...
From: |
Benjamin Wolsey |
Subject: |
[Gnash-commit] gnash ChangeLog gui/fb.cpp gui/gnash.cpp libbas... |
Date: |
Tue, 27 May 2008 16:54:48 +0000 |
CVSROOT: /sources/gnash
Module name: gnash
Changes by: Benjamin Wolsey <bwy> 08/05/27 16:54:48
Modified files:
. : ChangeLog
gui : fb.cpp gnash.cpp
libbase : GC.cpp rc.cpp sharedlib.cpp
extensions/launcher: launcher.cpp
server/vm : VM.cpp
plugin : plugin.cpp
plugin/win32 : plugin.cpp
utilities : dumpshm.cpp processor.cpp soldumper.cpp
Log message:
* extensions/launcher/launcher.cpp, gui/fb.cpp, gui/gnash.cpp
libbase/GC.cpp, libbase/rc.cpp, libbase/sharedlib.cpp,
plugin/plugin.cpp, plugin/win32/plugin.cpp, server/vm/VM.cpp,
utilities/dumpshm.cpp, utilities/processor.cpp,
utilities/soldumper.cpp: use std::setlocale, and from cstdlib
std::getenv; only set locale if ENABLE_NLS is defined.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.6728&r2=1.6729
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/fb.cpp?cvsroot=gnash&r1=1.59&r2=1.60
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/gnash.cpp?cvsroot=gnash&r1=1.122&r2=1.123
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/GC.cpp?cvsroot=gnash&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/rc.cpp?cvsroot=gnash&r1=1.74&r2=1.75
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/sharedlib.cpp?cvsroot=gnash&r1=1.23&r2=1.24
http://cvs.savannah.gnu.org/viewcvs/gnash/extensions/launcher/launcher.cpp?cvsroot=gnash&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/gnash/server/vm/VM.cpp?cvsroot=gnash&r1=1.35&r2=1.36
http://cvs.savannah.gnu.org/viewcvs/gnash/plugin/plugin.cpp?cvsroot=gnash&r1=1.105&r2=1.106
http://cvs.savannah.gnu.org/viewcvs/gnash/plugin/win32/plugin.cpp?cvsroot=gnash&r1=1.17&r2=1.18
http://cvs.savannah.gnu.org/viewcvs/gnash/utilities/dumpshm.cpp?cvsroot=gnash&r1=1.28&r2=1.29
http://cvs.savannah.gnu.org/viewcvs/gnash/utilities/processor.cpp?cvsroot=gnash&r1=1.98&r2=1.99
http://cvs.savannah.gnu.org/viewcvs/gnash/utilities/soldumper.cpp?cvsroot=gnash&r1=1.6&r2=1.7
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.6728
retrieving revision 1.6729
diff -u -b -r1.6728 -r1.6729
--- ChangeLog 27 May 2008 16:45:04 -0000 1.6728
+++ ChangeLog 27 May 2008 16:54:46 -0000 1.6729
@@ -1,3 +1,12 @@
+2008-05-27 Benjamin Wolsey <address@hidden>
+
+ * extensions/launcher/launcher.cpp, gui/fb.cpp, gui/gnash.cpp
+ libbase/GC.cpp, libbase/rc.cpp, libbase/sharedlib.cpp,
+ plugin/plugin.cpp, plugin/win32/plugin.cpp, server/vm/VM.cpp,
+ utilities/dumpshm.cpp, utilities/processor.cpp,
+ utilities/soldumper.cpp: use std::setlocale, and from cstdlib
+ std::getenv; only set locale if ENABLE_NLS is defined.
+
2008-05-27 Sandro Santilli <address@hidden>
* libbase/curl_adapter.cpp (CurlStreamFile::init): add support
Index: gui/fb.cpp
===================================================================
RCS file: /sources/gnash/gnash/gui/fb.cpp,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -b -r1.59 -r1.60
--- gui/fb.cpp 7 May 2008 18:16:57 -0000 1.59
+++ gui/fb.cpp 27 May 2008 16:54:47 -0000 1.60
@@ -80,7 +80,7 @@
#include <linux/vt.h>
#include <unistd.h>
#include <csignal>
-
+#include <cstdlib> // getenv
#include "gnash.h"
#include "gui.h"
@@ -1016,7 +1016,7 @@
{
std::string dev;
- char* devname = getenv("POINTING_DEVICE");
+ char* devname = std::getenv("POINTING_DEVICE");
if (devname) dev = devname;
else dev = "/dev/input/event0";
@@ -1069,7 +1069,7 @@
if (!initialized) {
initialized=true;
- char* settings = getenv("TSCALIB");
+ char* settings = std::getenv("TSCALIB");
if (settings) {
@@ -1149,7 +1149,7 @@
bool move_pending = false; // true: notify_mouse_moved() should be called
// this is necessary for our quick'n'dirty touchscreen calibration:
- static int coordinatedebug = getenv("DUMP_RAW")!=NULL;
+ static int coordinatedebug = std::getenv("DUMP_RAW")!=NULL;
// The while loop is limited because the kernel tends to send us hundreds
// of events while the touchscreen is touched. We don't loose any
@@ -1170,7 +1170,7 @@
float cx, cy;
- if (getenv("TSCALIB")) // ONLY convert when requested
+ if (std::getenv("TSCALIB")) // ONLY convert when requested
apply_ts_calibration(&cx, &cy, mouse_x, mouse_y);
else
{ cx=mouse_x; cy=mouse_y; }
@@ -1235,7 +1235,7 @@
{
std::string dev;
- char* devname = getenv("KEYBOARD_DEVICE");
+ char* devname = std::getenv("KEYBOARD_DEVICE");
if (devname) dev = devname;
else dev = "/dev/input/event0";
Index: gui/gnash.cpp
===================================================================
RCS file: /sources/gnash/gnash/gui/gnash.cpp,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -b -r1.122 -r1.123
--- gui/gnash.cpp 23 May 2008 05:58:08 -0000 1.122
+++ gui/gnash.cpp 27 May 2008 16:54:47 -0000 1.123
@@ -433,7 +433,7 @@
// Enable native language support, i.e. internationalization
#ifdef ENABLE_NLS
- setlocale (LC_ALL, "");
+ std::setlocale (LC_ALL, "");
bindtextdomain (PACKAGE, LOCALEDIR);
textdomain (PACKAGE);
#endif
Index: libbase/GC.cpp
===================================================================
RCS file: /sources/gnash/gnash/libbase/GC.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- libbase/GC.cpp 22 Apr 2008 14:06:50 -0000 1.16
+++ libbase/GC.cpp 27 May 2008 16:54:47 -0000 1.17
@@ -28,6 +28,8 @@
#include "log.h"
#endif
+#include <cstdlib>
+
namespace gnash {
GC* GC::_singleton = NULL;
@@ -38,7 +40,7 @@
{
assert(!_singleton);
_singleton = new GC(root);
- char *gcgap = getenv("GNASH_GC_TRIGGER_THRESHOLD");
+ char *gcgap = std::getenv("GNASH_GC_TRIGGER_THRESHOLD");
if ( gcgap )
{
unsigned int gap = atoi(gcgap);
Index: libbase/rc.cpp
===================================================================
RCS file: /sources/gnash/gnash/libbase/rc.cpp,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -b -r1.74 -r1.75
--- libbase/rc.cpp 27 May 2008 07:49:46 -0000 1.74
+++ libbase/rc.cpp 27 May 2008 16:54:47 -0000 1.75
@@ -35,7 +35,7 @@
#include <unistd.h> // for getuid()
#include <sys/stat.h>
#include <limits>
-
+#include <cstdlib> // getenv
#include <string>
#include <vector>
#include <iostream>
@@ -133,7 +133,7 @@
parseFile(loadfile);
// Check the users home directory
- char *home = getenv("HOME");
+ char *home = std::getenv("HOME");
if (home) {
loadfile = home;
loadfile.append("/.gnashrc");
@@ -144,7 +144,7 @@
// TODO: keep note of the already-parsed files
// to avoid parsign multiple times ?
// (would mess up user-reguested order)
- char *gnashrc = getenv("GNASHRC");
+ char *gnashrc = std::getenv("GNASHRC");
if (gnashrc)
{
std::string paths(gnashrc);
@@ -264,7 +264,7 @@
// Initial "~" followed by "/"
if (path.substr(1,1) == "/") {
- const char *home = getenv("HOME");
+ const char *home = std::getenv("HOME");
if (home) {
// if HOME set in env, replace ~ with HOME
path.replace(0, 1, home);
@@ -577,7 +577,7 @@
// should be written first.
// If you name an important file in GNASHRC and 'save' the
// preferences, you'll obviously overwrite that file.
- char *gnashrc = getenv("GNASHRC");
+ char *gnashrc = std::getenv("GNASHRC");
if (gnashrc) {
std::string filelist(gnashrc);
@@ -598,7 +598,7 @@
else
{
// Check the users home directory
- char *home = getenv("HOME");
+ char *home = std::getenv("HOME");
if (home) {
writefile = home;
writefile.append("/.gnashrc");
Index: libbase/sharedlib.cpp
===================================================================
RCS file: /sources/gnash/gnash/libbase/sharedlib.cpp,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- libbase/sharedlib.cpp 24 Mar 2008 00:11:35 -0000 1.23
+++ libbase/sharedlib.cpp 27 May 2008 16:54:47 -0000 1.24
@@ -27,9 +27,12 @@
#include <sys/stat.h>
#include <unistd.h>
+
#include <string>
-#include <ltdl.h>
#include <iostream>
+#include <cstdlib>
+
+#include <ltdl.h>
#ifdef HAVE_DLFCN_H
#include <dlfcn.h>
#endif
@@ -108,7 +111,7 @@
// log_debug ("Initialized ltdl");
}
const char *pluginsdir = PLUGINSDIR;
- char *env = getenv ("GNASH_PLUGINS");
+ char *env = std::getenv ("GNASH_PLUGINS");
if (env != NULL)
pluginsdir = env;
Index: extensions/launcher/launcher.cpp
===================================================================
RCS file: /sources/gnash/gnash/extensions/launcher/launcher.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- extensions/launcher/launcher.cpp 7 Feb 2008 02:43:57 -0000 1.1
+++ extensions/launcher/launcher.cpp 27 May 2008 16:54:47 -0000 1.2
@@ -24,6 +24,7 @@
#include <cerrno>
#include <cstring>
#include <cassert>
+#include <cstdlib>
#include <sys/types.h>
#include <sys/stat.h>
@@ -61,7 +62,7 @@
string procname;
pid_t childpid;
- char *gnash_env = getenv("GNASH_PLAYER");
+ char *gnash_env = std::getenv("GNASH_PLAYER");
if (!gnash_env) {
procname = GNASHBINDIR;
procname += "/hildon-gnash";
Index: server/vm/VM.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/vm/VM.cpp,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -b -r1.35 -r1.36
--- server/vm/VM.cpp 21 Apr 2008 11:27:46 -0000 1.35
+++ server/vm/VM.cpp 27 May 2008 16:54:48 -0000 1.36
@@ -39,6 +39,7 @@
#include <memory>
#include <boost/random.hpp> // for random generator
+#include <cstdlib> // std::getenv
namespace {
gnash::RcInitFile& rcfile = gnash::RcInitFile::getDefaultInstance();
@@ -182,9 +183,9 @@
// This should work on most UNIX-like systems.
// Callers should work out what to do with it.
// TODO: Other OSs.
- if ((loc = getenv("LANG")) ||
- (loc = getenv("LANGUAGE")) ||
- (loc = getenv("LC_MESSAGES"))
+ if ((loc = std::getenv("LANG")) ||
+ (loc = std::getenv("LANGUAGE")) ||
+ (loc = std::getenv("LC_MESSAGES"))
)
{
std::string lang = loc;
Index: plugin/plugin.cpp
===================================================================
RCS file: /sources/gnash/gnash/plugin/plugin.cpp,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -b -r1.105 -r1.106
--- plugin/plugin.cpp 26 Apr 2008 07:58:17 -0000 1.105
+++ plugin/plugin.cpp 27 May 2008 16:54:48 -0000 1.106
@@ -20,6 +20,8 @@
#include "gnashconfig.h"
#endif
+#include <cstdlib> // getenv
+
#define MIME_TYPES_HANDLED "application/x-shockwave-flash"
// The name must be this value to get flash movies that check the
// plugin version to load.
@@ -173,7 +175,7 @@
/*
Check for environment variables.
*/
- char* opts = getenv("GNASH_OPTIONS");
+ char* opts = std::getenv("GNASH_OPTIONS");
if (opts != NULL)
{
cout << "GNASH_OPTIONS : " << opts << endl;
@@ -192,7 +194,7 @@
// and serialize back (to avoid duplicates)
std::string newGnashRc;
- char *gnashrc = getenv("GNASHRC");
+ char *gnashrc = std::getenv("GNASHRC");
if ( gnashrc )
{
newGnashRc.assign(gnashrc);
@@ -202,7 +204,7 @@
newGnashRc.append(SYSCONFDIR);
newGnashRc.append("/gnashpluginrc");
- char *home = getenv("HOME");
+ char *home = std::getenv("HOME");
if ( home )
{
newGnashRc.append(":");
@@ -744,7 +746,7 @@
nsPluginInstance::startProc(Window win)
{
string procname;
- char *gnash_env = getenv("GNASH_PLAYER");
+ char *gnash_env = std::getenv("GNASH_PLAYER");
if (gnash_env == NULL) {
procname = GNASHBINDIR;
procname += "/gtk-gnash";
@@ -1052,7 +1054,7 @@
static const char* desc = NULL;
if (!desc)
{
- desc = getenv("GNASH_PLUGIN_DESCRIPTION");
+ desc = std::getenv("GNASH_PLUGIN_DESCRIPTION");
if (desc == NULL) desc = PLUGIN_DESCRIPTION;
}
return desc;
Index: plugin/win32/plugin.cpp
===================================================================
RCS file: /sources/gnash/gnash/plugin/win32/plugin.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- plugin/win32/plugin.cpp 26 May 2008 08:39:59 -0000 1.17
+++ plugin/win32/plugin.cpp 27 May 2008 16:54:48 -0000 1.18
@@ -21,6 +21,8 @@
#include "gnashconfig.h"
#endif
+#include <cstdlib>
+
#define FLASH_MAJOR_VERSION "9"
#define FLASH_MINOR_VERSION "0"
#define FLASH_REV_NUMBER "82"
@@ -397,7 +399,7 @@
// Init logfile.
gnash::RcInitFile& rcinit = gnash::RcInitFile::getDefaultInstance();
- std::string logfilename = std::string(getenv("TEMP")) +
+ std::string logfilename = std::string(std::getenv("TEMP")) +
std::string("\\npgnash.log");
rcinit.setDebugLog(logfilename);
gnash::LogFile& dbglogfile = gnash::LogFile::getDefaultInstance();
Index: utilities/dumpshm.cpp
===================================================================
RCS file: /sources/gnash/gnash/utilities/dumpshm.cpp,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- utilities/dumpshm.cpp 5 Mar 2008 11:54:33 -0000 1.28
+++ utilities/dumpshm.cpp 27 May 2008 16:54:48 -0000 1.29
@@ -60,7 +60,7 @@
#include <cerrno>
#ifdef ENABLE_NLS
-#include <locale>
+# include <locale>
#endif
#include "log.h"
@@ -111,7 +111,7 @@
// Enable native language support, i.e. internationalization
#ifdef ENABLE_NLS
- setlocale (LC_ALL, "");
+ std::setlocale (LC_ALL, "");
bindtextdomain (PACKAGE, LOCALEDIR);
textdomain (PACKAGE);
#endif
Index: utilities/processor.cpp
===================================================================
RCS file: /sources/gnash/gnash/utilities/processor.cpp,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -b -r1.98 -r1.99
--- utilities/processor.cpp 21 May 2008 13:24:07 -0000 1.98
+++ utilities/processor.cpp 27 May 2008 16:54:48 -0000 1.99
@@ -195,7 +195,7 @@
// Enable native language support, i.e. internationalization
#ifdef ENABLE_NLS
- setlocale (LC_ALL, "");
+ std::setlocale (LC_ALL, "");
bindtextdomain (PACKAGE, LOCALEDIR);
textdomain (PACKAGE);
#endif
Index: utilities/soldumper.cpp
===================================================================
RCS file: /sources/gnash/gnash/utilities/soldumper.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- utilities/soldumper.cpp 3 Mar 2008 16:52:30 -0000 1.6
+++ utilities/soldumper.cpp 27 May 2008 16:54:48 -0000 1.7
@@ -25,6 +25,10 @@
#include <cstring>
#include <sys/stat.h>
+#ifdef ENABLE_NLS
+# include <locale>
+#endif
+
extern "C"{
#include <unistd.h>
#ifdef HAVE_GETOPT_H
@@ -67,7 +71,7 @@
// Enable native language support, i.e. internationalization
#ifdef ENABLE_NLS
- setlocale (LC_ALL, "");
+ std::setlocale (LC_ALL, "");
bindtextdomain (PACKAGE, LOCALEDIR);
textdomain (PACKAGE);
#endif
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] gnash ChangeLog gui/fb.cpp gui/gnash.cpp libbas...,
Benjamin Wolsey <=