* fhandler_mem.cc (fhandler_dev_mem::fhandler_dev_mem): Move

	initialization of "mem_size" from here...
	(fhandler_dev_mem::open): ...to here.  Fix typo in FH_PORT case.

diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 20c7419daecd0a66fe383dff643f27a3c064b56f..c8cc30a1c89f290398b1cad2c9168078e524a3d4 100644 (file)
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,9 @@
+2004-05-07  Corinna Vinschen  <corinna@vinschen.de>
+
+       * fhandler_mem.cc (fhandler_dev_mem::fhandler_dev_mem): Move
+       initialization of "mem_size" from here...
+       (fhandler_dev_mem::open): ...to here.  Fix typo in FH_PORT case.
+
 2004-05-07  Gerd Spalink  <Gerd.Spalink@t-online.de>
 
        * fhandler_dsp.cc (fhandler_dev_dsp::Audio_out::stop): Move delete of

diff --git a/winsup/cygwin/fhandler_mem.cc b/winsup/cygwin/fhandler_mem.cc
index 1688ab064dac86b4e3874128e1584b16370cc239..64bf8e5ecfccfec72b1ea3e3f5f908544f81f41b 100644 (file)
--- a/winsup/cygwin/fhandler_mem.cc
+++ b/winsup/cygwin/fhandler_mem.cc
@@ -25,11 +25,20 @@
 fhandler_dev_mem::fhandler_dev_mem ()
   : fhandler_base ()
 {
-  /* Reading physical memory only supported on NT/W2K. */
+}
+
+fhandler_dev_mem::~fhandler_dev_mem (void)
+{
+}
+
+int
+fhandler_dev_mem::open (int flags, mode_t)
+{
   if (!wincap.has_physical_mem_access ())
     {
-      mem_size = 0;
-      return;
+      set_errno (ENOENT);
+      debug_printf ("%s is accessible under NT/W2K only", dev ().name);
+      return 0;
     }
 
   if (dev () == FH_MEM) /* /dev/mem */
@@ -53,7 +62,7 @@ fhandler_dev_mem::fhandler_dev_mem ()
       mem_size = 0;
       debug_printf ("KMemSize: %d MB", mem_size >> 20);
     }
-  else if (dev () == FH_ZERO) /* /dev/port == First 64K of /dev/mem */
+  else if (dev () == FH_PORT) /* /dev/port == First 64K of /dev/mem */
     {
       mem_size = 65536;
       debug_printf ("PortSize: 64 KB");
@@ -63,21 +72,6 @@ fhandler_dev_mem::fhandler_dev_mem ()
       mem_size = 0;
       debug_printf ("Illegal minor number!!!");
     }
-}
-
-fhandler_dev_mem::~fhandler_dev_mem (void)
-{
-}
-
-int
-fhandler_dev_mem::open (int flags, mode_t)
-{
-  if (!wincap.has_physical_mem_access ())
-    {
-      set_errno (ENOENT);
-      debug_printf ("%s is accessible under NT/W2K only", dev ().name);
-      return 0;
-    }
 
   /* Check for illegal flags. */
   if (flags & (O_APPEND | O_TRUNC | O_EXCL))