[Valgrind-developers] valgrind: r3525 - trunk/coregrind

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

Author: sewardj
Date: 2005-04-07 03:24:23 +0100 (Thu, 07 Apr 2005)
New Revision: 3525

Modified:
   trunk/coregrind/ume.c
Log:
Reword error messages in a not-quite-so-terse way.


Modified: trunk/coregrind/ume.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
--- trunk/coregrind/ume.c	2005-04-07 02:23:50 UTC (rev 3524)
+++ trunk/coregrind/ume.c	2005-04-07 02:24:23 UTC (rev 3525)
@@ -152,36 +152,38 @@
    e->fd =3D fd;
=20
    if (pread(fd, &e->e, sizeof(e->e), 0) !=3D sizeof(e->e)) {
-      fprintf(stderr, "valgrind: %s: can't read elf header: %s\n",=20
+      fprintf(stderr, "valgrind: %s: can't read ELF header: %s\n",=20
 	      filename, strerror(errno));
       return NULL;
    }
=20
    if (memcmp(&e->e.e_ident[0], ELFMAG, SELFMAG) !=3D 0) {
-      fprintf(stderr, "valgrind: %s: bad ELF magic\n", filename);
+      fprintf(stderr, "valgrind: %s: bad ELF magic number\n", filename);
       return NULL;
    }
    if (e->e.e_ident[EI_CLASS] !=3D VGA_ELF_CLASS) {
-      fprintf(stderr, "valgrind: wrong executable class (eg. 32-bit inst=
ead\n"
-                      "valgrind: of 64-bit)\n");
+      fprintf(stderr,=20
+              "valgrind: wrong ELF executable class "
+              "(eg. 32-bit instead of 64-bit)\n");
       return NULL;
    }
    if (e->e.e_ident[EI_DATA] !=3D VGA_ELF_ENDIANNESS) {
-      fprintf(stderr, "valgrind: wrong endian-ness\n");
+      fprintf(stderr, "valgrind: executable has wrong endian-ness\n");
       return NULL;
    }
    if (!(e->e.e_type =3D=3D ET_EXEC || e->e.e_type =3D=3D ET_DYN)) {
-      fprintf(stderr, "valgrind: need executable\n");
+      fprintf(stderr, "valgrind: this is not an executable\n");
       return NULL;
    }
=20
    if (e->e.e_machine !=3D VGA_ELF_MACHINE) {
-      fprintf(stderr, "valgrind: wrong architecture\n");
+      fprintf(stderr, "valgrind: executable is not for "
+                      "this architecture\n");
       return NULL;
    }
=20
    if (e->e.e_phentsize !=3D sizeof(ESZ(Phdr))) {
-      fprintf(stderr, "valgrind: sizeof Phdr wrong\n");
+      fprintf(stderr, "valgrind: sizeof ELF Phdr wrong\n");
       return NULL;
    }
=20