ANSIfication; bug report 4.3BSD/bin/223

[unix-history] / usr / src / include / ndbm.h

diff --git a/usr/src/include/ndbm.h b/usr/src/include/ndbm.h
index 7e3f2c4..396b929 100644 (file)
--- a/usr/src/include/ndbm.h
+++ b/usr/src/include/ndbm.h
@@ -1,43 +1,62 @@
-/*      ndbm.h     4.2     83/12/20     */
+/*
+ * Copyright (c) 1983 Regents of the University of California.
+ * All rights reserved.  The Berkeley software License Agreement
+ * specifies the terms and conditions for redistribution.
+ *
+ *     @(#)ndbm.h      5.1 (Berkeley) %G%
+ */

 
 /*
 
 /*

- * (New) Hashed key data base library (-lndbm).
+ * Hashed key data base library.

  */
 #define PBLKSIZ 1024
 #define DBLKSIZ 4096
 
 typedef struct {
  */
 #define PBLKSIZ 1024
 #define DBLKSIZ 4096
 
 typedef struct {

-       int     db_dirf;                /* open directory file */
-       int     db_pagf;                /* open page file */
-       int     db_flags;
-#define _DB_RDONLY      0x1     /* data base open read-only */
-       long    db_maxbno;              /* last ``block'' in page file */
-       long    db_bitno;
-       long    db_hmask;
-       long    db_blkno;               /* current page to read/write */
-       long    db_pagbno;              /* current page in pagbuf */
-       char    db_pagbuf[PBLKSIZ];     /* page file block buffer */
-       long    db_dirbno;              /* current block in dirbuf */
-       char    db_dirbuf[DBLKSIZ];     /* directory file block buffer */
+       int     dbm_dirf;               /* open directory file */
+       int     dbm_pagf;               /* open page file */
+       int     dbm_flags;              /* flags, see below */
+       long    dbm_maxbno;             /* last ``bit'' in dir file */
+       long    dbm_bitno;              /* current bit number */
+       long    dbm_hmask;              /* hash mask */
+       long    dbm_blkptr;             /* current block for dbm_nextkey */
+       int     dbm_keyptr;             /* current key for dbm_nextkey */
+       long    dbm_blkno;              /* current page to read/write */
+       long    dbm_pagbno;             /* current page in pagbuf */
+       char    dbm_pagbuf[PBLKSIZ];    /* page file block buffer */
+       long    dbm_dirbno;             /* current block in dirbuf */
+       char    dbm_dirbuf[DBLKSIZ];    /* directory file block buffer */

 } DBM;
 
 } DBM;
 

-#define dbrdonly(db)    ((db)->db_flags&_DB_RDONLY) != 0
+#define _DBM_RDONLY    0x1     /* data base open read-only */
+#define _DBM_IOERR     0x2     /* data base I/O error */
+
+#define dbm_rdonly(db) ((db)->dbm_flags & _DBM_RDONLY)
+
+#define dbm_error(db)  ((db)->dbm_flags & _DBM_IOERR)
+       /* use this one at your own risk! */
+#define dbm_clearerr(db)       ((db)->dbm_flags &= ~_DBM_IOERR)
+
+/* for flock(2) and fstat(2) */
+#define dbm_dirfno(db) ((db)->dbm_dirf)
+#define dbm_pagfno(db) ((db)->dbm_pagf)

 
 typedef struct {
 
 typedef struct {

-       char    *dptr;
-       int     dsize;
+       char    *dptr;
+       int     dsize;

 } datum;
 
 } datum;
 

-       /* flags to dbmstore() */
-#define DB_INSERT      0
-#define DB_REPLACE     1
-
-datum   dbmfetch();
-datum   dbmfirstkey();
-datum   dbmnextkey();
-long    dbmforder();
-int     dbmdelete();
-int     dbmstore();
+/*
+ * flags to dbm_store()
+ */
+#define DBM_INSERT     0
+#define DBM_REPLACE    1

 
 

-DBM     *ndbmopen();
-void    ndbmclose();
+DBM    *dbm_open();
+void   dbm_close();
+datum  dbm_fetch();
+datum  dbm_firstkey();
+datum  dbm_nextkey();
+long   dbm_forder();
+int    dbm_delete();
+int    dbm_store();