cleanup

[openldap] / servers / slapd / back-sql / util.h

diff --git a/servers/slapd/back-sql/util.h b/servers/slapd/back-sql/util.h
index 37e94aa6f791b12d61b60f3d4ca55251c1276107..5282c1ae4341ce76639464cf18fe3c9ea3b9a2da 100644 (file)
--- a/servers/slapd/back-sql/util.h
+++ b/servers/slapd/back-sql/util.h
@@ -1,51 +1,74 @@
-#ifndef __BACKSQL_UTIL_H__
-#define __BACKSQL_UTIL_H__
-
-/*
- *      Copyright 1999, Dmitry Kovalev <mit@openldap.org>, All rights reserved.
+/* $OpenLDAP$ */
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 1999-2004 The OpenLDAP Foundation.
+ * Portions Copyright 1999 Dmitry Kovalev.
+ * All rights reserved.
  *
- *      Redistribution and use in source and binary forms are permitted only
- *      as authorized by the OpenLDAP Public License.  A copy of this
- *      license is available at http://www.OpenLDAP.org/license.html or
- *      in file LICENSE in the top-level directory of the distribution.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License.
+ *
+ * A copy of this license is available in the file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * <http://www.OpenLDAP.org/license.html>.
+ */
+/* ACKNOWLEDGEMENTS:
+ * This work was initially developed by Dmitry Kovalev for inclusion
+ * by OpenLDAP Software.
  */
 
+#ifndef __BACKSQL_UTIL_H__
+#define __BACKSQL_UTIL_H__
+
 
 #include "entry-id.h"
 #include "schema-map.h"
 
 #define BACKSQL_CONCAT
 
-struct berval * backsql_strcat( struct berval *dest, ber_len_t *buflen, ... );
-struct berval * backsql_strfcat( struct berval *dest, ber_len_t *buflen,
-               const char *fmt, ... );
+typedef struct berbuf {
+       struct berval   bb_val;
+       ber_len_t       bb_len;
+} BerBuffer;
+#define BB_NULL                { { 0, NULL }, 0 }
+
+struct berbuf * backsql_strcat( struct berbuf *dest, ... );
+struct berbuf * backsql_strfcat( struct berbuf *dest, const char *fmt, ... );
 
 int backsql_entry_addattr( Entry *e, struct berval *at_name, 
                struct berval *at_val, void *memctx );
 
 typedef struct backsql_srch_info {
-       struct berval           *base_dn;
-       int                     scope;
-       Filter                  *filter;
-       int                     slimit, tlimit;
-       time_t                  stoptime;
-       backsql_entryID         *id_list, *c_eid;
-       int                     n_candidates;
-       int                     abandon;
-       backsql_info            *bi;
-       backsql_oc_map_rec      *oc;
-       struct berval           sel, from, join_where, flt_where;
-       ber_len_t               sel_len, from_len, jwhere_len, fwhere_len;
-       SQLHDBC                 dbh;
-       int                     status;
-       Operation               *op;
-       AttributeName           *attrs;
+       Operation               *bsi_op;
+
        int                     bsi_flags;
 #define        BSQL_SF_ALL_OPER                0x0001
 #define BSQL_SF_FILTER_HASSUBORDINATE  0x0002
-       Entry                   *e;
-       /* 1 if the db is TimesTen; 0 if it's not */
-       int                     use_reverse_dn; 
+
+       struct berval           *bsi_base_dn;
+       int                     bsi_scope;
+       Filter                  *bsi_filter;
+       int                     bsi_slimit,
+                               bsi_tlimit;
+       time_t                  bsi_stoptime;
+
+       backsql_entryID         *bsi_id_list,
+                               *bsi_c_eid;
+       int                     bsi_n_candidates;
+       int                     bsi_abandon;
+       int                     bsi_status;
+
+       backsql_oc_map_rec      *bsi_oc;
+       struct berbuf           bsi_sel,
+                               bsi_from,
+                               bsi_join_where,
+                               bsi_flt_where;
+       ObjectClass             *bsi_filter_oc;
+       SQLHDBC                 bsi_dbh;
+       AttributeName           *bsi_attrs;
+
+       Entry                   *bsi_e;
 } backsql_srch_info;
 
 void backsql_init_search( backsql_srch_info *bsi, 
@@ -68,7 +91,7 @@ extern char
 extern char 
        backsql_check_dn_ru_query[];
 
-int backsql_merge_from_clause( struct berval *dest_from, ber_len_t *dest_len, 
+int backsql_merge_from_clause( struct berbuf *dest_from, 
                struct berval *src_from );
 
 int backsql_split_pattern( const char *pattern, BerVarray *split_pattern,