diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2010-09-17 18:06:05 +1000 |
|---|---|---|
| committer | Günther Deschner <gd@samba.org> | 2010-09-20 16:15:11 -0700 |
| commit | 80ca590d38d16723c6f457249e4051d5aa5843c5 (patch) | |
| tree | aae4c98201ee1f230727c1f5e9df19cd7d0a5be6 | |
| parent | 03011bf11837e75474f91f422ddf35d827d31cd1 (diff) | |
| download | samba-80ca590d38d16723c6f457249e4051d5aa5843c5.tar.gz samba-80ca590d38d16723c6f457249e4051d5aa5843c5.tar.bz2 samba-80ca590d38d16723c6f457249e4051d5aa5843c5.zip | |
s3-lib/util Remove unused smb_uuid_unpack()
Andrew Bartlett
Signed-off-by: Günther Deschner <gd@samba.org>
| -rw-r--r-- | source3/Makefile.in | 2 | ||||
| -rw-r--r-- | source3/include/proto.h | 4 | ||||
| -rw-r--r-- | source3/lib/util_uuid.c | 31 | ||||
| -rw-r--r-- | source3/wscript_build | 2 |
4 files changed, 2 insertions, 37 deletions
diff --git a/source3/Makefile.in b/source3/Makefile.in index 20a67969e0..b7dfc6e13e 100644 --- a/source3/Makefile.in +++ b/source3/Makefile.in @@ -453,7 +453,7 @@ LIB_OBJ = $(LIBSAMBAUTIL_OBJ) $(UTIL_OBJ) $(CRYPTO_OBJ) \ lib/util_pw.o lib/access.o lib/smbrun.o \ lib/bitmap.o lib/dprintf.o $(UTIL_REG_OBJ) \ lib/wins_srv.o \ - lib/util_str.o lib/clobber.o lib/util_sid.o lib/util_uuid.o \ + lib/util_str.o lib/clobber.o lib/util_sid.o \ lib/util_unistr.o lib/util_file.o \ lib/util.o lib/util_names.o \ lib/util_sock.o lib/sock_exec.o lib/util_sec.o \ diff --git a/source3/include/proto.h b/source3/include/proto.h index ff418ab673..d7b9cb0a93 100644 --- a/source3/include/proto.h +++ b/source3/include/proto.h @@ -1582,10 +1582,6 @@ int tolower_ascii(int c); int isupper_ascii(int c); int islower_ascii(int c); -/* The following definitions come from lib/util_uuid.c */ - -void smb_uuid_unpack(const UUID_FLAT in, struct GUID *uu); - /* The following definitions come from lib/version.c */ const char *samba_version_string(void); diff --git a/source3/lib/util_uuid.c b/source3/lib/util_uuid.c deleted file mode 100644 index 6c07322659..0000000000 --- a/source3/lib/util_uuid.c +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Unix SMB/CIFS implementation. - * UUID server routines - * Copyright (C) Theodore Ts'o 1996, 1997, - * Copyright (C) Jim McDonough <jmcd@us.ibm.com> 2002, 2003 - * - * 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" - -void smb_uuid_unpack(const UUID_FLAT in, struct GUID *uu) -{ - uu->time_low = IVAL(in.info, 0); - uu->time_mid = SVAL(in.info, 4); - uu->time_hi_and_version = SVAL(in.info, 6); - memcpy(uu->clock_seq, in.info+8, 2); - memcpy(uu->node, in.info+10, 6); -} - diff --git a/source3/wscript_build b/source3/wscript_build index 6c37348495..fe70ce4aad 100644 --- a/source3/wscript_build +++ b/source3/wscript_build @@ -219,7 +219,7 @@ LIB_SRC = '''${LIBSAMBAUTIL_SRC} ${UTIL_SRC} ${CRYPTO_SRC} lib/util_pw.c lib/access.c lib/smbrun.c lib/bitmap.c lib/dprintf.c ${UTIL_REG_SRC} lib/wins_srv.c - lib/util_str.c lib/clobber.c lib/util_sid.c lib/util_uuid.c + lib/util_str.c lib/clobber.c lib/util_sid.c lib/util_unistr.c lib/util_file.c lib/util_names.c lib/util.c lib/util_sock.c lib/sock_exec.c lib/util_sec.c lib/substitute.c lib/dbwrap_util.c |