diff options
author | Volker Lendecke <vl@samba.org> | 2013-06-21 17:56:08 +0200 |
---|---|---|
committer | Volker Lendecke <vl@samba.org> | 2013-06-21 19:57:06 +0200 |
commit | b96cea4aa5b707cbd01d75ecb4782496160db961 (patch) | |
tree | 3f4cd7e7b4687421412b40b0a1670044330bfbdc /source3/libsmb | |
parent | d2642cb1b9cde5297d0b0b457f26cd39e3045905 (diff) | |
download | samba-b96cea4aa5b707cbd01d75ecb4782496160db961.tar.gz samba-b96cea4aa5b707cbd01d75ecb4782496160db961.tar.bz2 samba-b96cea4aa5b707cbd01d75ecb4782496160db961.zip |
Fix some blank line endings
Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Michael Adam <obnox@samba.org>
Autobuild-User(master): Volker Lendecke <vl@samba.org>
Autobuild-Date(master): Fri Jun 21 19:57:06 CEST 2013 on sn-devel-104
Diffstat (limited to 'source3/libsmb')
-rw-r--r-- | source3/libsmb/libsmb_cache.c | 22 | ||||
-rw-r--r-- | source3/libsmb/libsmb_compat.c | 16 | ||||
-rw-r--r-- | source3/libsmb/libsmb_context.c | 6 | ||||
-rw-r--r-- | source3/libsmb/libsmb_file.c | 14 | ||||
-rw-r--r-- | source3/libsmb/libsmb_misc.c | 10 | ||||
-rw-r--r-- | source3/libsmb/libsmb_path.c | 6 | ||||
-rw-r--r-- | source3/libsmb/libsmb_printjob.c | 4 | ||||
-rw-r--r-- | source3/libsmb/libsmb_server.c | 18 | ||||
-rw-r--r-- | source3/libsmb/libsmb_setget.c | 6 | ||||
-rw-r--r-- | source3/libsmb/libsmb_stat.c | 6 |
10 files changed, 54 insertions, 54 deletions
diff --git a/source3/libsmb/libsmb_cache.c b/source3/libsmb/libsmb_cache.c index 598fa81376..2b32447807 100644 --- a/source3/libsmb/libsmb_cache.c +++ b/source3/libsmb/libsmb_cache.c @@ -1,10 +1,10 @@ -/* +/* Unix SMB/CIFS implementation. SMB client library implementation (server cache) Copyright (C) Andrew Tridgell 1998 Copyright (C) Richard Sharpe 2000 Copyright (C) John Terpstra 2000 - Copyright (C) Tom Jansen (Ninja ISD) 2002 + Copyright (C) Tom Jansen (Ninja ISD) 2002 This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -26,7 +26,7 @@ #include "libsmb_internal.h" /* - * Structure we use if internal caching mechanism is used + * Structure we use if internal caching mechanism is used * nothing fancy here. */ struct smbc_server_cache { @@ -43,13 +43,13 @@ struct smbc_server_cache { /* * Add a new connection to the server cache. - * This function is only used if the external cache is not enabled + * This function is only used if the external cache is not enabled */ int SMBC_add_cached_server(SMBCCTX * context, SMBCSRV * newsrv, const char * server, - const char * share, + const char * share, const char * workgroup, const char * username) { @@ -105,13 +105,13 @@ failed: /* - * Search the server cache for a server + * Search the server cache for a server * returns server handle on success, NULL on error (not found) - * This function is only used if the external cache is not enabled + * This function is only used if the external cache is not enabled */ SMBCSRV * SMBC_get_cached_server(SMBCCTX * context, - const char * server, + const char * server, const char * share, const char * workgroup, const char * user) @@ -191,10 +191,10 @@ SMBC_get_cached_server(SMBCCTX * context, } -/* +/* * Search the server cache for a server and remove it * returns 0 on success - * This function is only used if the external cache is not enabled + * This function is only used if the external cache is not enabled */ int SMBC_remove_cached_server(SMBCCTX * context, @@ -203,7 +203,7 @@ SMBC_remove_cached_server(SMBCCTX * context, struct smbc_server_cache * srv = NULL; for (srv = context->internal->server_cache; srv; srv = srv->next) { - if (server == srv->server) { + if (server == srv->server) { /* remove this sucker */ DLIST_REMOVE(context->internal->server_cache, srv); diff --git a/source3/libsmb/libsmb_compat.c b/source3/libsmb/libsmb_compat.c index 5b2ef2d6f8..38f7d36a89 100644 --- a/source3/libsmb/libsmb_compat.c +++ b/source3/libsmb/libsmb_compat.c @@ -1,10 +1,10 @@ -/* +/* Unix SMB/CIFS implementation. SMB client library implementation (Old interface compatibility) Copyright (C) Andrew Tridgell 1998 Copyright (C) Richard Sharpe 2000 Copyright (C) John Terpstra 2000 - Copyright (C) Tom Jansen (Ninja ISD) 2002 + Copyright (C) Tom Jansen (Ninja ISD) 2002 Copyright (C) Derrell Lipman 2003, 2008 This program is free software; you can redistribute it and/or modify @@ -43,7 +43,7 @@ find_fd(int fd) { struct smbc_compat_fdlist * f = smbc_compat_fd_in_use; while (f) { - if (f->fd == fd) + if (f->fd == fd) return f->file; f = f->next; } @@ -96,7 +96,7 @@ del_fd(int fd) struct smbc_compat_fdlist * f = smbc_compat_fd_in_use; while (f) { - if (f->fd == fd) + if (f->fd == fd) break; f = f->next; } @@ -119,7 +119,7 @@ smbc_init(smbc_get_auth_data_fn fn, { if (!smbc_compat_initialized) { statcont = smbc_new_context(); - if (!statcont) + if (!statcont) return -1; smbc_setDebug(statcont, debug); @@ -168,7 +168,7 @@ smbc_open(const char *furl, return -1; fd = add_fd(file); - if (fd == -1) + if (fd == -1) smbc_getFunctionClose(statcont)(statcont, file); return fd; } @@ -255,14 +255,14 @@ smbc_opendir(const char *durl) return -1; fd = add_fd(file); - if (fd == -1) + if (fd == -1) smbc_getFunctionClosedir(statcont)(statcont, file); return fd; } int -smbc_closedir(int dh) +smbc_closedir(int dh) { SMBCFILE * file = find_fd(dh); del_fd(dh); diff --git a/source3/libsmb/libsmb_context.c b/source3/libsmb/libsmb_context.c index 6eb2996287..c2b88f5692 100644 --- a/source3/libsmb/libsmb_context.c +++ b/source3/libsmb/libsmb_context.c @@ -1,10 +1,10 @@ -/* +/* Unix SMB/Netbios implementation. SMB client library implementation Copyright (C) Andrew Tridgell 1998 Copyright (C) Richard Sharpe 2000, 2002 Copyright (C) John Terpstra 2000 - Copyright (C) Tom Jansen (Ninja ISD) 2002 + Copyright (C) Tom Jansen (Ninja ISD) 2002 Copyright (C) Derrell Lipman 2003-2008 Copyright (C) Jeremy Allison 2007, 2008 @@ -30,7 +30,7 @@ #include "../libcli/smb/smbXcli_base.h" /* - * Is the logging working / configfile read ? + * Is the logging working / configfile read ? */ static bool SMBC_initialized = false; static unsigned int initialized_ctx_count = 0; diff --git a/source3/libsmb/libsmb_file.c b/source3/libsmb/libsmb_file.c index 822491bda8..32210b6c1a 100644 --- a/source3/libsmb/libsmb_file.c +++ b/source3/libsmb/libsmb_file.c @@ -1,10 +1,10 @@ -/* +/* Unix SMB/Netbios implementation. SMB client library implementation Copyright (C) Andrew Tridgell 1998 Copyright (C) Richard Sharpe 2000, 2002 Copyright (C) John Terpstra 2000 - Copyright (C) Tom Jansen (Ninja ISD) 2002 + Copyright (C) Tom Jansen (Ninja ISD) 2002 Copyright (C) Derrell Lipman 2003-2008 Copyright (C) Jeremy Allison 2007, 2008 @@ -200,7 +200,7 @@ SMBC_open_ctx(SMBCCTX *context, } /* - * Routine to create a file + * Routine to create a file */ SMBCFILE * @@ -467,9 +467,9 @@ SMBC_close_ctx(SMBCCTX *context, /*d_printf(">>>close: resolved path as %s\n", targetpath);*/ if (!NT_STATUS_IS_OK(cli_close(targetcli, file->cli_fd))) { - DEBUG(3, ("cli_close failed on %s. purging server.\n", + DEBUG(3, ("cli_close failed on %s. purging server.\n", file->fname)); - /* Deallocate slot and remove the server + /* Deallocate slot and remove the server * from the server cache if unused */ errno = SMBC_errno(context, targetcli); srv = file->srv; @@ -602,7 +602,7 @@ SMBC_getatr(SMBCCTX * context, * "mode" (attributes) parameter may be set to -1 if it is not to be set. */ bool -SMBC_setatr(SMBCCTX * context, SMBCSRV *srv, char *path, +SMBC_setatr(SMBCCTX * context, SMBCSRV *srv, char *path, time_t create_time, time_t access_time, time_t write_time, @@ -628,7 +628,7 @@ SMBC_setatr(SMBCCTX * context, SMBCSRV *srv, char *path, mode))) { /* - * setpathinfo is not supported; go to plan B. + * setpathinfo is not supported; go to plan B. * * cli_setatr() does not work on win98, and it also doesn't * support setting the access time (only the modification diff --git a/source3/libsmb/libsmb_misc.c b/source3/libsmb/libsmb_misc.c index 7808d8e4f0..98739c69ef 100644 --- a/source3/libsmb/libsmb_misc.c +++ b/source3/libsmb/libsmb_misc.c @@ -1,10 +1,10 @@ -/* +/* Unix SMB/Netbios implementation. SMB client library implementation Copyright (C) Andrew Tridgell 1998 Copyright (C) Richard Sharpe 2000, 2002 Copyright (C) John Terpstra 2000 - Copyright (C) Tom Jansen (Ninja ISD) 2002 + Copyright (C) Tom Jansen (Ninja ISD) 2002 Copyright (C) Derrell Lipman 2003-2008 Copyright (C) Jeremy Allison 2007, 2008 @@ -28,8 +28,8 @@ #include "libsmb_internal.h" -/* - * check if an element is part of the list. +/* + * check if an element is part of the list. */ int SMBC_dlist_contains(SMBCFILE * list, SMBCFILE *p) @@ -58,7 +58,7 @@ SMBC_errno(SMBCCTX *context, cli_dos_error(c, &eclass, &ecode); - DEBUG(3,("smbc_error %d %d (0x%x) -> %d\n", + DEBUG(3,("smbc_error %d %d (0x%x) -> %d\n", (int)eclass, (int)ecode, (int)ecode, ret)); } else { NTSTATUS status; diff --git a/source3/libsmb/libsmb_path.c b/source3/libsmb/libsmb_path.c index 64d5333ff1..01b0a61e48 100644 --- a/source3/libsmb/libsmb_path.c +++ b/source3/libsmb/libsmb_path.c @@ -1,10 +1,10 @@ -/* +/* Unix SMB/Netbios implementation. SMB client library implementation Copyright (C) Andrew Tridgell 1998 Copyright (C) Richard Sharpe 2000, 2002 Copyright (C) John Terpstra 2000 - Copyright (C) Tom Jansen (Ninja ISD) 2002 + Copyright (C) Tom Jansen (Ninja ISD) 2002 Copyright (C) Derrell Lipman 2003-2008 Copyright (C) Jeremy Allison 2007, 2008 @@ -28,7 +28,7 @@ /* Used by urldecode_talloc() */ -static int +static int hex2int( unsigned int _char ) { if ( _char >= 'A' && _char <='F') diff --git a/source3/libsmb/libsmb_printjob.c b/source3/libsmb/libsmb_printjob.c index 3f6be3e92d..62e54f47b1 100644 --- a/source3/libsmb/libsmb_printjob.c +++ b/source3/libsmb/libsmb_printjob.c @@ -1,10 +1,10 @@ -/* +/* Unix SMB/Netbios implementation. SMB client library implementation Copyright (C) Andrew Tridgell 1998 Copyright (C) Richard Sharpe 2000, 2002 Copyright (C) John Terpstra 2000 - Copyright (C) Tom Jansen (Ninja ISD) 2002 + Copyright (C) Tom Jansen (Ninja ISD) 2002 Copyright (C) Derrell Lipman 2003-2008 Copyright (C) Jeremy Allison 2007, 2008 diff --git a/source3/libsmb/libsmb_server.c b/source3/libsmb/libsmb_server.c index 1fe8fd0b8f..fc3977edba 100644 --- a/source3/libsmb/libsmb_server.c +++ b/source3/libsmb/libsmb_server.c @@ -1,10 +1,10 @@ -/* +/* Unix SMB/Netbios implementation. SMB client library implementation Copyright (C) Andrew Tridgell 1998 Copyright (C) Richard Sharpe 2000, 2002 Copyright (C) John Terpstra 2000 - Copyright (C) Tom Jansen (Ninja ISD) 2002 + Copyright (C) Tom Jansen (Ninja ISD) 2002 Copyright (C) Derrell Lipman 2003-2008 Copyright (C) Jeremy Allison 2007, 2008 Copyright (C) SATOH Fumiyasu <fumiyas@osstech.co.jp> 2009. @@ -34,16 +34,16 @@ #include "libsmb/nmblib.h" #include "../libcli/smb/smbXcli_base.h" -/* +/* * Check a server for being alive and well. - * returns 0 if the server is in shape. Returns 1 on error - * + * returns 0 if the server is in shape. Returns 1 on error + * * Also useable outside libsmbclient to enable external cache * to do some checks too. */ int SMBC_check_server(SMBCCTX * context, - SMBCSRV * server) + SMBCSRV * server) { if (!cli_state_is_connected(server->cli)) { return 1; @@ -52,10 +52,10 @@ SMBC_check_server(SMBCCTX * context, return 0; } -/* +/* * Remove a server from the cached server list it's unused. * On success, 0 is returned. 1 is returned if the server could not be removed. - * + * * Also useable outside libsmbclient */ int @@ -199,7 +199,7 @@ check_server_cache: * servers in the cache */ if (smbc_getFunctionRemoveUnusedServer(context)(context, - srv)) { + srv)) { /* * We could not remove the server completely, * remove it from the cache so we will not get diff --git a/source3/libsmb/libsmb_setget.c b/source3/libsmb/libsmb_setget.c index 0bd5290f4b..b8adcca18b 100644 --- a/source3/libsmb/libsmb_setget.c +++ b/source3/libsmb/libsmb_setget.c @@ -1,10 +1,10 @@ -/* +/* Unix SMB/Netbios implementation. SMB client library implementation Copyright (C) Andrew Tridgell 1998 Copyright (C) Richard Sharpe 2000, 2002 Copyright (C) John Terpstra 2000 - Copyright (C) Tom Jansen (Ninja ISD) 2002 + Copyright (C) Tom Jansen (Ninja ISD) 2002 Copyright (C) Derrell Lipman 2003-2008 Copyright (C) Jeremy Allison 2007, 2008 @@ -93,7 +93,7 @@ smbc_setDebug(SMBCCTX *c, int debug) char buf[32]; snprintf(buf, sizeof(buf), "%d", debug); c->debug = debug; - lp_set_cmdline("log level", buf); + lp_set_cmdline("log level", buf); } /** diff --git a/source3/libsmb/libsmb_stat.c b/source3/libsmb/libsmb_stat.c index 9c5be33be4..fbbd887edf 100644 --- a/source3/libsmb/libsmb_stat.c +++ b/source3/libsmb/libsmb_stat.c @@ -1,10 +1,10 @@ -/* +/* Unix SMB/Netbios implementation. SMB client library implementation Copyright (C) Andrew Tridgell 1998 Copyright (C) Richard Sharpe 2000, 2002 Copyright (C) John Terpstra 2000 - Copyright (C) Tom Jansen (Ninja ISD) 2002 + Copyright (C) Tom Jansen (Ninja ISD) 2002 Copyright (C) Derrell Lipman 2003-2008 Copyright (C) Jeremy Allison 2007, 2008 @@ -28,7 +28,7 @@ #include "libsmb_internal.h" #include "../libcli/smb/smbXcli_base.h" -/* +/* * Generate an inode number from file name for those things that need it */ |