From 50be0b2c1e7e0573245e21df886ab491a0738226 Mon Sep 17 00:00:00 2001 From: Günther Deschner Date: Wed, 2 Feb 2011 12:50:42 +0100 Subject: s3: Remove superfluous ; MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Guenther Autobuild-User: Günther Deschner Autobuild-Date: Wed Feb 2 15:44:21 CET 2011 on sn-devel-104 --- source3/lib/ctdbd_conn.c | 2 +- source3/lib/secdesc.c | 8 ++++---- source3/modules/vfs_acl_common.c | 4 ++-- source3/modules/vfs_xattr_tdb.c | 4 ++-- source3/nmbd/nmbd_winsserver.c | 2 +- source3/registry/regfio.c | 2 +- source3/rpc_client/cli_pipe_schannel.c | 2 +- source3/rpc_server/srv_samr_nt.c | 2 +- source3/rpc_server/srv_spoolss_nt.c | 2 +- source3/rpc_server/srv_spoolss_util.c | 2 +- source3/rpc_server/srv_srvsvc_nt.c | 2 +- source3/rpcclient/cmd_spoolss.c | 2 +- source3/winbindd/winbindd_lookupsid.c | 2 +- 13 files changed, 18 insertions(+), 18 deletions(-) diff --git a/source3/lib/ctdbd_conn.c b/source3/lib/ctdbd_conn.c index d2016932c9..bad5285026 100644 --- a/source3/lib/ctdbd_conn.c +++ b/source3/lib/ctdbd_conn.c @@ -155,7 +155,7 @@ static bool ctdbd_working(struct ctdbd_connection *conn, uint32_t vnn) ret = true; fail: TALLOC_FREE(outdata.dptr); - return ret;; + return ret; } uint32 ctdbd_vnn(const struct ctdbd_connection *conn) diff --git a/source3/lib/secdesc.c b/source3/lib/secdesc.c index 9ceba10015..001eccb576 100644 --- a/source3/lib/secdesc.c +++ b/source3/lib/secdesc.c @@ -266,7 +266,7 @@ NTSTATUS marshall_sec_desc(TALLOC_CTX *mem_ctx, if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) { DEBUG(0, ("ndr_push_security_descriptor failed: %s\n", ndr_errstr(ndr_err))); - return ndr_map_error2ntstatus(ndr_err);; + return ndr_map_error2ntstatus(ndr_err); } *data = blob.data; @@ -292,7 +292,7 @@ NTSTATUS marshall_sec_desc_buf(TALLOC_CTX *mem_ctx, if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) { DEBUG(0, ("ndr_push_sec_desc_buf failed: %s\n", ndr_errstr(ndr_err))); - return ndr_map_error2ntstatus(ndr_err);; + return ndr_map_error2ntstatus(ndr_err); } *data = blob.data; @@ -328,7 +328,7 @@ NTSTATUS unmarshall_sec_desc(TALLOC_CTX *mem_ctx, uint8 *data, size_t len, DEBUG(0, ("ndr_pull_security_descriptor failed: %s\n", ndr_errstr(ndr_err))); TALLOC_FREE(result); - return ndr_map_error2ntstatus(ndr_err);; + return ndr_map_error2ntstatus(ndr_err); } *psecdesc = result; @@ -364,7 +364,7 @@ NTSTATUS unmarshall_sec_desc_buf(TALLOC_CTX *mem_ctx, uint8_t *data, size_t len, DEBUG(0, ("ndr_pull_sec_desc_buf failed: %s\n", ndr_errstr(ndr_err))); TALLOC_FREE(result); - return ndr_map_error2ntstatus(ndr_err);; + return ndr_map_error2ntstatus(ndr_err); } *psecdesc_buf = result; diff --git a/source3/modules/vfs_acl_common.c b/source3/modules/vfs_acl_common.c index 3296ddc55c..c89ca7a806 100644 --- a/source3/modules/vfs_acl_common.c +++ b/source3/modules/vfs_acl_common.c @@ -86,7 +86,7 @@ static NTSTATUS parse_acl_blob(const DATA_BLOB *pblob, if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) { DEBUG(5, ("parse_acl_blob: ndr_pull_xattr_NTACL failed: %s\n", ndr_errstr(ndr_err))); - return ndr_map_error2ntstatus(ndr_err);; + return ndr_map_error2ntstatus(ndr_err); } switch (xacl.version) { @@ -153,7 +153,7 @@ static NTSTATUS create_acl_blob(const struct security_descriptor *psd, if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) { DEBUG(5, ("create_acl_blob: ndr_push_xattr_NTACL failed: %s\n", ndr_errstr(ndr_err))); - return ndr_map_error2ntstatus(ndr_err);; + return ndr_map_error2ntstatus(ndr_err); } return NT_STATUS_OK; diff --git a/source3/modules/vfs_xattr_tdb.c b/source3/modules/vfs_xattr_tdb.c index 435b39a0d6..594f2e635c 100644 --- a/source3/modules/vfs_xattr_tdb.c +++ b/source3/modules/vfs_xattr_tdb.c @@ -56,7 +56,7 @@ static NTSTATUS xattr_tdb_pull_attrs(TALLOC_CTX *mem_ctx, DEBUG(0, ("ndr_pull_tdb_xattrs failed: %s\n", ndr_errstr(ndr_err))); TALLOC_FREE(result); - return ndr_map_error2ntstatus(ndr_err);; + return ndr_map_error2ntstatus(ndr_err); } *presult = result; @@ -80,7 +80,7 @@ static NTSTATUS xattr_tdb_push_attrs(TALLOC_CTX *mem_ctx, if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) { DEBUG(0, ("ndr_push_tdb_xattrs failed: %s\n", ndr_errstr(ndr_err))); - return ndr_map_error2ntstatus(ndr_err);; + return ndr_map_error2ntstatus(ndr_err); } *data = make_tdb_data(blob.data, blob.length); diff --git a/source3/nmbd/nmbd_winsserver.c b/source3/nmbd/nmbd_winsserver.c index d4580e41c5..2f48bc737f 100644 --- a/source3/nmbd/nmbd_winsserver.c +++ b/source3/nmbd/nmbd_winsserver.c @@ -2138,7 +2138,7 @@ void wins_process_name_release_request(struct subnet_record *subrec, uint16 nb_flags = get_nb_flags(nmb->additional->rdata); struct name_record *namerec = NULL; struct in_addr from_ip; - bool releasing_group_name = (nb_flags & NB_GROUP) ? True : False;; + bool releasing_group_name = (nb_flags & NB_GROUP) ? True : False; putip((char *)&from_ip,&nmb->additional->rdata[2]); diff --git a/source3/registry/regfio.c b/source3/registry/regfio.c index 7ab262d822..e300b144cf 100644 --- a/source3/registry/regfio.c +++ b/source3/registry/regfio.c @@ -1478,7 +1478,7 @@ static REGF_HBIN* regf_hbin_allocate( REGF_FILE *file, uint32 block_size ) hbin->file_off = sbuf.st_ex_size; hbin->free_off = HBIN_HEADER_REC_SIZE; - hbin->free_size = block_size - hbin->free_off + sizeof(uint32);; + hbin->free_size = block_size - hbin->free_off + sizeof(uint32); hbin->block_size = block_size; hbin->first_hbin_off = hbin->file_off - REGF_BLOCKSIZE; diff --git a/source3/rpc_client/cli_pipe_schannel.c b/source3/rpc_client/cli_pipe_schannel.c index 7bc8d80ec9..2c605c6c40 100644 --- a/source3/rpc_client/cli_pipe_schannel.c +++ b/source3/rpc_client/cli_pipe_schannel.c @@ -76,7 +76,7 @@ static NTSTATUS get_schannel_session_key_common(struct rpc_pipe_client *netlogon return NT_STATUS_INVALID_NETWORK_RESPONSE; } - return NT_STATUS_OK;; + return NT_STATUS_OK; } /**************************************************************************** diff --git a/source3/rpc_server/srv_samr_nt.c b/source3/rpc_server/srv_samr_nt.c index 116d529025..5087ec322a 100644 --- a/source3/rpc_server/srv_samr_nt.c +++ b/source3/rpc_server/srv_samr_nt.c @@ -1491,7 +1491,7 @@ NTSTATUS _samr_QueryDisplayInfo(struct pipes_struct *p, temp_size=max_entries*struct_size; if (temp_size > r->in.buf_size) { - max_entries = MIN((r->in.buf_size / struct_size),max_entries);; + max_entries = MIN((r->in.buf_size / struct_size),max_entries); DEBUG(5, ("_samr_QueryDisplayInfo: buffer size limits to " "only %d entries\n", max_entries)); } diff --git a/source3/rpc_server/srv_spoolss_nt.c b/source3/rpc_server/srv_spoolss_nt.c index defffb6923..a06e643cb8 100644 --- a/source3/rpc_server/srv_spoolss_nt.c +++ b/source3/rpc_server/srv_spoolss_nt.c @@ -4798,7 +4798,7 @@ static WERROR string_array_from_driver_info(TALLOC_CTX *mem_ctx, const char **array = NULL; if (string_array == NULL) { - return WERR_INVALID_PARAMETER;; + return WERR_INVALID_PARAMETER; } for (i=0; string_array[i] && string_array[i][0] != '\0'; i++) { diff --git a/source3/rpc_server/srv_spoolss_util.c b/source3/rpc_server/srv_spoolss_util.c index 79549ac90e..70601c862d 100644 --- a/source3/rpc_server/srv_spoolss_util.c +++ b/source3/rpc_server/srv_spoolss_util.c @@ -461,7 +461,7 @@ static WERROR winreg_printer_enumvalues(TALLOC_CTX *mem_ctx, uint8_t *data; uint32_t data_size; uint32_t length; - char n = '\0';; + char n = '\0'; name_buf.name = &n; name_buf.size = max_valnamelen + 2; diff --git a/source3/rpc_server/srv_srvsvc_nt.c b/source3/rpc_server/srv_srvsvc_nt.c index 82b89390db..fe325d2a33 100644 --- a/source3/rpc_server/srv_srvsvc_nt.c +++ b/source3/rpc_server/srv_srvsvc_nt.c @@ -387,7 +387,7 @@ static void init_srv_share_info_502(struct pipes_struct *p, struct sec_desc_buf *sd_buf = NULL; size_t sd_size = 0; TALLOC_CTX *ctx = p->mem_ctx; - char *remark = talloc_strdup(ctx, lp_comment(snum));; + char *remark = talloc_strdup(ctx, lp_comment(snum)); if (remark) { remark = talloc_sub_advanced( diff --git a/source3/rpcclient/cmd_spoolss.c b/source3/rpcclient/cmd_spoolss.c index 248996e274..25a1ff6255 100644 --- a/source3/rpcclient/cmd_spoolss.c +++ b/source3/rpcclient/cmd_spoolss.c @@ -1890,7 +1890,7 @@ static WERROR cmd_spoolss_setdriver(struct rpc_pipe_client *cli, } if (!W_ERROR_IS_OK(result)) { printf("SetPrinter call failed!\n"); - goto done;; + goto done; } printf("Successfully set %s to driver %s.\n", argv[1], argv[2]); diff --git a/source3/winbindd/winbindd_lookupsid.c b/source3/winbindd/winbindd_lookupsid.c index 596699f4f1..f38dc71c3a 100644 --- a/source3/winbindd/winbindd_lookupsid.c +++ b/source3/winbindd/winbindd_lookupsid.c @@ -54,7 +54,7 @@ struct tevent_req *winbindd_lookupsid_send(TALLOC_CTX *mem_ctx, if (!string_to_sid(&state->sid, request->data.sid)) { DEBUG(5, ("%s not a SID\n", request->data.sid)); tevent_req_nterror(req, NT_STATUS_INVALID_PARAMETER); - return tevent_req_post(req, ev);; + return tevent_req_post(req, ev); } subreq = wb_lookupsid_send(state, ev, &state->sid); -- cgit