With the number of wrappers potentially involved, (fips, glaze,
apitrace, etc.), sometimes it can be ambiguous which error messages
belong to which wrappers.
Ensure that fips, at least, always advertises its own name in its
error messages.
name_len = readlink (link, name, name_len - 1);
if (name_len < 0) {
name_len = readlink (link, name, name_len - 1);
if (name_len < 0) {
- fprintf (stderr, "Failed to readlink %s: %s\n", link,
+ fprintf (stderr, "fips: Error: Failed to readlink %s: %s\n", link,
strerror (errno));
exit (1);
}
strerror (errno));
exit (1);
}
fd = open (absolute_program, O_RDONLY, 0);
if (fd < 0) {
fd = open (absolute_program, O_RDONLY, 0);
if (fd < 0) {
- fprintf (stderr, "Failed to open %s: %s\n", absolute_program,
+ fprintf (stderr, "fips: Failed to open %s: %s\n", absolute_program,
strerror (errno));
exit (1);
}
if (elf_version (EV_CURRENT ) == EV_NONE) {
strerror (errno));
exit (1);
}
if (elf_version (EV_CURRENT ) == EV_NONE) {
- fprintf (stderr, "Failed to initialize elf library: %s\n",
+ fprintf (stderr, "fips: Failed to initialize elf library: %s\n",
elf_errmsg (-1));
exit (1);
}
elf = elf_begin (fd, ELF_C_READ, NULL);
if (elf == NULL) {
elf_errmsg (-1));
exit (1);
}
elf = elf_begin (fd, ELF_C_READ, NULL);
if (elf == NULL) {
- fprintf (stderr, "Call to elf_begin on %s failed: %s\n",
+ fprintf (stderr, "fips: Call to elf_begin on %s failed: %s\n",
absolute_program, elf_errmsg(-1));
exit (1);
}
if (elf_kind (elf) != ELF_K_ELF) {
absolute_program, elf_errmsg(-1));
exit (1);
}
if (elf_kind (elf) != ELF_K_ELF) {
- fprintf (stderr, "Not an ELF object: %s\n", absolute_program);
+ fprintf (stderr, "fips: Not an ELF object: %s\n", absolute_program);
exit (1);
}
if (gelf_getehdr (elf, &ehdr) == NULL) {
exit (1);
}
if (gelf_getehdr (elf, &ehdr) == NULL) {
- fprintf (stderr, "getehdr on %s failed: %s\n",
+ fprintf (stderr, "fips: getehdr on %s failed: %s\n",
absolute_program, elf_errmsg (-1));
exit (1);
}
absolute_program, elf_errmsg (-1));
exit (1);
}
class = gelf_getclass (elf);
if (class == ELFCLASSNONE) {
class = gelf_getclass (elf);
if (class == ELFCLASSNONE) {
- fprintf (stderr, "getclass on %s failed: %s\n",
+ fprintf (stderr, "fips: getclass on %s failed: %s\n",
absolute_program, elf_errmsg (-1));
exit (1);
}
absolute_program, elf_errmsg (-1));
exit (1);
}
case '?':
break;
default:
case '?':
break;
default:
- fprintf(stderr, "Internal error: "
+ fprintf(stderr, "fips: Internal error: "
"unexpected getopt value: %d\n", opt);
exit (1);
}
"unexpected getopt value: %d\n", opt);
exit (1);
}
ret = dlwrap_real_dlsym (gl_handle, name);
if (ret == NULL) {
ret = dlwrap_real_dlsym (gl_handle, name);
if (ret == NULL) {
- fprintf (stderr, "Error: glwrap_lookup failed to dlsym %s\n",
+ fprintf (stderr, "fips: Error: glwrap_lookup failed to dlsym %s\n",
case METRICS_OP_TEX_IMAGE:
return "glTexImage*(+)";
default:
case METRICS_OP_TEX_IMAGE:
return "glTexImage*(+)";
default:
- fprintf (stderr, "Internal error: "
+ fprintf (stderr, "fips: Internal error: "
"Unknown metrics op value: %d\n", op);
exit (1);
}
"Unknown metrics op value: %d\n", op);
exit (1);
}