[SCM] Samba Shared Repository - branch v3-2-test updated -
initial-v3-2-unstable-237-g0059097
Stefan Metzmacher
metze at samba.org
Thu Nov 8 13:34:47 GMT 2007
The branch, v3-2-test has been updated
via 005909726e0121a549abf625a3b443f3a6964d84 (commit)
via cfbdb133b998a704c6c167b9b4b56370f4ff666d (commit)
from 9a201fd4c81509eb8a93087a38bb0fda69dfd7e4 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test
- Log -----------------------------------------------------------------
commit 005909726e0121a549abf625a3b443f3a6964d84
Author: Stefan Metzmacher <metze at samba.org>
Date: Thu Nov 8 14:34:02 2007 +0100
add '_PUBLIC_' prototypes into proto.h
this makes merging samba4 code easier...
metze
commit cfbdb133b998a704c6c167b9b4b56370f4ff666d
Author: Stefan Metzmacher <metze at samba.org>
Date: Thu Nov 8 14:33:04 2007 +0100
add win_errstr() as wrapper of dos_errstr().
this makes merging stuff from samba4 easier
metze
-----------------------------------------------------------------------
Summary of changes:
source/libsmb/doserr.c | 6 ++++++
source/script/mkproto.awk | 4 ++--
2 files changed, 8 insertions(+), 2 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/libsmb/doserr.c b/source/libsmb/doserr.c
index 52afb0d..b8cb8b4 100644
--- a/source/libsmb/doserr.c
+++ b/source/libsmb/doserr.c
@@ -108,3 +108,9 @@ const char *dos_errstr(WERROR werror)
return msg;
}
+
+/* compat function for samba4 */
+const char *win_errstr(WERROR werror)
+{
+ return dos_errstr(werror);
+}
diff --git a/source/script/mkproto.awk b/source/script/mkproto.awk
index a707378..ff26632 100644
--- a/source/script/mkproto.awk
+++ b/source/script/mkproto.awk
@@ -113,7 +113,7 @@ END {
printf "int %s(void);\n", a[2]
}
-/^static|^extern/ || !/^[a-zA-Z]/ || /[;]/ {
+/^static|^extern/ || !/^[a-zA-Z\_]/ || /[;]/ {
next;
}
@@ -151,7 +151,7 @@ END {
gotstart = 1;
}
- if( $0 ~ /^NODE_STATUS_STRUCT|SMB_STRUCT_DIR|ELOG_TDB|codepoint_t/ ) {
+ if( $0 ~ /^NODE_STATUS_STRUCT|^SMB_STRUCT_DIR|^ELOG_TDB|^codepoint_t|^_PUBLIC_/ ) {
gotstart = 1;
}
--
Samba Shared Repository
More information about the samba-cvs
mailing list