From 74246650613cca9ec57c9a0eff75c53a5c15b110 Mon Sep 17 00:00:00 2001 From: Tim Prouty Date: Wed, 1 Apr 2009 00:25:57 +0000 Subject: s3 onefs: Add missing newlines to debug statements in the onefs module --- source3/modules/onefs_cbrl.c | 6 +++--- source3/modules/onefs_config.c | 6 +++--- source3/modules/onefs_open.c | 9 +++++---- source3/modules/onefs_system.c | 10 +++++----- 4 files changed, 16 insertions(+), 15 deletions(-) diff --git a/source3/modules/onefs_cbrl.c b/source3/modules/onefs_cbrl.c index e30070a9f7..a196511427 100644 --- a/source3/modules/onefs_cbrl.c +++ b/source3/modules/onefs_cbrl.c @@ -324,7 +324,7 @@ NTSTATUS onefs_brl_lock_windows(vfs_handle_struct *handle, id = onefs_get_new_id(); } - DEBUG(10, ("Calling ifs_cbrl(LOCK)...")); + DEBUG(10, ("Calling ifs_cbrl(LOCK)...\n")); error = ifs_cbrl(fd, CBRL_OP_LOCK, type, plock->start, plock->size, async, id, plock->context.smbpid, plock->context.tid, plock->fnum); @@ -388,7 +388,7 @@ bool onefs_brl_unlock_windows(vfs_handle_struct *handle, SMB_ASSERT(plock->lock_flav == WINDOWS_LOCK); SMB_ASSERT(plock->lock_type == UNLOCK_LOCK); - DEBUG(10, ("Calling ifs_cbrl(UNLOCK)...")); + DEBUG(10, ("Calling ifs_cbrl(UNLOCK)...\n")); error = ifs_cbrl(fd, CBRL_OP_UNLOCK, CBRL_LK_SH, plock->start, plock->size, false, 0, plock->context.smbpid, plock->context.tid, plock->fnum); @@ -443,7 +443,7 @@ bool onefs_brl_cancel_windows(vfs_handle_struct *handle, bs->state == ONEFS_CBRL_ASYNC); /* A real cancel. */ - DEBUG(10, ("Calling ifs_cbrl(CANCEL)...")); + DEBUG(10, ("Calling ifs_cbrl(CANCEL)...\n")); error = ifs_cbrl(fd, CBRL_OP_CANCEL, CBRL_LK_UNSPEC, plock->start, plock->size, false, bs->id, plock->context.smbpid, plock->context.tid, plock->fnum); diff --git a/source3/modules/onefs_config.c b/source3/modules/onefs_config.c index 06f4b16ac1..6fe74fc15b 100644 --- a/source3/modules/onefs_config.c +++ b/source3/modules/onefs_config.c @@ -234,7 +234,7 @@ void onefs_sys_config_enc(void) ret = enc_set_proc(ENC_UTF8); if (ret) { - DEBUG(0, ("Setting process encoding failed: %s", + DEBUG(0, ("Setting process encoding failed: %s\n", strerror(errno))); } } @@ -256,7 +256,7 @@ void onefs_sys_config_snap_opt(struct onefs_vfs_global_config *global_config) ret = ifs_set_dotsnap_options(&dso); if (ret) { DEBUG(0, ("Setting snapshot visibility/accessibility " - "failed: %s", strerror(errno))); + "failed: %s\n", strerror(errno))); } } @@ -270,7 +270,7 @@ void onefs_sys_config_tilde(struct onefs_vfs_global_config *global_config) ret = ifs_tilde_snapshot(global_config->dot_snap_tilde); if (ret) { - DEBUG(0, ("Setting snapshot tilde failed: %s", + DEBUG(0, ("Setting snapshot tilde failed: %s\n", strerror(errno))); } } diff --git a/source3/modules/onefs_open.c b/source3/modules/onefs_open.c index c23c176b79..d628443ef9 100644 --- a/source3/modules/onefs_open.c +++ b/source3/modules/onefs_open.c @@ -207,10 +207,11 @@ static NTSTATUS onefs_open_file(files_struct *fsp, */ if ((oplock_request & ~SAMBA_PRIVATE_OPLOCK_MASK) != NO_OPLOCK) { - DEBUG(0,("Oplock(%d) being requested on a stream! " - "Ignoring oplock request: base=%s, stream=%s\n", - oplock_request & ~SAMBA_PRIVATE_OPLOCK_MASK, - base, stream)); + DEBUG(0, ("Oplock(%d) being requested on a stream! " + "Ignoring oplock request: base=%s, " + "stream=%s\n", + oplock_request & ~SAMBA_PRIVATE_OPLOCK_MASK, + base, stream)); /* Recover by requesting NO_OPLOCK instead. */ oplock_request &= SAMBA_PRIVATE_OPLOCK_MASK; } diff --git a/source3/modules/onefs_system.c b/source3/modules/onefs_system.c index 46f38265b1..bc2ed469bf 100644 --- a/source3/modules/onefs_system.c +++ b/source3/modules/onefs_system.c @@ -110,7 +110,7 @@ int onefs_sys_create_file(connection_struct *conn, status = onefs_samba_sd_to_sd(secinfo, sd, &ifs_sd, SNUM(conn)); if (!NT_STATUS_IS_OK(status)) { - DEBUG(1, ("SD initialization failure: %s", + DEBUG(1, ("SD initialization failure: %s\n", nt_errstr(status))); errno = EINVAL; goto out; @@ -162,11 +162,11 @@ int onefs_sys_create_file(connection_struct *conn, open_access_mask)); } - DEBUG(10,("onefs_sys_create_file: base_fd = %d, " + DEBUG(10,("onefs_sys_create_file: base_fd = %d, fname = %s" "open_access_mask = 0x%x, flags = 0x%x, mode = 0%o, " "desired_oplock = %s, id = 0x%x, secinfo = 0x%x, sd = %p, " "dos_attributes = 0x%x, path = %s, " - "default_acl=%s\n", base_fd, + "default_acl=%s\n", base_fd, path, (unsigned int)open_access_mask, (unsigned int)flags, (unsigned int)mode, @@ -328,7 +328,7 @@ ssize_t onefs_sys_sendfile(connection_struct *conn, int tofd, int fromfd, /* If the sendfile wasn't atomic, we're done. */ if (!atomic) { - DEBUG(10, ("non-atomic sendfile read %ul bytes", ret)); + DEBUG(10, ("non-atomic sendfile read %ul bytes\n", ret)); END_PROFILE(syscall_sendfile); return ret; } @@ -418,7 +418,7 @@ ssize_t onefs_sys_sendfile(connection_struct *conn, int tofd, int fromfd, } if (count < 0x10000) { - DEBUG(0, ("Count < 2^16 and E2BIG was returned! %lu", + DEBUG(0, ("Count < 2^16 and E2BIG was returned! %lu\n", count)); } -- cgit