Include progname.h instead of declaring canonical_progname.

5 files changed, 10 insertions, 76 deletions

diff --git a/tests/gtdel.c b/tests/gtdel.c
index 6826532..ff9cdb9 100644
--- a/tests/gtdel.c
+++ b/tests/gtdel.c
@@ -21,17 +21,3 @@
 #include "gdbm.h"
-
-const char *
-canonical_progname (const char *str)
-{
-  const char *p;
-
-  p = strrchr (str, '/');
-  if (p)
-    p++;
-  else
-    p = str;
-  if (strncmp (p, "lt-", 3) == 0)
-    p += 3;
-  return p;
-}
+#include "progname.h"
 
diff --git a/tests/gtdump.c b/tests/gtdump.c
index 7030cfd..927a47c 100644
--- a/tests/gtdump.c
+++ b/tests/gtdump.c
@@ -21,17 +21,3 @@
 #include "gdbm.h"
-
-const char *
-canonical_progname (const char *str)
-{
-  const char *p;
-
-  p = strrchr (str, '/');
-  if (p)
-    p++;
-  else
-    p = str;
-  if (strncmp (p, "lt-", 3) == 0)
-    p += 3;
-  return p;
-}
+#include "progname.h"
 
@@ -47,3 +33,2 @@ main (int argc, char **argv)
   int delim = '\t';
-  int data_z = 0;
   
diff --git a/tests/gtfetch.c b/tests/gtfetch.c
index e7ff542..0c254b7 100644
--- a/tests/gtfetch.c
+++ b/tests/gtfetch.c
@@ -21,2 +21,3 @@
 #include "gdbm.h"
+#include "progname.h"
 
@@ -35,17 +36,2 @@ print_key (FILE *fp, datum key, int delim)
 
-const char *
-canonical_progname (const char *str)
-{
-  const char *p;
-
-  p = strrchr (str, '/');
-  if (p)
-    p++;
-  else
-    p = str;
-  if (strncmp (p, "lt-", 3) == 0)
-    p += 3;
-  return p;
-}
-
 int
diff --git a/tests/gtload.c b/tests/gtload.c
index f75f671..550833f 100644
--- a/tests/gtload.c
+++ b/tests/gtload.c
@@ -21,17 +21,3 @@
 #include "gdbm.h"
-
-const char *
-canonical_progname (const char *str)
-{
-  const char *p;
-
-  p = strrchr (str, '/');
-  if (p)
-    p++;
-  else
-    p = str;
-  if (strncmp (p, "lt-", 3) == 0)
-    p += 3;
-  return p;
-}
+#include "progname.h"
 
@@ -102,2 +88,7 @@ main (int argc, char **argv)
   dbf = gdbm_open (dbname, block_size, mode|flags, 00664, NULL);
+  if (!dbf)
+    {
+      fprintf (stderr, "gdbm_open failed: %s\n", gdbm_strerror (gdbm_errno));
+      exit (1);
+    }
 
diff --git a/tests/gtver.c b/tests/gtver.c
index 0865666..27fc0b9 100644
--- a/tests/gtver.c
+++ b/tests/gtver.c
@@ -21,17 +21,3 @@
 #include "gdbm.h"
-
-const char *
-canonical_progname (const char *str)
-{
-  const char *p;
-
-  p = strrchr (str, '/');
-  if (p)
-    p++;
-  else
-    p = str;
-  if (strncmp (p, "lt-", 3) == 0)
-    p += 3;
-  return p;
-}
+#include "progname.h"