prettiness police

SCCS-vsn: lib/libc/db/btree/bt_delete.c 5.5
SCCS-vsn: lib/libc/db/btree/bt_page.c 5.2
SCCS-vsn: lib/libc/db/btree/bt_search.c 5.5
SCCS-vsn: lib/libc/db/btree/bt_debug.c 5.3
SCCS-vsn: lib/libc/db/btree/bt_stack.c 5.3
SCCS-vsn: lib/libc/db/btree/bt_overflow.c 5.6
SCCS-vsn: lib/libc/db/btree/bt_utils.c 5.7

diff --git a/usr/src/lib/libc/db/btree/bt_debug.c b/usr/src/lib/libc/db/btree/bt_debug.c
index 78a4853..2de24e5 100644 (file)
--- a/usr/src/lib/libc/db/btree/bt_debug.c
+++ b/usr/src/lib/libc/db/btree/bt_debug.c
@@ -9,14 +9,16 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)

-static char sccsid[] = "@(#)bt_debug.c 5.2 (Berkeley) %G%";
+static char sccsid[] = "@(#)bt_debug.c 5.3 (Berkeley) %G%";

 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/param.h>
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/param.h>

+

 #include <db.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <db.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>

+

 #include "btree.h"
 
 #ifdef DEBUG
 #include "btree.h"
 
 #ifdef DEBUG

diff --git a/usr/src/lib/libc/db/btree/bt_delete.c b/usr/src/lib/libc/db/btree/bt_delete.c
index 5c2d703..400d867 100644 (file)
--- a/usr/src/lib/libc/db/btree/bt_delete.c
+++ b/usr/src/lib/libc/db/btree/bt_delete.c
@@ -9,14 +9,16 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)

-static char sccsid[] = "@(#)bt_delete.c        5.4 (Berkeley) %G%";
+static char sccsid[] = "@(#)bt_delete.c        5.5 (Berkeley) %G%";

 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/types.h>
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/types.h>

-#include <errno.h>
+

 #include <db.h>
 #include <db.h>

+#include <errno.h>

 #include <stdio.h>
 #include <string.h>
 #include <stdio.h>
 #include <string.h>

+

 #include "btree.h"
 
 static int bt_bdelete __P((BTREE *, const DBT *));
 #include "btree.h"
 
 static int bt_bdelete __P((BTREE *, const DBT *));


@@ -128,7 +130,7 @@ bt_bdelete(t, key)
                dirty2 = 0;
                do {
                        if (h->pgno == cpgno && e->index == cindex) {
                dirty2 = 0;
                do {
                        if (h->pgno == cpgno && e->index == cindex) {

-                               if (NOTSET(t, BTF_DELCRSR)) {
+                               if (!ISSET(t, BTF_DELCRSR)) {

                                        SET(t, BTF_DELCRSR);
                                        deleted = 1;
                                }
                                        SET(t, BTF_DELCRSR);
                                        deleted = 1;
                                }


@@ -195,7 +197,7 @@ done1:      if (h->pgno != save.page->pgno)
                        if (__bt_cmp(t, key, e) != 0)
                                goto done2;
                        if (h->pgno == cpgno && e->index == cindex) {
                        if (__bt_cmp(t, key, e) != 0)
                                goto done2;
                        if (h->pgno == cpgno && e->index == cindex) {

-                               if (NOTSET(t, BTF_DELCRSR)) {
+                               if (!ISSET(t, BTF_DELCRSR)) {

                                        SET(t, BTF_DELCRSR);
                                        deleted = 1;
                                }
                                        SET(t, BTF_DELCRSR);
                                        deleted = 1;
                                }

diff --git a/usr/src/lib/libc/db/btree/bt_overflow.c b/usr/src/lib/libc/db/btree/bt_overflow.c
index 577bf52..349fa93 100644 (file)
--- a/usr/src/lib/libc/db/btree/bt_overflow.c
+++ b/usr/src/lib/libc/db/btree/bt_overflow.c
@@ -9,14 +9,16 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)

-static char sccsid[] = "@(#)bt_overflow.c      5.5 (Berkeley) %G%";
+static char sccsid[] = "@(#)bt_overflow.c      5.6 (Berkeley) %G%";

 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/param.h>
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/param.h>

+

 #include <db.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <db.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>

+

 #include "btree.h"
 
 /*
 #include "btree.h"
 
 /*

diff --git a/usr/src/lib/libc/db/btree/bt_page.c b/usr/src/lib/libc/db/btree/bt_page.c
index a542db6..0f949a8 100644 (file)
--- a/usr/src/lib/libc/db/btree/bt_page.c
+++ b/usr/src/lib/libc/db/btree/bt_page.c
@@ -6,10 +6,11 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)

-static char sccsid[] = "@(#)bt_page.c  5.1 (Berkeley) %G%";
+static char sccsid[] = "@(#)bt_page.c  5.2 (Berkeley) %G%";

 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/types.h>
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/types.h>

+

 #define        __DBINTERFACE_PRIVATE
 #include <db.h>
 #include <stdio.h>
 #define        __DBINTERFACE_PRIVATE
 #include <db.h>
 #include <stdio.h>

diff --git a/usr/src/lib/libc/db/btree/bt_search.c b/usr/src/lib/libc/db/btree/bt_search.c
index 97d5fd9..669f24c 100644 (file)
--- a/usr/src/lib/libc/db/btree/bt_search.c
+++ b/usr/src/lib/libc/db/btree/bt_search.c
@@ -9,12 +9,14 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)

-static char sccsid[] = "@(#)bt_search.c        5.4 (Berkeley) %G%";
+static char sccsid[] = "@(#)bt_search.c        5.5 (Berkeley) %G%";

 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/types.h>
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/types.h>

+

 #include <db.h>
 #include <stdio.h>
 #include <db.h>
 #include <stdio.h>

+

 #include "btree.h"
 
 /*
 #include "btree.h"
 
 /*

diff --git a/usr/src/lib/libc/db/btree/bt_stack.c b/usr/src/lib/libc/db/btree/bt_stack.c
index 376d464..8728f3e 100644 (file)
--- a/usr/src/lib/libc/db/btree/bt_stack.c
+++ b/usr/src/lib/libc/db/btree/bt_stack.c
@@ -9,14 +9,16 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)

-static char sccsid[] = "@(#)bt_stack.c 5.2 (Berkeley) %G%";
+static char sccsid[] = "@(#)bt_stack.c 5.3 (Berkeley) %G%";

 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/types.h>
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/types.h>

-#include <errno.h>
+

 #include <db.h>
 #include <db.h>

+#include <errno.h>

 #include <stdio.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <stdlib.h>

+

 #include "btree.h"
 
 /*
 #include "btree.h"
 
 /*

diff --git a/usr/src/lib/libc/db/btree/bt_utils.c b/usr/src/lib/libc/db/btree/bt_utils.c
index a7b769e..a0c0aa5 100644 (file)
--- a/usr/src/lib/libc/db/btree/bt_utils.c
+++ b/usr/src/lib/libc/db/btree/bt_utils.c
@@ -9,14 +9,16 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)

-static char sccsid[] = "@(#)bt_utils.c 5.6 (Berkeley) %G%";
+static char sccsid[] = "@(#)bt_utils.c 5.7 (Berkeley) %G%";

 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/param.h>
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/param.h>

+

 #include <db.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <db.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>

+

 #include "btree.h"
 
 /*
 #include "btree.h"
 
 /*