lib/util ucs2_align is identical, put it in common

Signed-off-by: Andrew Tridgell <tridge@samba.org>

3 files changed, 7 insertions, 14 deletions

diff --git a/lib/util/util_str.c b/lib/util/util_str.c
index f31a8c5598..7fa531f0e4 100644
--- a/lib/util/util_str.c
+++ b/lib/util/util_str.c
@@ -249,13 +249,6 @@ _PUBLIC_ bool strequal(const char *s1, const char *s2)
 	return strcasecmp(s1,s2) == 0;
 }
 
-_PUBLIC_ size_t ucs2_align(const void *base_ptr, const void *p, int flags)
-{
-	if (flags & (STR_NOALIGN|STR_ASCII))
-		return 0;
-	return PTR_DIFF(p, base_ptr) & 1;
-}
-
 /**
  String replace.
 **/
diff --git a/lib/util/util_str_common.c b/lib/util/util_str_common.c
index e003d73d74..9999ee440e 100644
--- a/lib/util/util_str_common.c
+++ b/lib/util/util_str_common.c
@@ -52,3 +52,10 @@ _PUBLIC_ int strwicmp(const char *psz1, const char *psz2)
 	}
 	return (*psz1 - *psz2);
 }
+
+_PUBLIC_ size_t ucs2_align(const void *base_ptr, const void *p, int flags)
+{
+	if (flags & (STR_NOALIGN|STR_ASCII))
+		return 0;
+	return PTR_DIFF(p, base_ptr) & 1;
+}
diff --git a/source3/lib/charcnv.c b/source3/lib/charcnv.c
index edcccc25e7..a8719070c3 100644
--- a/source3/lib/charcnv.c
+++ b/source3/lib/charcnv.c
@@ -632,13 +632,6 @@ char *strlower_talloc(TALLOC_CTX *ctx, const char *s) {
 	return talloc_strdup_lower(ctx, s);
 }
 
-size_t ucs2_align(const void *base_ptr, const void *p, int flags)
-{
-	if (flags & (STR_NOALIGN|STR_ASCII))
-		return 0;
-	return PTR_DIFF(p, base_ptr) & 1;
-}
-
 
 /**
  * Copy a string from a char* unix src to a dos codepage string destination.