Index: lib/dbm/include/page.h |
=================================================================== |
--- a/lib/dbm/include/page.h |
+++ b/lib/dbm/include/page.h |
@@ -8,17 +8,17 @@ |
* Redistribution and use in source and binary forms, with or without |
* modification, are permitted provided that the following conditions |
* are met: |
* 1. Redistributions of source code must retain the above copyright |
* notice, this list of conditions and the following disclaimer. |
* 2. Redistributions in binary form must reproduce the above copyright |
* notice, this list of conditions and the following disclaimer in the |
* documentation and/or other materials provided with the distribution. |
- * 3. ***REMOVED*** - see |
+ * 3. ***REMOVED*** - see |
* ftp://ftp.cs.berkeley.edu/pub/4bsd/README.Impt.License.Change |
* 4. Neither the name of the University nor the names of its contributors |
* may be used to endorse or promote products derived from this software |
* without specific prior written permission. |
* |
* THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND |
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE |
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE |
@@ -68,27 +68,25 @@ |
* where a single key/data pair fits on a page, but you can't append an |
* overflow page and later you'd have to split the key/data and handle like |
* a big pair. |
* You might as well do this up front. |
*/ |
#ifndef PAGE_H |
#define PAGE_H |
-#define PAIRSIZE(K,D) (2*sizeof(uint16) + (K)->size + (D)->size) |
-#define BIGOVERHEAD (4*sizeof(uint16)) |
-#define KEYSIZE(K) (4*sizeof(uint16) + (K)->size); |
-#define OVFLSIZE (2*sizeof(uint16)) |
-#define FREESPACE(P) ((P)[(P)[0]+1]) |
-#define OFFSET(P) ((P)[(P)[0]+2]) |
-#define PAIRFITS(P,K,D) \ |
- (((P)[2] >= REAL_KEY) && \ |
- (PAIRSIZE((K),(D)) + OVFLSIZE) <= FREESPACE((P))) |
-#define PAGE_META(N) (((N)+3) * sizeof(uint16)) |
+#define PAIRSIZE(K, D) (2 * sizeof(uint16) + (K)->size + (D)->size) |
+#define BIGOVERHEAD (4 * sizeof(uint16)) |
+#define KEYSIZE(K) (4 * sizeof(uint16) + (K)->size); |
+#define OVFLSIZE (2 * sizeof(uint16)) |
+#define FREESPACE(P) ((P)[(P)[0] + 1]) |
+#define OFFSET(P) ((P)[(P)[0] + 2]) |
+#define PAIRFITS(P, K, D) \ |
+ (((P)[2] >= REAL_KEY) && (PAIRSIZE((K), (D)) + OVFLSIZE) <= FREESPACE((P))) |
+#define PAGE_META(N) (((N) + 3) * sizeof(uint16)) |
typedef struct { |
- BUFHEAD *newp; |
- BUFHEAD *oldp; |
- BUFHEAD *nextp; |
- uint16 next_addr; |
-} SPLIT_RETURN; |
+ BUFHEAD *newp; |
+ BUFHEAD *oldp; |
+ BUFHEAD *nextp; |
+ uint16 next_addr; |
+} SPLIT_RETURN; |
#endif |
- |