Revert below changes regarding _pinfo::cmdline.

diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 0acf18cecab68f80af644e55685c0cd183fd01db..f7f495d0e819165a1786f9e665c90655b7857a7c 100644 (file)
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,7 @@
+2003-03-08  Christopher Faylor  <cgf@redhat.com>
+
+       Revert below changes regarding _pinfo::cmdline.
+
 2003-03-08  Corinna Vinschen  <corinna@vinschen.de>
 
        * external.cc (cygwin_internal): Change n to __off64_t to match change

diff --git a/winsup/cygwin/external.cc b/winsup/cygwin/external.cc
index 113e9847545ec61d75de3ee5339e452144b9de8e..582bb2adda17443a6344046ffcc19334fdd6d330 100644 (file)
--- a/winsup/cygwin/external.cc
+++ b/winsup/cygwin/external.cc
@@ -242,7 +242,7 @@ cygwin_internal (cygwin_getinfo_types t, ...)
        }
       case CW_CMDLINE:
        {
-         __off64_t n;
+         size_t n;
          pid_t pid = va_arg (arg, pid_t);
          pinfo p (pid);
          return (DWORD) p->cmdline (n);

diff --git a/winsup/cygwin/fhandler_proc.cc b/winsup/cygwin/fhandler_proc.cc
index 6e8ced59a3bec0f4166538b46dd1e271be91d543..ebdeedd0b297a02ea3145e95c68cde81a4cd746c 100644 (file)
--- a/winsup/cygwin/fhandler_proc.cc
+++ b/winsup/cygwin/fhandler_proc.cc
@@ -367,8 +367,7 @@ fhandler_proc::fill_filebuf ()
     return true;
 }
 
-static
-__off64_t
+static __off64_t
 format_proc_meminfo (char *destbuf, size_t maxsize)
 {
   unsigned long mem_total = 0UL, mem_free = 0UL, swap_total = 0UL,
@@ -398,8 +397,7 @@ format_proc_meminfo (char *destbuf, size_t maxsize)
                                   swap_total >> 10, swap_free >> 10);
 }
 
-static
-__off64_t
+static __off64_t
 format_proc_uptime (char *destbuf, size_t maxsize)
 {
   unsigned long long uptime = 0ULL, idle_time = 0ULL;
@@ -429,8 +427,7 @@ format_proc_uptime (char *destbuf, size_t maxsize)
                          idle_time / 100, long (idle_time % 100));
 }
 
-static
-__off64_t
+static __off64_t
 format_proc_stat (char *destbuf, size_t maxsize)
 {
   unsigned long long user_time = 0ULL, kernel_time = 0ULL, idle_time = 0ULL;

diff --git a/winsup/cygwin/fhandler_process.cc b/winsup/cygwin/fhandler_process.cc
index 29789b07c9be89ba4707b9245a04f824dcd21749..c93c121b122fbc0ee750cd1df71596c999f286f5 100644 (file)
--- a/winsup/cygwin/fhandler_process.cc
+++ b/winsup/cygwin/fhandler_process.cc
@@ -300,7 +300,9 @@ fhandler_process::fill_filebuf ()
       {
        if (filebuf)
          free (filebuf);
-       filebuf = p->cmdline (filesize);
+       size_t fs;
+       filebuf = p->cmdline (fs);
+       filesize = fs;
        if (!filebuf || !*filebuf)
          filebuf = strdup ("<defunct>");
        break;
@@ -363,8 +365,7 @@ fhandler_process::fill_filebuf ()
   return true;
 }
 
-static
-__off64_t
+static __off64_t
 format_process_stat (_pinfo *p, char *destbuf, size_t maxsize)
 {
   char cmd[MAX_PATH];
@@ -499,8 +500,7 @@ format_process_stat (_pinfo *p, char *destbuf, size_t maxsize)
                          );
 }
 
-static
-__off64_t
+static __off64_t
 format_process_status (_pinfo *p, char *destbuf, size_t maxsize)
 {
   char cmd[MAX_PATH];
@@ -593,8 +593,7 @@ format_process_status (_pinfo *p, char *destbuf, size_t maxsize)
                          );
 }
 
-static
-__off64_t
+static __off64_t
 format_process_statm (_pinfo *p, char *destbuf, size_t maxsize)
 {
   unsigned long vmsize = 0UL, vmrss = 0UL, vmtext = 0UL, vmdata = 0UL,
@@ -610,8 +609,7 @@ format_process_statm (_pinfo *p, char *destbuf, size_t maxsize)
                          );
 }
 
-static
-int
+static int
 get_process_state (DWORD dwProcessId)
 {
   /*
@@ -678,8 +676,7 @@ out:
   return state;
 }
 
-static
-bool
+static bool
 get_mem_values (DWORD dwProcessId, unsigned long *vmsize, unsigned long *vmrss,
                unsigned long *vmtext, unsigned long *vmdata,
                unsigned long *vmlib, unsigned long *vmshare)

diff --git a/winsup/cygwin/pinfo.h b/winsup/cygwin/pinfo.h
index d6370bc811cd9980302ce742a823208208394410..89b683f94856e7934e52c80a1ebb2d4cb4ea2a3c 100644 (file)
--- a/winsup/cygwin/pinfo.h
+++ b/winsup/cygwin/pinfo.h
@@ -138,7 +138,7 @@ public:
   void commune_recv ();
   commune_result commune_send (DWORD);
   bool alive ();
-  char *cmdline (__off64_t &);
+  char *cmdline (size_t &);
 
   friend void __stdcall set_myself (pid_t, HANDLE);