From e9d3cf6a5074e9d89d7fc9dbc971df3bd4a03217 Mon Sep 17 00:00:00 2001 From: SATOH Fumiyasu Date: Mon, 17 Dec 2012 19:56:51 +0900 Subject: [PATCH] libsmbclient: Replace d_printf() with DEBUG() to not taint stdout --- source3/libsmb/libsmb_context.c | 2 +- source3/libsmb/libsmb_dir.c | 14 +++++++------- source3/libsmb/libsmb_file.c | 14 +++++++------- source3/libsmb/libsmb_stat.c | 2 +- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/source3/libsmb/libsmb_context.c b/source3/libsmb/libsmb_context.c index 6c20d65..c9ca455 100644 --- a/source3/libsmb/libsmb_context.c +++ b/source3/libsmb/libsmb_context.c @@ -701,7 +701,7 @@ smbc_set_credentials(const char *workgroup, smbc_bool use_kerberos, const char *signing_state) { - d_printf("smbc_set_credentials is obsolete. Replace with smbc_set_credentials_with_fallback().\n"); + DEBUG(0, ("smbc_set_credentials is obsolete. Replace with smbc_set_credentials_with_fallback().\n")); } void smbc_set_credentials_with_fallback(SMBCCTX *context, diff --git a/source3/libsmb/libsmb_dir.c b/source3/libsmb/libsmb_dir.c index ea75dbf..591b0f1a 100644 --- a/source3/libsmb/libsmb_dir.c +++ b/source3/libsmb/libsmb_dir.c @@ -810,7 +810,7 @@ SMBC_opendir_ctx(SMBCCTX *context, if (!cli_resolve_path(frame, "", context->internal->auth_info, srv->cli, path, &targetcli, &targetpath)) { - d_printf("Could not resolve %s\n", path); + DEBUG(0, ("Could not resolve %s\n", path)); if (dir) { SAFE_FREE(dir->fname); SAFE_FREE(dir); @@ -1214,7 +1214,7 @@ SMBC_mkdir_ctx(SMBCCTX *context, if (!cli_resolve_path(frame, "", context->internal->auth_info, srv->cli, path, &targetcli, &targetpath)) { - d_printf("Could not resolve %s\n", path); + DEBUG(0, ("Could not resolve %s\n", path)); errno = ENOENT; TALLOC_FREE(frame); return -1; @@ -1322,7 +1322,7 @@ SMBC_rmdir_ctx(SMBCCTX *context, if (!cli_resolve_path(frame, "", context->internal->auth_info, srv->cli, path, &targetcli, &targetpath)) { - d_printf("Could not resolve %s\n", path); + DEBUG(0, ("Could not resolve %s\n", path)); errno = ENOENT; TALLOC_FREE(frame); return -1; @@ -1607,7 +1607,7 @@ SMBC_chmod_ctx(SMBCCTX *context, if (!cli_resolve_path(frame, "", context->internal->auth_info, srv->cli, path, &targetcli, &targetpath)) { - d_printf("Could not resolve %s\n", path); + DEBUG(0, ("Could not resolve %s\n", path)); errno = ENOENT; TALLOC_FREE(frame); return -1; @@ -1800,7 +1800,7 @@ SMBC_unlink_ctx(SMBCCTX *context, if (!cli_resolve_path(frame, "", context->internal->auth_info, srv->cli, path, &targetcli, &targetpath)) { - d_printf("Could not resolve %s\n", path); + DEBUG(0, ("Could not resolve %s\n", path)); errno = ENOENT; TALLOC_FREE(frame); return -1; @@ -1975,7 +1975,7 @@ SMBC_rename_ctx(SMBCCTX *ocontext, srv->cli, path1, &targetcli1, &targetpath1)) { - d_printf("Could not resolve %s\n", path1); + DEBUG(0, ("Could not resolve %s\n", path1)); errno = ENOENT; TALLOC_FREE(frame); return -1; @@ -1993,7 +1993,7 @@ SMBC_rename_ctx(SMBCCTX *ocontext, srv->cli, path2, &targetcli2, &targetpath2)) { - d_printf("Could not resolve %s\n", path2); + DEBUG(0, ("Could not resolve %s\n", path2)); errno = ENOENT; TALLOC_FREE(frame); return -1; diff --git a/source3/libsmb/libsmb_file.c b/source3/libsmb/libsmb_file.c index dc70f6d..fde7122 100644 --- a/source3/libsmb/libsmb_file.c +++ b/source3/libsmb/libsmb_file.c @@ -114,7 +114,7 @@ SMBC_open_ctx(SMBCCTX *context, if (!cli_resolve_path(frame, "", context->internal->auth_info, srv->cli, path, &targetcli, &targetpath)) { - d_printf("Could not resolve %s\n", path); + DEBUG(0, ("Could not resolve %s\n", path)); errno = ENOENT; SAFE_FREE(file); TALLOC_FREE(frame); @@ -286,7 +286,7 @@ SMBC_read_ctx(SMBCCTX *context, if (!cli_resolve_path(frame, "", context->internal->auth_info, file->srv->cli, path, &targetcli, &targetpath)) { - d_printf("Could not resolve %s\n", path); + DEBUG(0, ("Could not resolve %s\n", path)); errno = ENOENT; TALLOC_FREE(frame); return -1; @@ -371,7 +371,7 @@ SMBC_write_ctx(SMBCCTX *context, if (!cli_resolve_path(frame, "", context->internal->auth_info, file->srv->cli, path, &targetcli, &targetpath)) { - d_printf("Could not resolve %s\n", path); + DEBUG(0, ("Could not resolve %s\n", path)); errno = ENOENT; TALLOC_FREE(frame); return -1; @@ -445,7 +445,7 @@ SMBC_close_ctx(SMBCCTX *context, if (!cli_resolve_path(frame, "", context->internal->auth_info, file->srv->cli, path, &targetcli, &targetpath)) { - d_printf("Could not resolve %s\n", path); + DEBUG(0, ("Could not resolve %s\n", path)); errno = ENOENT; TALLOC_FREE(frame); return -1; @@ -525,7 +525,7 @@ SMBC_getatr(SMBCCTX * context, if (!cli_resolve_path(frame, "", context->internal->auth_info, srv->cli, fixedpath, &targetcli, &targetpath)) { - d_printf("Couldn't resolve %s\n", path); + DEBUG(0, ("Could not resolve %s\n", path)); errno = ENOENT; TALLOC_FREE(frame); return False; @@ -724,7 +724,7 @@ SMBC_lseek_ctx(SMBCCTX *context, if (!cli_resolve_path(frame, "", context->internal->auth_info, file->srv->cli, path, &targetcli, &targetpath)) { - d_printf("Could not resolve %s\n", path); + DEBUG(0, ("Could not resolve %s\n", path)); errno = ENOENT; TALLOC_FREE(frame); return -1; @@ -813,7 +813,7 @@ SMBC_ftruncate_ctx(SMBCCTX *context, if (!cli_resolve_path(frame, "", context->internal->auth_info, file->srv->cli, path, &targetcli, &targetpath)) { - d_printf("Could not resolve %s\n", path); + DEBUG(0, ("Could not resolve %s\n", path)); errno = ENOENT; TALLOC_FREE(frame); return -1; diff --git a/source3/libsmb/libsmb_stat.c b/source3/libsmb/libsmb_stat.c index 426ace9..a813524 100644 --- a/source3/libsmb/libsmb_stat.c +++ b/source3/libsmb/libsmb_stat.c @@ -253,7 +253,7 @@ SMBC_fstat_ctx(SMBCCTX *context, if (!cli_resolve_path(frame, "", context->internal->auth_info, file->srv->cli, path, &targetcli, &targetpath)) { - d_printf("Could not resolve %s\n", path); + DEBUG(0, ("Could not resolve %s\n", path)); errno = ENOENT; TALLOC_FREE(frame); return -1; -- 1.7.10.4