[SCM] Samba Shared Repository - branch master updated
Andrew Bartlett
abartlet at samba.org
Sat Jun 2 22:22:02 MDT 2012
The branch, master has been updated
via c0b9a12 libreplace: Fix up MacOS xattr functions
via 4143a93 s3-build: Remove finddead
from 5bf6971 libreplace: Link libreplace against attr when required
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit c0b9a128d140cd911dee2533b5eb453251e2db57
Author: Andrew Bartlett <abartlet at samba.org>
Date: Sun Jun 3 11:32:55 2012 +1000
libreplace: Fix up MacOS xattr functions
We need undo the rep_ macro to call the real OS function.
Andrew Bartlett
Autobuild-User: Andrew Bartlett <abartlet at samba.org>
Autobuild-Date: Sun Jun 3 06:21:21 CEST 2012 on sn-devel-104
commit 4143a935e5abbb897f38f159fd0330c09b58bdda
Author: Andrew Bartlett <abartlet at samba.org>
Date: Sun Jun 3 11:13:29 2012 +1000
s3-build: Remove finddead
This won't work with the new tree structure, and we have the same
output at
https://build.samba.org/lcov/data/coverage/samba_4_0_test/unused-fns.txt
Using the callcatcher framework.
Andrew Bartlett
-----------------------------------------------------------------------
Summary of changes:
lib/replace/xattr.c | 18 ++++++++++++++++++
source3/Makefile.in | 9 ---------
2 files changed, 18 insertions(+), 9 deletions(-)
Changeset truncated at 500 lines:
diff --git a/lib/replace/xattr.c b/lib/replace/xattr.c
index 6518f31..f5b1787 100644
--- a/lib/replace/xattr.c
+++ b/lib/replace/xattr.c
@@ -49,6 +49,9 @@ ssize_t rep_getxattr (const char *path, const char *name, void *value, size_t si
#ifndef XATTR_ADDITIONAL_OPTIONS
return getxattr(path, name, value, size);
#else
+
+/* So that we do not recursivly call this function */
+#undef getxattr
int options = 0;
return getxattr(path, name, value, size, 0, options);
#endif
@@ -105,6 +108,9 @@ ssize_t rep_fgetxattr (int filedes, const char *name, void *value, size_t size)
#ifndef XATTR_ADDITIONAL_OPTIONS
return fgetxattr(filedes, name, value, size);
#else
+
+/* So that we do not recursivly call this function */
+#undef fgetxattr
int options = 0;
return fgetxattr(filedes, name, value, size, 0, options);
#endif
@@ -318,6 +324,8 @@ ssize_t rep_listxattr (const char *path, char *list, size_t size)
#ifndef XATTR_ADDITIONAL_OPTIONS
return listxattr(path, list, size);
#else
+/* So that we do not recursivly call this function */
+#undef listxattr
int options = 0;
return listxattr(path, list, size, options);
#endif
@@ -349,6 +357,8 @@ ssize_t rep_flistxattr (int filedes, char *list, size_t size)
#ifndef XATTR_ADDITIONAL_OPTIONS
return flistxattr(filedes, list, size);
#else
+/* So that we do not recursivly call this function */
+#undef flistxattr
int options = 0;
return flistxattr(filedes, list, size, options);
#endif
@@ -380,6 +390,8 @@ int rep_removexattr (const char *path, const char *name)
#ifndef XATTR_ADDITIONAL_OPTIONS
return removexattr(path, name);
#else
+/* So that we do not recursivly call this function */
+#undef removexattr
int options = 0;
return removexattr(path, name, options);
#endif
@@ -419,6 +431,8 @@ int rep_fremovexattr (int filedes, const char *name)
#ifndef XATTR_ADDITIONAL_OPTIONS
return fremovexattr(filedes, name);
#else
+/* So that we do not recursivly call this function */
+#undef fremovexattr
int options = 0;
return fremovexattr(filedes, name, options);
#endif
@@ -458,6 +472,8 @@ int rep_setxattr (const char *path, const char *name, const void *value, size_t
#ifndef XATTR_ADDITIONAL_OPTIONS
return setxattr(path, name, value, size, flags);
#else
+/* So that we do not recursivly call this function */
+#undef setxattr
int options = 0;
return setxattr(path, name, value, size, 0, options);
#endif
@@ -523,6 +539,8 @@ int rep_fsetxattr (int filedes, const char *name, const void *value, size_t size
#ifndef XATTR_ADDITIONAL_OPTIONS
return fsetxattr(filedes, name, value, size, flags);
#else
+/* So that we do not recursivly call this function */
+#undef fsetxattr
int options = 0;
return fsetxattr(filedes, name, value, size, 0, options);
#endif
diff --git a/source3/Makefile.in b/source3/Makefile.in
index 2405ec7..093123c 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -3253,15 +3253,6 @@ realdistclean:: distclean
-rm -f include/version.h
-rm -f configure
-# this target is really just for my use. It only works on a limited
-# range of machines and is used to produce a list of potentially
-# dead (ie. unused) functions in the code. (tridge)
-finddead::
- nm */*.o |grep 'U ' | awk '{print $$2}' | sort -u > nmused.txt
- nm */*.o |grep 'T ' | awk '{print $$3}' | sort -u > nmfns.txt
- comm -13 nmused.txt nmfns.txt
-
-
# when configure.in is updated, reconfigure
$(srcdir)/configure: $(srcdir)/configure.in
@echo "WARNING: you need to rerun ./autogen.sh"
--
Samba Shared Repository
More information about the samba-cvs
mailing list