From 5acbf5997c1dd556a6851c474b44f295376247c9 Mon Sep 17 00:00:00 2001
From: Pierangelo Masarati <ando@openldap.org>
Date: Fri, 17 Aug 2007 09:49:17 +0000
Subject: [PATCH] re-sort funcs (and enums) in "logical" order

---
 servers/slapd/connection.c |  8 ++++----
 servers/slapd/slap.h       | 16 ++++++++--------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/servers/slapd/connection.c b/servers/slapd/connection.c
index 2899a40cda..9ec67f503a 100644
--- a/servers/slapd/connection.c
+++ b/servers/slapd/connection.c
@@ -1038,12 +1038,12 @@ void connection_done( Connection *c )
 static BI_op_func *opfun[] = {
 	do_bind,
 	do_unbind,
+	do_search,
+	do_compare,
+	do_modify,
+	do_modrdn,
 	do_add,
 	do_delete,
-	do_modrdn,
-	do_modify,
-	do_compare,
-	do_search,
 	do_abandon,
 	do_extended,
 	NULL
diff --git a/servers/slapd/slap.h b/servers/slapd/slap.h
index d1e7b99fdd..e71d8423fe 100644
--- a/servers/slapd/slap.h
+++ b/servers/slapd/slap.h
@@ -1696,9 +1696,9 @@ struct BackendDB {
 #define		be_modrdn	bd_info->bi_op_modrdn
 #define		be_search	bd_info->bi_op_search
 #define		be_abandon	bd_info->bi_op_abandon
-#define		be_cancel	bd_info->bi_op_cancel
 
 #define		be_extended	bd_info->bi_extended
+#define		be_cancel	bd_info->bi_op_cancel
 
 #define		be_chk_referrals	bd_info->bi_chk_referrals
 #define		be_chk_controls		bd_info->bi_chk_controls
@@ -2048,8 +2048,8 @@ typedef BI_op_func BI_op_modrdn;
 typedef BI_op_func BI_op_add;
 typedef BI_op_func BI_op_delete;
 typedef BI_op_func BI_op_abandon;
-typedef BI_op_func BI_op_cancel;
 typedef BI_op_func BI_op_extended;
+typedef BI_op_func BI_op_cancel;
 typedef BI_op_func BI_chk_referrals;
 typedef BI_op_func BI_chk_controls;
 typedef int (BI_entry_release_rw)
@@ -2152,10 +2152,10 @@ struct BackendInfo {
 	BI_op_add	*bi_op_add;
 	BI_op_delete	*bi_op_delete;
 	BI_op_abandon	*bi_op_abandon;
-	BI_op_cancel	*bi_op_cancel;
 
 	/* Extended Operations Helper */
 	BI_op_extended	*bi_extended;
+	BI_op_cancel	*bi_op_cancel;
 
 	/* Auxilary Functions */
 	BI_operational		*bi_operational;
@@ -2271,8 +2271,8 @@ typedef enum slap_operation_e {
 	op_add,
 	op_delete,
 	op_abandon,
-	op_cancel,
 	op_extended,
+	op_cancel,
 	op_aux_operational,
 	op_aux_chk_referrals,
 	op_aux_chk_controls,
@@ -2784,12 +2784,12 @@ struct slap_listener {
 typedef enum {
 	SLAP_OP_BIND = 0,
 	SLAP_OP_UNBIND,
+	SLAP_OP_SEARCH,
+	SLAP_OP_COMPARE,
+	SLAP_OP_MODIFY,
+	SLAP_OP_MODRDN,
 	SLAP_OP_ADD,
 	SLAP_OP_DELETE,
-	SLAP_OP_MODRDN,
-	SLAP_OP_MODIFY,
-	SLAP_OP_COMPARE,
-	SLAP_OP_SEARCH,
 	SLAP_OP_ABANDON,
 	SLAP_OP_EXTENDED,
 	SLAP_OP_LAST
-- 
2.39.5