svn commit: samba r13349 - in branches/SAMBA_4_0/source/lib: .
ldb/common ldb/include ldb/tools
idra at samba.org
idra at samba.org
Sat Feb 4 18:30:31 GMT 2006
Author: idra
Date: 2006-02-04 18:30:30 +0000 (Sat, 04 Feb 2006)
New Revision: 13349
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=13349
Log:
In the end I could not use ldb_caseless_cmp
in attrib_handler.c functions
remove it again
Simo
Modified:
branches/SAMBA_4_0/source/lib/db_wrap.c
branches/SAMBA_4_0/source/lib/ldb/common/ldb_utf8.c
branches/SAMBA_4_0/source/lib/ldb/include/ldb.h
branches/SAMBA_4_0/source/lib/ldb/include/ldb_private.h
branches/SAMBA_4_0/source/lib/ldb/tools/cmdline.c
Changeset:
Modified: branches/SAMBA_4_0/source/lib/db_wrap.c
===================================================================
--- branches/SAMBA_4_0/source/lib/db_wrap.c 2006-02-04 16:46:40 UTC (rev 13348)
+++ branches/SAMBA_4_0/source/lib/db_wrap.c 2006-02-04 18:30:30 UTC (rev 13349)
@@ -133,7 +133,7 @@
ldb_set_debug(ldb, ldb_wrap_debug, NULL);
- ldb_set_utf8_fns(ldb, NULL, wrap_caseless_cmp, wrap_casefold);
+ ldb_set_utf8_fns(ldb, NULL, wrap_casefold);
return ldb;
}
Modified: branches/SAMBA_4_0/source/lib/ldb/common/ldb_utf8.c
===================================================================
--- branches/SAMBA_4_0/source/lib/ldb/common/ldb_utf8.c 2006-02-04 16:46:40 UTC (rev 13348)
+++ branches/SAMBA_4_0/source/lib/ldb/common/ldb_utf8.c 2006-02-04 18:30:30 UTC (rev 13349)
@@ -42,13 +42,10 @@
*/
void ldb_set_utf8_fns(struct ldb_context *ldb,
void *context,
- int (*cmp)(void *, const char *, const char *),
char *(*casefold)(void *, void *, const char *))
{
if (context)
ldb->utf8_fns.context = context;
- if (cmp)
- ldb->utf8_fns.caseless_cmp = cmp;
if (casefold)
ldb->utf8_fns.casefold = casefold;
}
@@ -71,19 +68,9 @@
return ret;
}
-/*
- a caseless compare, optimised for 7 bit
- NOTE: doesn't handle UTF8
-*/
-
-int ldb_caseless_cmp_default(void *context, const char *s1, const char *s2)
-{
- return strcasecmp(s1,s2);
-}
-
void ldb_set_utf8_default(struct ldb_context *ldb)
{
- ldb_set_utf8_fns(ldb, NULL, ldb_caseless_cmp_default, ldb_casefold_default);
+ ldb_set_utf8_fns(ldb, NULL, ldb_casefold_default);
}
char *ldb_casefold(struct ldb_context *ldb, void *mem_ctx, const char *s)
@@ -91,11 +78,6 @@
return ldb->utf8_fns.casefold(ldb->utf8_fns.context, mem_ctx, s);
}
-int ldb_caseless_cmp(struct ldb_context *ldb, const char *s1, const char *s2)
-{
- return ldb->utf8_fns.caseless_cmp(ldb->utf8_fns.context, s1, s2);
-}
-
/*
check the attribute name is valid according to rfc2251
returns 1 if the name is ok
Modified: branches/SAMBA_4_0/source/lib/ldb/include/ldb.h
===================================================================
--- branches/SAMBA_4_0/source/lib/ldb/include/ldb.h 2006-02-04 16:46:40 UTC (rev 13348)
+++ branches/SAMBA_4_0/source/lib/ldb/include/ldb.h 2006-02-04 18:30:30 UTC (rev 13349)
@@ -214,7 +214,6 @@
*/
struct ldb_utf8_fns {
void *context;
- int (*caseless_cmp)(void *context, const char *s1, const char *s2);
char *(*casefold)(void *context, void *mem_ctx, const char *s);
};
@@ -749,21 +748,6 @@
char *ldb_casefold(struct ldb_context *ldb, void *mem_ctx, const char *s);
/**
- Compare two strings, without regard to case.
-
- \param ldb the ldb context
- \param s1 the first string to compare
- \param s2 the second string to compare
-
- \return 0 if the strings are the same, non-zero if there are any
- differences except for case.
-
- \note The default function is not yet UTF8 aware. Provide your own
- set of functions through ldb_set_utf8_fns()
-*/
-int ldb_caseless_cmp(struct ldb_context *ldb, const char *s1, const char *s2);
-
-/**
Check the attribute name is valid according to rfc2251
\param s tthe string to check
@@ -1118,7 +1102,6 @@
*/
void ldb_set_utf8_fns(struct ldb_context *ldb,
void *context,
- int (*cmp)(void *, const char *, const char *),
char *(*casefold)(void *, void *, const char *));
/**
Modified: branches/SAMBA_4_0/source/lib/ldb/include/ldb_private.h
===================================================================
--- branches/SAMBA_4_0/source/lib/ldb/include/ldb_private.h 2006-02-04 16:46:40 UTC (rev 13348)
+++ branches/SAMBA_4_0/source/lib/ldb/include/ldb_private.h 2006-02-04 18:30:30 UTC (rev 13349)
@@ -197,5 +197,4 @@
/* The following definitions come from lib/ldb/common/ldb_utf8.c */
char *ldb_casefold_default(void *context, void *mem_ctx, const char *s);
-int ldb_caseless_cmp_default(void *context, const char *s1, const char *s2);
#endif
Modified: branches/SAMBA_4_0/source/lib/ldb/tools/cmdline.c
===================================================================
--- branches/SAMBA_4_0/source/lib/ldb/tools/cmdline.c 2006-02-04 16:46:40 UTC (rev 13348)
+++ branches/SAMBA_4_0/source/lib/ldb/tools/cmdline.c 2006-02-04 18:30:30 UTC (rev 13349)
@@ -205,7 +205,7 @@
if (ldb_set_opaque(ldb, "credentials", cmdline_credentials)) {
goto failed;
}
- ldb_set_utf8_fns(ldb, NULL, wrap_caseless_cmp, wrap_casefold);
+ ldb_set_utf8_fns(ldb, NULL, wrap_casefold);
#endif
if (ldb_connect(ldb, ret->url, flags, ret->options) != 0) {
fprintf(stderr, "Failed to connect to %s - %s\n",
More information about the samba-cvs
mailing list