diff options
author | Sergey Poznyakoff <gray@gnu.org.ua> | 2011-08-05 11:31:20 +0000 |
---|---|---|
committer | Sergey Poznyakoff <gray@gnu.org.ua> | 2011-08-05 11:31:20 +0000 |
commit | 999b2b28f4245e7717bff024cefe87905644cfb1 (patch) | |
tree | fcc057dfd0ba79a514294c9a203dba5a9b4132a7 | |
parent | dd6eb59eb0de0e8fe0482bbc9a4acb99e302c963 (diff) | |
download | gdbm-999b2b28f4245e7717bff024cefe87905644cfb1.tar.gz gdbm-999b2b28f4245e7717bff024cefe87905644cfb1.tar.bz2 |
Include progname.h instead of declaring canonical_progname.
-rw-r--r-- | tests/gtdel.c | 16 | ||||
-rw-r--r-- | tests/gtdump.c | 17 | ||||
-rw-r--r-- | tests/gtfetch.c | 16 | ||||
-rw-r--r-- | tests/gtload.c | 21 | ||||
-rw-r--r-- | tests/gtver.c | 16 |
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 @@ -20,19 +20,5 @@ #include <string.h> #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" int diff --git a/tests/gtdump.c b/tests/gtdump.c index 7030cfd..927a47c 100644 --- a/tests/gtdump.c +++ b/tests/gtdump.c @@ -20,19 +20,5 @@ #include <string.h> #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" int @@ -46,5 +32,4 @@ main (int argc, char **argv) GDBM_FILE dbf; int delim = '\t'; - int data_z = 0; while (--argc) diff --git a/tests/gtfetch.c b/tests/gtfetch.c index e7ff542..0c254b7 100644 --- a/tests/gtfetch.c +++ b/tests/gtfetch.c @@ -20,4 +20,5 @@ #include <string.h> #include "gdbm.h" +#include "progname.h" void @@ -34,19 +35,4 @@ 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 main (int argc, char **argv) diff --git a/tests/gtload.c b/tests/gtload.c index f75f671..550833f 100644 --- a/tests/gtload.c +++ b/tests/gtload.c @@ -20,19 +20,5 @@ #include <string.h> #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" int @@ -101,4 +87,9 @@ 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); + } while (fgets (buf, sizeof buf, stdin)) diff --git a/tests/gtver.c b/tests/gtver.c index 0865666..27fc0b9 100644 --- a/tests/gtver.c +++ b/tests/gtver.c @@ -20,19 +20,5 @@ #include <string.h> #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" #define major_number(lib) ((lib) ? gdbm_version_number[0] : GDBM_VERSION_MAJOR) |