Ensure that the name "fips" appears in all error messages.

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.

diff --git a/execute.c b/execute.c
index 07fd30f4e26f2d282032e4702e42cdecb8ee910a..eaedbb481602db781c8120d524cc326910b0ddf9 100644 (file)
--- a/execute.c
+++ b/execute.c
@@ -86,7 +86,7 @@ get_bin_name (void *ctx)
 
        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);
        }
@@ -176,31 +176,31 @@ elf_bits (const char *program)
 
        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) {
-               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) {
-               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) {
-               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) {
-               fprintf (stderr, "getehdr on %s failed: %s\n",
+               fprintf (stderr, "fips: getehdr on %s failed: %s\n",
                         absolute_program, elf_errmsg (-1));
                exit (1);
        }
@@ -208,7 +208,7 @@ elf_bits (const char *program)
        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);
        }

diff --git a/fips.c b/fips.c
index 5aeb8c3f10740ce97313d7a9ea38de926999477a..7276ce9fb28fa24f8e41abaf5bd2fc8bbd9734b3 100644 (file)
--- a/fips.c
+++ b/fips.c
@@ -77,7 +77,7 @@ main (int argc, char *argv[])
                case '?':
                        break;
                default:
-                       fprintf(stderr, "Internal error: "
+                       fprintf(stderr, "fips: Internal error: "
                                "unexpected getopt value: %d\n", opt);
                        exit (1);
                }

diff --git a/glwrap.c b/glwrap.c
index 94966f5142487e402bb646c0d576c0e027c5bb63..f5b4f84340f249bae9cb8beb152110a688c9aaec 100644 (file)
--- a/glwrap.c
+++ b/glwrap.c
@@ -113,7 +113,7 @@ glwrap_lookup (char *name)
        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",
                         name);
                exit (1);
        }

diff --git a/metrics.c b/metrics.c
index 0c776e7ebec5cdc1fe950588688b985ac36b9895..1e2e0184e6592af840c4a69eff7247a004e49c26 100644 (file)
--- a/metrics.c
+++ b/metrics.c
@@ -179,7 +179,7 @@ metrics_op_string (metrics_op_t op)
        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);
        }