summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2011-05-30 16:18:51 +1000
committerAndrew Bartlett <abartlet@samba.org>2011-05-31 00:32:08 +0200
commit702d8d5f87f36a6b62a8ad35af62fd0e7cb20384 (patch)
tree55e1cc5fdb18930dc4d05e64e0d7b98e743f011f /source3
parent3b7e1ac31c764fc2023925288783c868eb6ec31e (diff)
downloadsamba-702d8d5f87f36a6b62a8ad35af62fd0e7cb20384.tar.gz
samba-702d8d5f87f36a6b62a8ad35af62fd0e7cb20384.tar.bz2
samba-702d8d5f87f36a6b62a8ad35af62fd0e7cb20384.zip
s3-lib Move free_namearray() into it's own file
This makes it easier to have conn_smbd strictly depend on all it's dependencies. Andrew Bartlett
Diffstat (limited to 'source3')
-rw-r--r--source3/Makefile.in2
-rw-r--r--source3/lib/namearray.c39
-rw-r--r--source3/lib/util.c16
-rwxr-xr-xsource3/wscript_build1
4 files changed, 41 insertions, 17 deletions
diff --git a/source3/Makefile.in b/source3/Makefile.in
index eba3d8e320..7fbefda25e 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -462,7 +462,7 @@ LIB_OBJ = $(LIBSAMBAUTIL_OBJ) $(UTIL_OBJ) $(CRYPTO_OBJ) \
../lib/util/base64.o lib/util_sid.o \
../lib/util/charset/util_unistr.o \
../lib/util/charset/util_unistr_w.o ../lib/util/charset/codepoints.o ../lib/util/charset/util_str.o lib/util_file.o \
- lib/util.o lib/util_cmdline.o lib/util_names.o \
+ lib/util.o lib/namearray.o lib/util_cmdline.o lib/util_names.o \
lib/util_sock.o lib/sock_exec.o lib/util_sec.o \
lib/substitute.o lib/substitute_generic.o ../lib/util/substitute.o lib/dbwrap_util.o \
lib/ms_fnmatch.o ../lib/util/ms_fnmatch.o lib/errmap_unix.o \
diff --git a/source3/lib/namearray.c b/source3/lib/namearray.c
new file mode 100644
index 0000000000..e5c3bd983b
--- /dev/null
+++ b/source3/lib/namearray.c
@@ -0,0 +1,39 @@
+/*
+ Unix SMB/CIFS implementation.
+ Samba utility functions
+ Copyright (C) Andrew Tridgell 1992-1998
+ Copyright (C) Jeremy Allison 2001-2007
+ Copyright (C) Simo Sorce 2001
+ Copyright (C) Jim McDonough <jmcd@us.ibm.com> 2003
+ Copyright (C) James Peach 2006
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include "includes.h"
+/****************************************************************************
+ Routine to free a namearray.
+****************************************************************************/
+
+void free_namearray(name_compare_entry *name_array)
+{
+ int i;
+
+ if(name_array == NULL)
+ return;
+
+ for(i=0; name_array[i].name!=NULL; i++)
+ SAFE_FREE(name_array[i].name);
+ SAFE_FREE(name_array);
+}
diff --git a/source3/lib/util.c b/source3/lib/util.c
index ee696461c6..e8a360fd3a 100644
--- a/source3/lib/util.c
+++ b/source3/lib/util.c
@@ -1414,22 +1414,6 @@ void set_namearray(name_compare_entry **ppname_array, const char *namelist_in)
return;
}
-/****************************************************************************
- Routine to free a namearray.
-****************************************************************************/
-
-void free_namearray(name_compare_entry *name_array)
-{
- int i;
-
- if(name_array == NULL)
- return;
-
- for(i=0; name_array[i].name!=NULL; i++)
- SAFE_FREE(name_array[i].name);
- SAFE_FREE(name_array);
-}
-
#undef DBGC_CLASS
#define DBGC_CLASS DBGC_LOCKING
diff --git a/source3/wscript_build b/source3/wscript_build
index 2e281da12c..9f922e4294 100755
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -75,6 +75,7 @@ LIB_SRC = '''
lib/wins_srv.c
lib/util_sid.c
lib/util_file.c
+ lib/namearray.c
lib/util.c lib/util_cmdline.c lib/util_names.c
lib/util_sock.c lib/sock_exec.c lib/util_sec.c
lib/substitute.c lib/substitute_generic.c lib/dbwrap_util.c