From: Volker Lendecke Date: Thu, 25 Mar 2010 09:19:48 +0000 (+0100) Subject: Fix some nonempty blank lines X-Git-Tag: samba-3.6.0pre1~4015 X-Git-Url: http://git.samba.org/samba.git/?p=sfrench%2Fsamba-autobuild%2F.git;a=commitdiff_plain;h=ea8e0d5d54b020c530e392c4edaeed43e20af303 Fix some nonempty blank lines --- diff --git a/lib/tdb/common/dump.c b/lib/tdb/common/dump.c index bdcbfab139b..9f770f81a52 100644 --- a/lib/tdb/common/dump.c +++ b/lib/tdb/common/dump.c @@ -6,11 +6,11 @@ Copyright (C) Andrew Tridgell 1999-2005 Copyright (C) Paul `Rusty' Russell 2000 Copyright (C) Jeremy Allison 2000-2003 - + ** NOTE! The following LGPL license applies to the tdb ** library. This does NOT imply that all of Samba is released ** under the LGPL - + This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either diff --git a/lib/tdb/common/error.c b/lib/tdb/common/error.c index 195ab238154..9197918ddea 100644 --- a/lib/tdb/common/error.c +++ b/lib/tdb/common/error.c @@ -6,11 +6,11 @@ Copyright (C) Andrew Tridgell 1999-2005 Copyright (C) Paul `Rusty' Russell 2000 Copyright (C) Jeremy Allison 2000-2003 - + ** NOTE! The following LGPL license applies to the tdb ** library. This does NOT imply that all of Samba is released ** under the LGPL - + This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either diff --git a/lib/tdb/common/freelist.c b/lib/tdb/common/freelist.c index c7d908edfdd..79e3c344b8b 100644 --- a/lib/tdb/common/freelist.c +++ b/lib/tdb/common/freelist.c @@ -6,11 +6,11 @@ Copyright (C) Andrew Tridgell 1999-2005 Copyright (C) Paul `Rusty' Russell 2000 Copyright (C) Jeremy Allison 2000-2003 - + ** NOTE! The following LGPL license applies to the tdb ** library. This does NOT imply that all of Samba is released ** under the LGPL - + This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either @@ -143,7 +143,7 @@ left: tdb_off_t left = offset - sizeof(tdb_off_t); struct tdb_record l; tdb_off_t leftsize; - + /* Read in tailer and jump back to header */ if (tdb_ofs_read(tdb, left, &leftsize) == -1) { TDB_LOG((tdb, TDB_DEBUG_FATAL, "tdb_free: left offset read failed at %u\n", left)); @@ -334,7 +334,7 @@ tdb_off_t tdb_allocate(struct tdb_context *tdb, tdb_len_t length, struct tdb_rec bestfit.rec_len < length * multiplier) { break; } - + /* this multiplier means we only extremely rarely search more than 50 or so records. At 50 records we accept records up to 11 times larger than what we diff --git a/lib/tdb/common/io.c b/lib/tdb/common/io.c index 5b20fa1902a..058ca6c6b51 100644 --- a/lib/tdb/common/io.c +++ b/lib/tdb/common/io.c @@ -6,11 +6,11 @@ Copyright (C) Andrew Tridgell 1999-2005 Copyright (C) Paul `Rusty' Russell 2000 Copyright (C) Jeremy Allison 2000-2003 - + ** NOTE! The following LGPL license applies to the tdb ** library. This does NOT imply that all of Samba is released ** under the LGPL - + This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either diff --git a/lib/tdb/common/lock.c b/lib/tdb/common/lock.c index 65d68432fe9..0b130a89351 100644 --- a/lib/tdb/common/lock.c +++ b/lib/tdb/common/lock.c @@ -6,11 +6,11 @@ Copyright (C) Andrew Tridgell 1999-2005 Copyright (C) Paul `Rusty' Russell 2000 Copyright (C) Jeremy Allison 2000-2003 - + ** NOTE! The following LGPL license applies to the tdb ** library. This does NOT imply that all of Samba is released ** under the LGPL - + This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either diff --git a/lib/tdb/common/open.c b/lib/tdb/common/open.c index afea5544f98..114ba4387ba 100644 --- a/lib/tdb/common/open.c +++ b/lib/tdb/common/open.c @@ -6,11 +6,11 @@ Copyright (C) Andrew Tridgell 1999-2005 Copyright (C) Paul `Rusty' Russell 2000 Copyright (C) Jeremy Allison 2000-2003 - + ** NOTE! The following LGPL license applies to the tdb ** library. This does NOT imply that all of Samba is released ** under the LGPL - + This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either @@ -111,7 +111,7 @@ static int tdb_already_open(dev_t device, ino_t ino) { struct tdb_context *i; - + for (i = tdbs; i; i = i->next) { if (i->device == device && i->inode == ino) { return 1; @@ -192,7 +192,7 @@ struct tdb_context *tdb_open_ex(const char *name, int hash_size, int tdb_flags, errno = EINVAL; goto fail; } - + if (hash_size == 0) hash_size = DEFAULT_HASH_SIZE; if ((open_flags & O_ACCMODE) == O_RDONLY) { diff --git a/lib/tdb/common/tdb.c b/lib/tdb/common/tdb.c index 953c811c702..dac3f4e6666 100644 --- a/lib/tdb/common/tdb.c +++ b/lib/tdb/common/tdb.c @@ -6,11 +6,11 @@ Copyright (C) Andrew Tridgell 1999-2005 Copyright (C) Paul `Rusty' Russell 2000 Copyright (C) Jeremy Allison 2000-2003 - + ** NOTE! The following LGPL license applies to the tdb ** library. This does NOT imply that all of Samba is released ** under the LGPL - + This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either @@ -36,7 +36,7 @@ TDB_DATA tdb_null; void tdb_increment_seqnum_nonblock(struct tdb_context *tdb) { tdb_off_t seqnum=0; - + if (!(tdb->flags & TDB_SEQNUM)) { return; } @@ -80,7 +80,7 @@ static tdb_off_t tdb_find(struct tdb_context *tdb, TDB_DATA key, uint32_t hash, struct tdb_record *r) { tdb_off_t rec_ptr; - + /* read in the hash top */ if (tdb_ofs_read(tdb, TDB_HASH_TOP(hash), &rec_ptr) == -1) return 0; @@ -154,7 +154,6 @@ static int tdb_update_hash(struct tdb_context *tdb, TDB_DATA key, uint32_t hash, free(data.dptr); } } - /* must be long enough key, data and tailer */ if (rec.rec_len < key.dsize + dbuf.dsize + sizeof(tdb_off_t)) { @@ -171,7 +170,7 @@ static int tdb_update_hash(struct tdb_context *tdb, TDB_DATA key, uint32_t hash, rec.data_len = dbuf.dsize; return tdb_rec_write(tdb, rec_ptr, &rec); } - + return 0; } @@ -264,7 +263,7 @@ int tdb_parse_record(struct tdb_context *tdb, TDB_DATA key, static int tdb_exists_hash(struct tdb_context *tdb, TDB_DATA key, uint32_t hash) { struct tdb_record rec; - + if (tdb_find_lock_hash(tdb, key, hash, F_RDLCK, &rec) == 0) return 0; tdb_unlock(tdb, BUCKET(rec.full_hash), F_RDLCK); @@ -322,7 +321,7 @@ static int tdb_count_dead(struct tdb_context *tdb, uint32_t hash) int res = 0; tdb_off_t rec_ptr; struct tdb_record rec; - + /* read in the hash top */ if (tdb_ofs_read(tdb, TDB_HASH_TOP(hash), &rec_ptr) == -1) return 0; @@ -351,7 +350,7 @@ static int tdb_purge_dead(struct tdb_context *tdb, uint32_t hash) if (tdb_lock(tdb, -1, F_WRLCK) == -1) { return -1; } - + /* read in the hash top */ if (tdb_ofs_read(tdb, TDB_HASH_TOP(hash), &rec_ptr) == -1) goto fail; @@ -447,7 +446,7 @@ static tdb_off_t tdb_find_dead(struct tdb_context *tdb, uint32_t hash, struct tdb_record *r, tdb_len_t length) { tdb_off_t rec_ptr; - + /* read in the hash top */ if (tdb_ofs_read(tdb, TDB_HASH_TOP(hash), &rec_ptr) == -1) return 0; @@ -662,7 +661,7 @@ int tdb_append(struct tdb_context *tdb, TDB_DATA key, TDB_DATA new_dbuf) ret = _tdb_store(tdb, key, dbuf, 0, hash); tdb_trace_2rec_retrec(tdb, "tdb_append", key, new_dbuf, dbuf); - + failed: tdb_unlock(tdb, BUCKET(hash), F_WRLCK); SAFE_FREE(dbuf.dptr); diff --git a/lib/tdb/common/tdb_private.h b/lib/tdb/common/tdb_private.h index a0e3f20b4e9..4e979ac7483 100644 --- a/lib/tdb/common/tdb_private.h +++ b/lib/tdb/common/tdb_private.h @@ -4,11 +4,11 @@ trivial database library - private includes Copyright (C) Andrew Tridgell 2005 - + ** NOTE! The following LGPL license applies to the tdb ** library. This does NOT imply that all of Samba is released ** under the LGPL - + This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either diff --git a/lib/tdb/common/transaction.c b/lib/tdb/common/transaction.c index 4f1cc708eff..504d0f681a8 100644 --- a/lib/tdb/common/transaction.c +++ b/lib/tdb/common/transaction.c @@ -8,7 +8,7 @@ ** NOTE! The following LGPL license applies to the tdb ** library. This does NOT imply that all of Samba is released ** under the LGPL - + This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either @@ -59,7 +59,7 @@ - allow for nested calls to tdb_transaction_start(), re-using the existing transaction record. If the inner transaction is cancelled then a subsequent commit will fail - + - keep a mirrored copy of the tdb hash chain heads to allow for the fast hash heads scan on traverse, updating the mirrored copy in the transaction version of tdb_write @@ -185,7 +185,7 @@ static int transaction_read(struct tdb_context *tdb, tdb_off_t off, void *buf, goto fail; } } - + /* now copy it out of this block */ memcpy(buf, tdb->transaction->blocks[blk] + (off % tdb->transaction->block_size), len); if (cv) { @@ -292,7 +292,7 @@ static int transaction_write(struct tdb_context *tdb, tdb_off_t off, } } } - + /* overwrite part of an existing block */ if (buf == NULL) { memset(tdb->transaction->blocks[blk] + off, 0, len); @@ -478,7 +478,7 @@ int tdb_transaction_start(struct tdb_context *tdb) SAFE_FREE(tdb->transaction); return -1; } - + /* get a read lock from the freelist to the end of file. This is upgraded to a write lock during the commit */ if (tdb_allrecord_lock(tdb, F_RDLCK, TDB_LOCK_WAIT, true) == -1) { @@ -514,7 +514,7 @@ int tdb_transaction_start(struct tdb_context *tdb) /* Trace at the end, so we get sequence number correct. */ tdb_trace(tdb, "tdb_transaction_start"); return 0; - + fail: tdb_allrecord_unlock(tdb, F_RDLCK, false); fail_allrecord_lock: @@ -601,7 +601,7 @@ static int _tdb_transaction_cancel(struct tdb_context *tdb) SAFE_FREE(tdb->transaction->hash_heads); SAFE_FREE(tdb->transaction); - + return ret; } @@ -787,7 +787,7 @@ static int transaction_setup_recovery(struct tdb_context *tdb, if (i == tdb->transaction->num_blocks-1) { length = tdb->transaction->last_block_size; } - + if (offset >= old_map_size) { continue; } @@ -900,7 +900,7 @@ static int _tdb_transaction_prepare_commit(struct tdb_context *tdb) } methods = tdb->transaction->io_methods; - + /* if there are any locks pending then the caller has not nested their locks properly, so fail the transaction */ if (tdb_have_extra_locks(tdb)) { @@ -1024,7 +1024,7 @@ int tdb_transaction_commit(struct tdb_context *tdb) if (methods->tdb_write(tdb, offset, tdb->transaction->blocks[i], length) == -1) { TDB_LOG((tdb, TDB_DEBUG_FATAL, "tdb_transaction_commit: write failed during commit\n")); - + /* we've overwritten part of the data and possibly expanded the file, so we need to run the crash recovery code */ @@ -1179,7 +1179,7 @@ int tdb_transaction_recover(struct tdb_context *tdb) tdb->ecode = TDB_ERR_IO; return -1; } - + if (transaction_sync(tdb, 0, recovery_eof) == -1) { TDB_LOG((tdb, TDB_DEBUG_FATAL, "tdb_transaction_recover: failed to sync2 recovery\n")); tdb->ecode = TDB_ERR_IO; diff --git a/lib/tdb/common/traverse.c b/lib/tdb/common/traverse.c index d329ef4da40..baaf58ae87d 100644 --- a/lib/tdb/common/traverse.c +++ b/lib/tdb/common/traverse.c @@ -6,11 +6,11 @@ Copyright (C) Andrew Tridgell 1999-2005 Copyright (C) Paul `Rusty' Russell 2000 Copyright (C) Jeremy Allison 2000-2003 - + ** NOTE! The following LGPL license applies to the tdb ** library. This does NOT imply that all of Samba is released ** under the LGPL - + This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either @@ -44,7 +44,7 @@ static tdb_off_t tdb_next_lock(struct tdb_context *tdb, struct tdb_traverse_lock common for the use of tdb with ldb, where large hashes are used. In that case we spend most of our time in tdb_brlock(), locking empty hash chains. - + To avoid this, we do an unlocked pre-check to see if the hash chain is empty before starting to look inside it. If it is empty then we can avoid that @@ -52,7 +52,7 @@ static tdb_off_t tdb_next_lock(struct tdb_context *tdb, struct tdb_traverse_lock the value we get back, as we read it without a lock, so instead we get the lock and re-fetch the value below. - + Notice that not doing this optimisation on the first hash chain is critical. We must guarantee that we have done at least one fcntl lock at the @@ -62,7 +62,7 @@ static tdb_off_t tdb_next_lock(struct tdb_context *tdb, struct tdb_traverse_lock could possibly miss those with this trick, but we could miss them anyway without this trick, so the semantics don't change. - + With a non-indexed ldb search this trick gains us a factor of around 80 in speed on a linux 2.6.x system (testing using ldbtest). diff --git a/source3/passdb/util_builtin.c b/source3/passdb/util_builtin.c index b009d76ef2d..dc0a54c598e 100644 --- a/source3/passdb/util_builtin.c +++ b/source3/passdb/util_builtin.c @@ -2,17 +2,17 @@ Unix SMB/CIFS implementation. Translate BUILTIN names to SIDs and vice versa Copyright (C) Volker Lendecke 2005 - + 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 the Free Software Foundation; either version 3 of the License, or (at your option) any later version. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program. If not, see . */