[Valgrind-developers] valgrind: r4683 - branches/ASPACEM/coregrind

[<sv...@va...>]

Author: njn
Date: 2005-09-19 21:17:07 +0100 (Mon, 19 Sep 2005)
New Revision: 4683

Log:
Fixed the cmdline* tests:
- avoid the crash for -h
- use full error strings rather than just the ENAME

Modified:
   branches/ASPACEM/coregrind/m_main.c
   branches/ASPACEM/coregrind/m_syscall.c


Modified: branches/ASPACEM/coregrind/m_main.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/ASPACEM/coregrind/m_main.c	2005-09-19 19:27:45 UTC (rev 4682=
)
+++ branches/ASPACEM/coregrind/m_main.c	2005-09-19 20:17:07 UTC (rev 4683=
)
@@ -2374,7 +2374,8 @@
      if (dseg_max_size > m8) dseg_max_size =3D m8;
      dseg_max_size =3D VG_PGROUNDUP(dseg_max_size);
=20
-     setup_client_dataseg( dseg_max_size );
+     if (!need_help)
+        setup_client_dataseg( dseg_max_size );
    }
=20
    //=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D

Modified: branches/ASPACEM/coregrind/m_syscall.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/ASPACEM/coregrind/m_syscall.c	2005-09-19 19:27:45 UTC (rev 4=
682)
+++ branches/ASPACEM/coregrind/m_syscall.c	2005-09-19 20:17:07 UTC (rev 4=
683)
@@ -227,18 +227,18 @@
 const HChar* VG_(strerror) ( UWord errnum )
 {
    switch (errnum) {
-      case VKI_EPERM:       return "EPERM";
-      case VKI_ENOENT:      return "ENOENT";
-      case VKI_ESRCH:       return "ESRCH";
-      case VKI_EINTR:       return "EINTR";
-      case VKI_EBADF:       return "EBADF";
-      case VKI_EAGAIN:      return "EAGAIN";
-      case VKI_ENOMEM:      return "ENOMEM";
-      case VKI_EACCES:      return "EACCES";
-      case VKI_EFAULT:      return "EFAULT";
-      case VKI_EEXIST:      return "EEXIST";
-      case VKI_EINVAL:      return "EINVAL";
-      case VKI_EMFILE:      return "EMFILE";
+      case VKI_EPERM:       return "Operation not permitted";
+      case VKI_ENOENT:      return "No such file or directory";
+      case VKI_ESRCH:       return "No such process";
+      case VKI_EINTR:       return "Interrupted system call";
+      case VKI_EBADF:       return "Bad file number";
+      case VKI_EAGAIN:      return "Try again";
+      case VKI_ENOMEM:      return "Out of memory";
+      case VKI_EACCES:      return "Permission denied";
+      case VKI_EFAULT:      return "Bad address";
+      case VKI_EEXIST:      return "File exists";
+      case VKI_EINVAL:      return "Invalid argument";
+      case VKI_EMFILE:      return "Too many open files";
       case VKI_ENOSYS:      return "ENOSYS";
       case VKI_ERESTARTSYS: return "ERESTARTSYS";
       default:              return "VG_(strerror): unknown error";