aboutsummaryrefslogtreecommitdiff
path: root/db
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>1999-10-09 21:56:43 +0000
committerUlrich Drepper <drepper@redhat.com>1999-10-09 21:56:43 +0000
commitc1422e5b7cdb4400f934c91bcefa3a1a96d789fb (patch)
tree7f8981b86c4ce4b5bb899f690eeb03d6645826a5 /db
parenta4a1492eb94de4f5c5ec84a5898e994fca5f317b (diff)
downloadglibc-c1422e5b7cdb4400f934c91bcefa3a1a96d789fb.tar
glibc-c1422e5b7cdb4400f934c91bcefa3a1a96d789fb.tar.gz
glibc-c1422e5b7cdb4400f934c91bcefa3a1a96d789fb.tar.bz2
glibc-c1422e5b7cdb4400f934c91bcefa3a1a96d789fb.zip
Update.
Patch by khendricks@ivey.uwo.ca [libc/1382].
Diffstat (limited to 'db')
-rw-r--r--db/db.h34
-rw-r--r--db/ndbm.h22
2 files changed, 28 insertions, 28 deletions
diff --git a/db/db.h b/db/db.h
index 8b7921f975..183501c410 100644
--- a/db/db.h
+++ b/db/db.h
@@ -117,14 +117,14 @@ typedef enum { DB_BTREE, DB_HASH, DB_RECNO } DBTYPE;
/* Access method description structure. */
typedef struct __db {
DBTYPE type; /* Underlying db type. */
- int (*close) __PMT((struct __db *));
- int (*del) __PMT((const struct __db *, const DBT *, u_int));
- int (*get) __PMT((const struct __db *, const DBT *, DBT *, u_int));
- int (*put) __PMT((const struct __db *, DBT *, const DBT *, u_int));
- int (*seq) __PMT((const struct __db *, DBT *, DBT *, u_int));
- int (*sync) __PMT((const struct __db *, u_int));
+ int (*close) (struct __db *);
+ int (*del) (const struct __db *, const DBT *, u_int);
+ int (*get) (const struct __db *, const DBT *, DBT *, u_int);
+ int (*put) (const struct __db *, DBT *, const DBT *, u_int);
+ int (*seq) (const struct __db *, DBT *, DBT *, u_int);
+ int (*sync) (const struct __db *, u_int);
void *internal; /* Access method private. */
- int (*fd) __PMT((const struct __db *));
+ int (*fd) (const struct __db *);
} DB;
#define BTREEMAGIC 0x053162
@@ -139,9 +139,9 @@ typedef struct {
int minkeypage; /* minimum keys per page */
u_int psize; /* page size */
int (*compare) /* comparison function */
- __PMT((const DBT *, const DBT *));
+ (const DBT *, const DBT *);
size_t (*prefix) /* prefix function */
- __PMT((const DBT *, const DBT *));
+ (const DBT *, const DBT *);
int lorder; /* byte order */
} BTREEINFO;
@@ -155,7 +155,7 @@ typedef struct {
u_int nelem; /* number of elements */
u_int cachesize; /* bytes to cache */
u_int32_t /* hash function */
- (*hash) __PMT((const void *, size_t));
+ (*hash) (const void *, size_t);
int lorder; /* byte order */
} HASHINFO;
@@ -170,7 +170,7 @@ typedef struct {
int lorder; /* byte order */
size_t reclen; /* record length (fixed-length records) */
u_char bval; /* delimiting byte (variable-length records */
- char *bfname; /* btree file name */
+ char *bfname; /* btree file name */
} RECNOINFO;
#ifdef __DBINTERFACE_PRIVATE
@@ -224,14 +224,14 @@ typedef struct {
#endif
__BEGIN_DECLS
-DB *__dbopen __P((const char *, int, int, DBTYPE, const void *));
-DB *dbopen __P((const char *, int, int, DBTYPE, const void *));
+DB *__dbopen (const char *, int, int, DBTYPE, const void *) __THROW;
+DB *dbopen (const char *, int, int, DBTYPE, const void *) __THROW;
#ifdef __DBINTERFACE_PRIVATE
-DB *__bt_open __P((const char *, int, int, const BTREEINFO *, int));
-DB *__hash_open __P((const char *, int, int, const HASHINFO *, int));
-DB *__rec_open __P((const char *, int, int, const RECNOINFO *, int));
-void __dbpanic __P((DB *dbp));
+DB *__bt_open (const char *, int, int, const BTREEINFO *, int) __THROW;
+DB *__hash_open (const char *, int, int, const HASHINFO *, int) __THROW;
+DB *__rec_open (const char *, int, int, const RECNOINFO *, int) __THROW;
+void __dbpanic (DB *dbp) __THROW;
#endif
__END_DECLS
diff --git a/db/ndbm.h b/db/ndbm.h
index db14dff2ed..b05aa567ad 100644
--- a/db/ndbm.h
+++ b/db/ndbm.h
@@ -63,17 +63,17 @@ typedef DB DBM;
#define dbm_pagfno(a) DBM_PAGFNO_NOT_AVAILABLE
__BEGIN_DECLS
-void dbm_close __P((DBM *));
-int dbm_delete __P((DBM *, datum));
-datum dbm_fetch __P((DBM *, datum));
-datum dbm_firstkey __P((DBM *));
-long dbm_forder __P((DBM *, datum));
-datum dbm_nextkey __P((DBM *));
-DBM *dbm_open __P((const char *, int, int));
-int dbm_store __P((DBM *, datum, datum, int));
-int dbm_dirfno __P((DBM *));
-int dbm_error __P((DBM *));
-int dbm_clearerr __P((DBM *));
+void dbm_close (DBM *);
+int dbm_delete (DBM *, datum);
+datum dbm_fetch (DBM *, datum);
+datum dbm_firstkey (DBM *);
+long dbm_forder (DBM *, datum);
+datum dbm_nextkey (DBM *);
+DBM *dbm_open (const char *, int, int);
+int dbm_store (DBM *, datum, datum, int);
+int dbm_dirfno (DBM *);
+int dbm_error (DBM *);
+int dbm_clearerr (DBM *);
__END_DECLS
#endif /* ndbm.h */