[Gnash-commit] gnash ChangeLog gui/fb.cpp

[Benjamin Wolsey]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Benjamin Wolsey <bwy>   08/04/26 18:48:38

Modified files:
        .              : ChangeLog 
        gui            : fb.cpp 

Log message:
                * gui/fb.cpp: do it again, as getenv is not const.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.6407&r2=1.6408
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/fb.cpp?cvsroot=gnash&r1=1.56&r2=1.57

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.6407
retrieving revision 1.6408
diff -u -b -r1.6407 -r1.6408
--- ChangeLog   26 Apr 2008 17:07:36 -0000      1.6407
+++ ChangeLog   26 Apr 2008 18:48:37 -0000      1.6408
@@ -1,5 +1,9 @@
 2008-04-26 Benjamin Wolsey <address@hidden>
 
+       * gui/fb.cpp: do it again, as getenv is not const.
+
+2008-04-26 Benjamin Wolsey <address@hidden>
+
        * gui/fb.cpp: fix const char warnings.
 
 2008-04-26  Dossy Shiobara <address@hidden>

Index: gui/fb.cpp
===================================================================
RCS file: /sources/gnash/gnash/gui/fb.cpp,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -b -r1.56 -r1.57
--- gui/fb.cpp  26 Apr 2008 17:07:37 -0000      1.56
+++ gui/fb.cpp  26 Apr 2008 18:48:37 -0000      1.57
@@ -1014,19 +1014,21 @@
 #ifdef USE_INPUT_EVENTS   
 bool FBGui::init_mouse()
 {
+  std::string dev;
 
-  const char* devname = getenv("POINTING_DEVICE");
-  if (!devname) devname="/dev/input/event0";
+  char* devname = getenv("POINTING_DEVICE");
+  if (devname) dev = devname;
+  else dev = "/dev/input/event0";
 
   // Try to open mouse device, be error tolerant (FD is kept open all the time)
-  input_fd = open(devname, O_RDONLY);
+  input_fd = open(dev.c_str(), O_RDONLY);
   
   if (input_fd<0) {
-    log_debug("Could not open %s: %s", devname, strerror(errno));    
+    log_debug("Could not open %s: %s", dev.c_str(), strerror(errno));    
     return false;
   }
   
-  log_debug("Pointing device %s open", devname);
+  log_debug("Pointing device %s open", dev.c_str());
   
   if (fcntl(input_fd, F_SETFL, fcntl(input_fd, F_GETFL) | O_NONBLOCK)<0) {
     log_error("Could not set non-blocking mode for pointing device: %s", 
strerror(errno));
@@ -1229,18 +1231,21 @@
 
 bool FBGui::init_keyboard() 
 {
-  const char* devname = getenv("KEYBOARD_DEVICE");
-  if (!devname) devname="/dev/input/event0";
+  std::string dev;
+
+  char* devname = getenv("KEYBOARD_DEVICE");
+  if (devname) dev = devname;
+  else dev = "/dev/input/event0";
 
   // Try to open keyboard device, be error tolerant (FD is kept open all the 
time)
-  keyb_fd = open(devname, O_RDONLY);
+  keyb_fd = open(dev.c_str(), O_RDONLY);
   
   if (keyb_fd<0) {
-    log_debug("Could not open %s: %s", devname, strerror(errno));    
+    log_debug("Could not open %s: %s", dev.c_str(), strerror(errno));    
     return false;
   }
   
-  log_debug("Keyboard device %s open", devname);
+  log_debug("Keyboard device %s open", dev.c_str());
   
   if (fcntl(keyb_fd, F_SETFL, fcntl(keyb_fd, F_GETFL) | O_NONBLOCK)<0) {
     log_error("Could not set non-blocking mode for keyboard device: %s", 
strerror(errno));