The branch, master has been updated
via 8300b255a5f88cc4ca23678595810d7caec50a00 (commit)
from 558ff911df1e16e28e3a1efa0849c9083d08c617 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 8300b255a5f88cc4ca23678595810d7caec50a00
Author: Volker Lendecke <[email protected]>
Date: Fri Aug 7 12:09:21 2009 +0200
Fix some nonempty blank lines
-----------------------------------------------------------------------
Summary of changes:
source3/lib/bitmap.c | 4 ++--
source3/lib/conn_tdb.c | 6 +++---
source3/lib/ctdbd_conn.c | 19 +++++++++----------
source3/lib/util_tdb.c | 14 +++++++-------
source3/lib/winbind_util.c | 26 +++++++++++++-------------
source3/lib/wins_srv.c | 4 ++--
6 files changed, 36 insertions(+), 37 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/lib/bitmap.c b/source3/lib/bitmap.c
index 5e623f4..f753ffd 100644
--- a/source3/lib/bitmap.c
+++ b/source3/lib/bitmap.c
@@ -32,7 +32,7 @@ struct bitmap *bitmap_allocate(int n)
bm = SMB_MALLOC_P(struct bitmap);
if (!bm) return NULL;
-
+
bm->n = n;
bm->b = SMB_MALLOC_ARRAY(uint32, (n+31)/32);
if (!bm->b) {
@@ -70,7 +70,7 @@ struct bitmap *bitmap_talloc(TALLOC_CTX *mem_ctx, int n)
bm = TALLOC_P(mem_ctx, struct bitmap);
if (!bm) return NULL;
-
+
bm->n = n;
bm->b = TALLOC_ARRAY(mem_ctx, uint32, (n+31)/32);
if (!bm->b) {
diff --git a/source3/lib/conn_tdb.c b/source3/lib/conn_tdb.c
index 22d85c8..fc35361 100644
--- a/source3/lib/conn_tdb.c
+++ b/source3/lib/conn_tdb.c
@@ -2,17 +2,17 @@
Unix SMB/CIFS implementation.
Low-level connections.tdb access functions
Copyright (C) Volker Lendecke 2007
-
+
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 <http://www.gnu.org/licenses/>.
*/
diff --git a/source3/lib/ctdbd_conn.c b/source3/lib/ctdbd_conn.c
index 449e049..0af4204 100644
--- a/source3/lib/ctdbd_conn.c
+++ b/source3/lib/ctdbd_conn.c
@@ -3,17 +3,17 @@
Samba internal messaging functions
Copyright (C) 2007 by Volker Lendecke
Copyright (C) 2007 by Andrew Tridgell
-
+
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 <http://www.gnu.org/licenses/>.
*/
@@ -36,7 +36,7 @@ struct ctdbd_connection {
uint64 rand_srvid;
struct packet_context *pkt;
struct fd_event *fde;
-
+
void (*release_ip_handler)(const char *ip_addr, void *private_data);
void *release_ip_priv;
};
@@ -339,7 +339,7 @@ static NTSTATUS ctdb_read_req(struct ctdbd_connection
*conn, uint32 reqid,
(long long unsigned)msg->srvid));
goto next_pkt;
}
-
+
if ((conn->release_ip_handler != NULL)
&& (msg->srvid == CTDB_SRVID_RELEASE_IP)) {
/* must be dispatched immediately */
@@ -375,7 +375,7 @@ static NTSTATUS ctdb_read_req(struct ctdbd_connection
*conn, uint32 reqid,
TALLOC_FREE(hdr);
msg_state->msg_ctx = conn->msg_ctx;
-
+
/*
* We're waiting for a call reply, but an async message has
* crossed. Defer dispatching to the toplevel event loop.
@@ -391,7 +391,7 @@ static NTSTATUS ctdb_read_req(struct ctdbd_connection
*conn, uint32 reqid,
TALLOC_FREE(hdr);
goto next_pkt;
}
-
+
goto next_pkt;
}
@@ -541,7 +541,6 @@ static NTSTATUS ctdb_handle_message(uint8_t *buf, size_t
length,
TALLOC_FREE(buf);
return NT_STATUS_OK;
-
}
/* only messages to our pid or the broadcast are valid here */
@@ -895,7 +894,7 @@ NTSTATUS ctdbd_migrate(struct ctdbd_connection *conn,
uint32 db_id,
NTSTATUS status;
ZERO_STRUCT(req);
-
+
req.hdr.length = offsetof(struct ctdb_req_call, data) + key.dsize;
req.hdr.ctdb_magic = CTDB_MAGIC;
req.hdr.ctdb_version = CTDB_VERSION;
@@ -957,7 +956,7 @@ NTSTATUS ctdbd_fetch(struct ctdbd_connection *conn, uint32
db_id,
NTSTATUS status;
ZERO_STRUCT(req);
-
+
req.hdr.length = offsetof(struct ctdb_req_call, data) + key.dsize;
req.hdr.ctdb_magic = CTDB_MAGIC;
req.hdr.ctdb_version = CTDB_VERSION;
diff --git a/source3/lib/util_tdb.c b/source3/lib/util_tdb.c
index 5b3d94d..1d210a1 100644
--- a/source3/lib/util_tdb.c
+++ b/source3/lib/util_tdb.c
@@ -4,17 +4,17 @@
Copyright (C) Andrew Tridgell 1992-1998
Copyright (C) Rafal Szczesniak 2002
Copyright (C) Michael Adam 2007
-
+
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 <http://www.gnu.org/licenses/>.
*/
@@ -91,7 +91,7 @@ int tdb_lock_bystring_with_timeout(TDB_CONTEXT *tdb, const
char *keyval,
int timeout)
{
TDB_DATA key = string_term_tdb_data(keyval);
-
+
return tdb_chainlock_with_timeout(tdb, key, timeout);
}
@@ -102,7 +102,7 @@ int tdb_lock_bystring_with_timeout(TDB_CONTEXT *tdb, const
char *keyval,
int tdb_read_lock_bystring_with_timeout(TDB_CONTEXT *tdb, const char *keyval,
unsigned int timeout)
{
TDB_DATA key = string_term_tdb_data(keyval);
-
+
return tdb_chainlock_with_timeout_internal(tdb, key, timeout, F_RDLCK);
}
@@ -113,7 +113,7 @@ int tdb_trans_store_bystring(TDB_CONTEXT *tdb, const char
*keystr,
TDB_DATA data, int flags)
{
TDB_DATA key = string_term_tdb_data(keystr);
-
+
return tdb_trans_store(tdb, key, data, flags);
}
@@ -202,7 +202,7 @@ static size_t tdb_pack_va(uint8 *buf, int bufsize, const
char *fmt, va_list ap)
DEBUG(18,("tdb_pack_va(%s, %d) -> %d\n",
fmt0, bufsize0, (int)PTR_DIFF(buf, buf0)));
-
+
return PTR_DIFF(buf, buf0);
}
diff --git a/source3/lib/winbind_util.c b/source3/lib/winbind_util.c
index df095b9..0c904ac 100644
--- a/source3/lib/winbind_util.c
+++ b/source3/lib/winbind_util.c
@@ -3,17 +3,17 @@
Winbind Utility functions
Copyright (C) Gerald (Jerry) Carter 2007
-
+
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 <http://www.gnu.org/licenses/>.
*/
@@ -113,7 +113,7 @@ bool winbind_lookup_sid(TALLOC_CTX *mem_ctx, const DOM_SID
*sid,
wbcFreeMemory(domain_name);
wbcFreeMemory(account_name);
-
+
if ((domain && !*domain) || (name && !*name)) {
DEBUG(0,("winbind_lookup_sid: talloc() failed!\n"));
return false;
@@ -200,7 +200,7 @@ wbcErr wb_is_trusted_domain(const char *domain)
{
wbcErr result;
struct wbcDomainInfo *info = NULL;
-
+
result = wbcDomainInfo(domain, &info);
if (WBC_ERROR_IS_OK(result)) {
@@ -224,15 +224,15 @@ bool winbind_lookup_rids(TALLOC_CTX *mem_ctx,
struct wbcDomainSid dom_sid;
wbcErr ret;
int i;
-
+
memcpy(&dom_sid, domain_sid, sizeof(struct wbcDomainSid));
-
+
ret = wbcLookupRids(&dom_sid, num_rids, rids,
&dom_name, &namelist, &name_types);
if (ret != WBC_ERR_SUCCESS) {
return false;
}
-
+
*domain_name = talloc_strdup(mem_ctx, dom_name);
*names = TALLOC_ARRAY(mem_ctx, const char*, num_rids);
*types = TALLOC_ARRAY(mem_ctx, enum lsa_SidType, num_rids);
@@ -245,7 +245,7 @@ bool winbind_lookup_rids(TALLOC_CTX *mem_ctx,
wbcFreeMemory(CONST_DISCARD(char*, dom_name));
wbcFreeMemory(namelist);
wbcFreeMemory(name_types);
-
+
return true;
}
@@ -254,9 +254,9 @@ bool winbind_lookup_rids(TALLOC_CTX *mem_ctx,
bool winbind_allocate_uid(uid_t *uid)
{
wbcErr ret;
-
+
ret = wbcAllocateUid(uid);
-
+
return (ret == WBC_ERR_SUCCESS);
}
@@ -265,9 +265,9 @@ bool winbind_allocate_uid(uid_t *uid)
bool winbind_allocate_gid(gid_t *gid)
{
wbcErr ret;
-
+
ret = wbcAllocateGid(gid);
-
+
return (ret == WBC_ERR_SUCCESS);
}
diff --git a/source3/lib/wins_srv.c b/source3/lib/wins_srv.c
index b2c0bf8..6676f02 100644
--- a/source3/lib/wins_srv.c
+++ b/source3/lib/wins_srv.c
@@ -227,7 +227,7 @@ char **wins_srv_tags(void)
/* yes, this is O(n^2) but n is very small */
for (i=0;list[i];i++) {
struct tagged_ip t_ip;
-
+
parse_ip(&t_ip, list[i]);
/* see if we already have it */
@@ -313,7 +313,7 @@ struct in_addr wins_srv_ip_tag(const char *tag, struct
in_addr src_ip)
return t_ip.ip;
}
}
-
+
/* they're all dead - try the first one until they revive */
for (i=0; list[i]; i++) {
parse_ip(&t_ip, list[i]);
--
Samba Shared Repository
