diff options
| author | Ulrich Drepper <drepper@redhat.com> | 1999-06-16 14:31:04 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 1999-06-16 14:31:04 +0000 |
| commit | 14a1bb6a085f0b05427c47452f762a70b8530f23 (patch) | |
| tree | 12a12075cc0e83bcd85c0e13371c4223d0761aca /db2 | |
| parent | a964e1f1efb87088ec2acfe52d9119e5244356d2 (diff) | |
| download | glibc-14a1bb6a085f0b05427c47452f762a70b8530f23.tar.gz | |
Update.
1999-06-14 Andreas Schwab <schwab@issan.cs.uni-dortmund.de>
* sysdeps/unix/sysv/linux/sys/sysmacros.h [!__GNUC__]: Use correct
word order.
* sysdeps/unix/sysv/linux/alpha/sys/sysmacros.h: New file.
* sysdeps/unix/sysv/linux/sparc/sys/sysmacros.h: New file.
1999-06-15 Andreas Schwab <schwab@issan.cs.uni-dortmund.de>
* db2/db/db.c: Restore __nss_db_open alias.
* db2/db_int.h: Use <db.h> instead of "db.h" to find header in
include.
* db2/os/os_rw.c (__os_write): Maintain const correctness.
* db2/progs/db_load/db_load.c (main): Avoid ambiguous `else'.
Diffstat (limited to 'db2')
| -rw-r--r-- | db2/db/db.c | 10 | ||||
| -rw-r--r-- | db2/db_int.h | 2 | ||||
| -rw-r--r-- | db2/os/os_rw.c | 2 | ||||
| -rw-r--r-- | db2/progs/db_load/db_load.c | 5 |
4 files changed, 15 insertions, 4 deletions
diff --git a/db2/db/db.c b/db2/db/db.c index 2b4c270324..9f79fd6178 100644 --- a/db2/db/db.c +++ b/db2/db/db.c @@ -84,6 +84,11 @@ static const char sccsid[] = "@(#)db.c 10.75 (Sleepycat) 12/3/98"; } \ } +#ifdef _LIBC +#define db_open(fname, type, flags, mode, dbenv, dbinfo, dbpp) \ + __nss_db_open(fname, type, flags, mode, dbenv, dbinfo, dbpp) +#endif + /* * db_open -- * Main library interface to the DB access methods. @@ -710,6 +715,11 @@ err: /* Close the file descriptor. */ return (ret); } +#ifdef _LIBC +# undef db_open +weak_alias (__nss_db_open, db_open) +#endif + /* * __db_close -- * Close a DB tree. diff --git a/db2/db_int.h b/db2/db_int.h index 0016240e70..4c2e794153 100644 --- a/db2/db_int.h +++ b/db2/db_int.h @@ -10,7 +10,7 @@ #ifndef _DB_INTERNAL_H_ #define _DB_INTERNAL_H_ -#include "db.h" /* Standard DB include file. */ +#include <db.h> /* Standard DB include file. */ #include "queue.h" #include "shqueue.h" diff --git a/db2/os/os_rw.c b/db2/os/os_rw.c index 38f5b9473a..e0a8163d82 100644 --- a/db2/os/os_rw.c +++ b/db2/os/os_rw.c @@ -123,7 +123,7 @@ __os_write(fd, addr, len, nwp) { size_t offset; ssize_t nw; - u_int8_t *taddr; + const u_int8_t *taddr; for (taddr = addr, offset = 0; offset < len; taddr += nw, offset += nw) diff --git a/db2/progs/db_load/db_load.c b/db2/progs/db_load/db_load.c index ca30cef342..a2426028dc 100644 --- a/db2/progs/db_load/db_load.c +++ b/db2/progs/db_load/db_load.c @@ -170,7 +170,7 @@ main(argc, argv) /* Get each key/data pair and add them to the database. */ for (recno = 1; !interrupted; ++recno) { - if (dbtype == DB_RECNO) + if (dbtype == DB_RECNO) { if (checkprint) { if (dbt_rprint(&data)) break; @@ -178,7 +178,7 @@ main(argc, argv) if (dbt_rdump(&data)) break; } - else + } else { if (checkprint) { if (dbt_rprint(&key)) break; @@ -192,6 +192,7 @@ fmt: warnx("odd number of key/data pairs"); goto err; } } + } switch (errno = dbp->put(dbp, NULL, &key, &data, db_nooverwrite)) { case 0: |