Fix some nonempty blank lines

diff --git a/source3/lib/bitmap.c b/source3/lib/bitmap.c
index 5e623f474abcd8e36fd8335385243be3f267ae2c..f753ffd5348a66eada1ac4d061b7d7110b1be6ab 100644 (file)
--- 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 = SMB_MALLOC_P(struct bitmap);
 
        if (!bm) return NULL;

-       
+

        bm->n = n;
        bm->b = SMB_MALLOC_ARRAY(uint32, (n+31)/32);
        if (!bm->b) {
        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 = 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) {
        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 22d85c873d3399c1791c5af15df9a216ea97eb16..fc35361cac7c22adfcecc1b9289646541b38061a 100644 (file)
--- 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
    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 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.
    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/>.
 */
    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 449e049ffa26093cf254e0c5af639aa712967b99..0af420412b5ec566ceb57bbf5310c1a753e1f5a5 100644 (file)
--- 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
    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 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.
    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/>.
 */
    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;
        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;
 };
        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;
                }
                                  (long long unsigned)msg->srvid));
                        goto next_pkt;
                }

-               
+

                if ((conn->release_ip_handler != NULL)
                    && (msg->srvid == CTDB_SRVID_RELEASE_IP)) {
                        /* must be dispatched immediately */
                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;
                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.
                /*
                 * 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;
                }
                        TALLOC_FREE(hdr);
                        goto next_pkt;
                }

-               
+

                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;
                TALLOC_FREE(buf);
 
                return NT_STATUS_OK;

-               

        }
 
        /* only messages to our pid or the broadcast are valid here */
        }
 
        /* 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);
        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;
        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);
        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;
        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 5b3d94dabe3b640af76f5fa19ac89c04fa5b8f5b..1d210a1e579921b0e0cc51cfdfa6b70f1efdf2e5 100644 (file)
--- 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
    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 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.
    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/>.
 */
    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);
                                   int timeout)
 {
        TDB_DATA key = string_term_tdb_data(keyval);

-       
+

        return tdb_chainlock_with_timeout(tdb, key, timeout);
 }
 
        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);
 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);
 }
 
        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);
                             TDB_DATA data, int flags)
 {
        TDB_DATA key = string_term_tdb_data(keystr);

-       
+

        return tdb_trans_store(tdb, key, data, flags);
 }
 
        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)));
 
        DEBUG(18,("tdb_pack_va(%s, %d) -> %d\n", 
                 fmt0, bufsize0, (int)PTR_DIFF(buf, buf0)));

-       
+

        return PTR_DIFF(buf, buf0);
 }
 
        return PTR_DIFF(buf, buf0);
 }
 

diff --git a/source3/lib/winbind_util.c b/source3/lib/winbind_util.c
index df095b9e91c1b84c81953f95255c446110f29f38..0c904ac569e4c00aca6b23fe88a1c27b9930e891 100644 (file)
--- 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
    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 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.
    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/>.
 */
    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);
 
        wbcFreeMemory(domain_name);
        wbcFreeMemory(account_name);

-       
+

        if ((domain && !*domain) || (name && !*name)) {         
                DEBUG(0,("winbind_lookup_sid: talloc() failed!\n"));
                return false;
        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;
 {
        wbcErr result;
        struct wbcDomainInfo *info = NULL;

-       
+

        result = wbcDomainInfo(domain, &info);
 
        if (WBC_ERROR_IS_OK(result)) {
        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;  
        struct wbcDomainSid dom_sid;
        wbcErr ret;
        int i;  

-       
+

        memcpy(&dom_sid, domain_sid, sizeof(struct wbcDomainSid));
        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;
        }       
        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);
        *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);
        wbcFreeMemory(CONST_DISCARD(char*, dom_name));
        wbcFreeMemory(namelist);
        wbcFreeMemory(name_types);

-       
+

        return true;    
 }
 
        return true;    
 }
 


@@ -254,9 +254,9 @@ bool winbind_lookup_rids(TALLOC_CTX *mem_ctx,
 bool winbind_allocate_uid(uid_t *uid)
 {
        wbcErr ret;
 bool winbind_allocate_uid(uid_t *uid)
 {
        wbcErr ret;

-       
+

        ret = wbcAllocateUid(uid);
        ret = wbcAllocateUid(uid);

-       
+

        return (ret == WBC_ERR_SUCCESS);
 }
 
        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;
 bool winbind_allocate_gid(gid_t *gid)
 {
        wbcErr ret;

-       
+

        ret = wbcAllocateGid(gid);
        ret = wbcAllocateGid(gid);

-       
+

        return (ret == WBC_ERR_SUCCESS);
 }
 
        return (ret == WBC_ERR_SUCCESS);
 }
 

diff --git a/source3/lib/wins_srv.c b/source3/lib/wins_srv.c
index b2c0bf8b870613f3ca4876b976beb67bde31b831..6676f02e947929d43a8f277c3c141240124a8027 100644 (file)
--- 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;
        /* 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 */
                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;
                }
        }
                        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]);
        /* they're all dead - try the first one until they revive */
        for (i=0; list[i]; i++) {
                parse_ip(&t_ip, list[i]);