The branch, master has been updated via 452e698 lib/util/charset: reduce loglevel for push_ucs2_talloc error from 8934846 torture-notify: Give nonrecursive updates 200ms
https://git.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit 452e698c4b6d1797657670472522ad522273ae6a Author: Ralph Boehme <s...@samba.org> Date: Mon Jul 13 12:51:46 2015 +0200 lib/util/charset: reduce loglevel for push_ucs2_talloc error push_ucs2_talloc() may have failed because of EILSEQ, not a failing malloc. Log the failure with DBG_WARNING instead of level 0. Signed-off-by: Ralph Boehme <s...@samba.org> Reviewed-by: Jeremy Allison <j...@samba.org> Autobuild-User(master): Jeremy Allison <j...@samba.org> Autobuild-Date(master): Tue Jul 14 03:59:05 CEST 2015 on sn-devel-104 ----------------------------------------------------------------------- Summary of changes: lib/util/charset/util_str.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Changeset truncated at 500 lines: diff --git a/lib/util/charset/util_str.c b/lib/util/charset/util_str.c index 33466ec..c1b81f1 100644 --- a/lib/util/charset/util_str.c +++ b/lib/util/charset/util_str.c @@ -545,13 +545,13 @@ char *strstr_m(const char *src, const char *findstr) frame = talloc_stackframe(); if (!push_ucs2_talloc(frame, &src_w, src, &converted_size)) { - DEBUG(0,("strstr_m: src malloc fail\n")); + DBG_WARNING("strstr_m: src malloc fail\n"); TALLOC_FREE(frame); return NULL; } if (!push_ucs2_talloc(frame, &find_w, findstr, &converted_size)) { - DEBUG(0,("strstr_m: find malloc fail\n")); + DBG_WARNING("strstr_m: find malloc fail\n"); TALLOC_FREE(frame); return NULL; } -- Samba Shared Repository