The branch, master has been updated via 177aad5 talloc: pytalloc should not depend on samba specific code via cbee24b s3:include: move debug.c prototypes to debug.h via dbc934e s3:include: move MAX_DEBUG_LEVEL from local.h to debug.h from 3218968 s4:dsdb - use LDB results in "add_time_element" and "add_uint64_element"
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit 177aad556f4be8b6b82eec8fbf0bf4711ae32d2b Author: Stefan Metzmacher <me...@samba.org> Date: Sun Oct 24 19:52:01 2010 +0200 talloc: pytalloc should not depend on samba specific code metze Autobuild-User: Stefan Metzmacher <me...@samba.org> Autobuild-Date: Sun Oct 24 19:21:25 UTC 2010 on sn-devel-104 commit cbee24b2da4e067d751c3f8d30bf34a8cc1e08d0 Author: Stefan Metzmacher <me...@samba.org> Date: Sun Oct 24 20:25:18 2010 +0200 s3:include: move debug.c prototypes to debug.h metze commit dbc934ee4b98f04b4c21d650a018e8aae9e437fa Author: Stefan Metzmacher <me...@samba.org> Date: Sun Oct 24 19:44:21 2010 +0200 s3:include: move MAX_DEBUG_LEVEL from local.h to debug.h metze ----------------------------------------------------------------------- Summary of changes: lib/talloc/pytalloc.c | 5 ++--- source3/include/debug.h | 30 ++++++++++++++++++++++++++++++ source3/include/local.h | 9 --------- source3/include/proto.h | 21 --------------------- 4 files changed, 32 insertions(+), 33 deletions(-) Changeset truncated at 500 lines: diff --git a/lib/talloc/pytalloc.c b/lib/talloc/pytalloc.c index ae59b69..d5ef919 100644 --- a/lib/talloc/pytalloc.c +++ b/lib/talloc/pytalloc.c @@ -21,8 +21,7 @@ #include "replace.h" #include <talloc.h> #include "pytalloc.h" -#include "lib/util/debug.h" -#include "lib/util/util.h" +#include <assert.h> /** * Simple dealloc for talloc-wrapping PyObjects @@ -30,7 +29,7 @@ void py_talloc_dealloc(PyObject* self) { py_talloc_Object *obj = (py_talloc_Object *)self; - SMB_ASSERT(talloc_unlink(NULL, obj->talloc_ctx) != -1); + assert(talloc_unlink(NULL, obj->talloc_ctx) != -1); obj->talloc_ctx = NULL; self->ob_type->tp_free(self); } diff --git a/source3/include/debug.h b/source3/include/debug.h index 2c910da..467fb2f 100644 --- a/source3/include/debug.h +++ b/source3/include/debug.h @@ -27,6 +27,15 @@ * Debugging code. See also debug.c */ +/* the maximum debug level to compile into the code. This assumes a good + optimising compiler that can remove unused code + for embedded or low-memory systems set this to a value like 2 to get + only important messages. This gives *much* smaller binaries +*/ +#ifndef MAX_DEBUG_LEVEL +#define MAX_DEBUG_LEVEL 1000 +#endif + /* mkproto.awk has trouble with ifdef'd function definitions (it ignores * the #ifdef directive and will read both definitions, thus creating two * diffferent prototype declarations), so we must do these by hand. @@ -239,4 +248,25 @@ extern bool *DEBUGLEVEL_CLASS_ISSET; #define DEBUGSEP(level)\ DEBUG((level),("===============================================================\n")) +/* The following definitions come from lib/debug.c */ + +void gfree_debugsyms(void); +const char *debug_classname_from_index(int ndx); +int debug_add_class(const char *classname); +int debug_lookup_classname(const char *classname); +bool debug_parse_levels(const char *params_str); +void debug_message(struct messaging_context *msg_ctx, void *private_data, uint32_t msg_type, struct server_id src, DATA_BLOB *data); +void debug_init(void); +void debug_register_msgs(struct messaging_context *msg_ctx); +void setup_logging(const char *pname, bool interactive); +void setup_logging_stdout( void ); +void debug_set_logfile(const char *name); +bool reopen_logs( void ); +void force_check_log_size( void ); +bool need_to_check_log_size( void ); +void check_log_size( void ); +void dbgflush( void ); +bool dbghdrclass(int level, int cls, const char *location, const char *func); +bool dbghdr(int level, const char *location, const char *func); + #endif diff --git a/source3/include/local.h b/source3/include/local.h index 93ec4cc..6c9a8c3 100644 --- a/source3/include/local.h +++ b/source3/include/local.h @@ -10,15 +10,6 @@ #define WORKGROUP "WORKGROUP" #endif -/* the maximum debug level to compile into the code. This assumes a good - optimising compiler that can remove unused code - for embedded or low-memory systems set this to a value like 2 to get - only important messages. This gives *much* smaller binaries -*/ -#ifndef MAX_DEBUG_LEVEL -#define MAX_DEBUG_LEVEL 1000 -#endif - /* This defines the section name in the configuration file that will contain */ /* global parameters - that is, parameters relating to the whole server, not */ /* just services. This name is then reserved, and may not be used as a */ diff --git a/source3/include/proto.h b/source3/include/proto.h index c19dd35..0c05e6e 100644 --- a/source3/include/proto.h +++ b/source3/include/proto.h @@ -505,27 +505,6 @@ int connections_forall_read(int (*fn)(const struct connections_key *key, void *private_data); bool connections_init(bool rw); -/* The following definitions come from lib/debug.c */ - -void gfree_debugsyms(void); -const char *debug_classname_from_index(int ndx); -int debug_add_class(const char *classname); -int debug_lookup_classname(const char *classname); -bool debug_parse_levels(const char *params_str); -void debug_message(struct messaging_context *msg_ctx, void *private_data, uint32_t msg_type, struct server_id src, DATA_BLOB *data); -void debug_init(void); -void debug_register_msgs(struct messaging_context *msg_ctx); -void setup_logging(const char *pname, bool interactive); -void setup_logging_stdout( void ); -void debug_set_logfile(const char *name); -bool reopen_logs( void ); -void force_check_log_size( void ); -bool need_to_check_log_size( void ); -void check_log_size( void ); -void dbgflush( void ); -bool dbghdrclass(int level, int cls, const char *location, const char *func); -bool dbghdr(int level, const char *location, const char *func); - /* The following definitions come from lib/display_sec.c */ char *get_sec_mask_str(TALLOC_CTX *ctx, uint32 type); -- Samba Shared Repository