sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-26 18:50:30 +03:00
Code

Correct "occured" typos.

Browse Source 
Signed-off-by: Chris Lamb <chris@chris-lamb.co.uk>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Garming Sam <garming@catalyst.net.nz>
This commit is contained in:
Chris Lamb 2017-02-18 08:46:28 +13:00 committed by Garming Sam
parent f7dc9f1e12
commit a4ab7c73bd
15 changed files with 46 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ctdb/common/rb_tree.c
View File

@ -543,7 +543,7 @@ delete_node(trbt_node_t *node, bool from_destructor)
This is simple since this dummy node originally had no children
and we are guaranteed that it will also not have any children
after the node has been deleted and any possible rotations
have occured.
have occurred.
The only special case is if this was the last node of the tree
in which case we have to reset the root to NULL as well.

2
ctdb/doc/ctdb.1.xml
View File

@ -1590,7 +1590,7 @@ RUNNING
</para>
<para>
TCP tickles are useful to "tickle" clients after a IP failover has
occured since this will make the client immediately recognize the
occurred since this will make the client immediately recognize the
TCP connection has been disrupted and that the client will need
to reestablish. This greatly speeds up the time it takes for a client
to detect and reestablish after an IP failover in the ctdb cluster.

2
ctdb/doc/recovery-process.txt
View File

@ -221,7 +221,7 @@ Make sure to find which node is the recovery master and check the log for that n
Example log entries that start in column 1 are expected to be present in the
log. Example log entries that are indented 3 columns are optional and might
only be present if an error occured.
only be present if an error occurred.
1, Log that recovery has been initiated.

10
lib/krb5_wrap/krb5_samba.c
View File

@ -144,7 +144,7 @@ const krb5_data *krb5_princ_component(krb5_context context,
*
* @param[out] pkaddr A Kerberos address to store tha address in.
*
* @return True on success, false if an error occured.
* @return True on success, false if an error occurred.
*/
bool smb_krb5_sockaddr_to_kaddr(struct sockaddr_storage *paddr,
krb5_address *pkaddr)
@ -177,7 +177,7 @@ bool smb_krb5_sockaddr_to_kaddr(struct sockaddr_storage *paddr,
*
* @param[in] pkaddr A Kerberos address to store tha address in.
*
* @return True on success, false if an error occured.
* @return True on success, false if an error occurred.
*/
bool smb_krb5_sockaddr_to_kaddr(struct sockaddr_storage *paddr,
krb5_address *pkaddr)
@ -2566,7 +2566,7 @@ krb5_error_code smb_krb5_make_pac_checksum(TALLOC_CTX *mem_ctx,
*
* @param[in] principal The principal to get the realm from.
*
* @return An allocated string with the realm or NULL if an error occured.
* @return An allocated string with the realm or NULL if an error occurred.
*
* The caller must free the realm string with free() if not needed anymore.
*/
@ -2744,7 +2744,7 @@ static char *smb_krb5_get_realm_from_hostname(TALLOC_CTX *mem_ctx,
* @param[in] default_realm The default_realm if we cannot get it from the
* hostname or netbios name.
*
* @return A talloc'ed principal string or NULL if an error occured.
* @return A talloc'ed principal string or NULL if an error occurred.
*
* The caller needs to free the principal with talloc_free() if it isn't needed
* anymore.
@ -2796,7 +2796,7 @@ char *smb_krb5_get_principal_from_service_hostname(TALLOC_CTX *mem_ctx,
*
* @param[in] mem_ctx The talloc context to allocate the error string on.
*
* @return A talloc'ed error string or NULL if an error occured.
* @return A talloc'ed error string or NULL if an error occurred.
*
* The caller must free the returned error string with talloc_free() if not
* needed anymore

44
lib/smbconf/smbconf.h
View File

@ -137,7 +137,7 @@ bool smbconf_changed(struct smbconf_ctx *ctx, struct smbconf_csn *csn,
* @param[in] ctx The smbconf context to drop the config.
*
* @return SBC_ERR_OK on success, a corresponding sbcErr if an
* error occured.
* error occurred.
*/
sbcErr smbconf_drop(struct smbconf_ctx *ctx);
@ -153,7 +153,7 @@ sbcErr smbconf_drop(struct smbconf_ctx *ctx);
* @param[out] services A pointer to store the services.
*
* @return SBC_ERR_OK on success, a corresponding sbcErr if an
* error occured.
* error occurred.
*
* @see smbconf_service
*/
@ -174,7 +174,7 @@ sbcErr smbconf_get_config(struct smbconf_ctx *ctx,
* @param[in] share_names A pointer to store the share names.
*
* @return SBC_ERR_OK on success, a corresponding sbcErr if an
* error occured.
* error occurred.
*/
sbcErr smbconf_get_share_names(struct smbconf_ctx *ctx,
TALLOC_CTX *mem_ctx,
@ -200,7 +200,7 @@ bool smbconf_share_exists(struct smbconf_ctx *ctx, const char *servicename);
* @param[in] servicename The name of the service to add.
*
* @return SBC_ERR_OK on success, a corresponding sbcErr if an
* error occured.
* error occurred.
*/
sbcErr smbconf_create_share(struct smbconf_ctx *ctx, const char *servicename);
@ -212,7 +212,7 @@ sbcErr smbconf_create_share(struct smbconf_ctx *ctx, const char *servicename);
* @param[in] service The definition for the added service.
*
* @return SBC_ERR_OK on success, a corresponding sbcErr if an
* error occured.
* error occurred.
*/
sbcErr smbconf_create_set_share(struct smbconf_ctx *ctx,
struct smbconf_service *service);
@ -230,7 +230,7 @@ sbcErr smbconf_create_set_share(struct smbconf_ctx *ctx,
* share.
*
* @return SBC_ERR_OK on success, a corresponding sbcErr if an
* error occured.
* error occurred.
*
* @see smbconf_service
*/
@ -247,7 +247,7 @@ sbcErr smbconf_get_share(struct smbconf_ctx *ctx,
* @param[in] servicename The service name to delete.
*
* @return SBC_ERR_OK on success, a corresponding sbcErr if an
* error occured.
* error occurred.
*/
sbcErr smbconf_delete_share(struct smbconf_ctx *ctx,
const char *servicename);
@ -264,7 +264,7 @@ sbcErr smbconf_delete_share(struct smbconf_ctx *ctx,
* @param[in] valstr The value to set.
*
* @return SBC_ERR_OK on success, a corresponding sbcErr if an
* error occured.
* error occurred.
*/
sbcErr smbconf_set_parameter(struct smbconf_ctx *ctx,
const char *service,
@ -284,7 +284,7 @@ sbcErr smbconf_set_parameter(struct smbconf_ctx *ctx,
* @param[in] val The value to set.
*
* @return SBC_ERR_OK on success, a corresponding sbcErr if an
* error occured.
* error occurred.
*/
sbcErr smbconf_set_global_parameter(struct smbconf_ctx *ctx,
const char *param, const char *val);
@ -303,7 +303,7 @@ sbcErr smbconf_set_global_parameter(struct smbconf_ctx *ctx,
* @param[out] valstr A pointer to store the value as a string.
*
* @return SBC_ERR_OK on success, a corresponding sbcErr if an
* error occured.
* error occurred.
*/
sbcErr smbconf_get_parameter(struct smbconf_ctx *ctx,
TALLOC_CTX *mem_ctx,
@ -325,7 +325,7 @@ sbcErr smbconf_get_parameter(struct smbconf_ctx *ctx,
* @param[out] valstr A pointer to store the value as a string.
*
* @return SBC_ERR_OK on success, a corresponding sbcErr if an
* error occured.
* error occurred.
*/
sbcErr smbconf_get_global_parameter(struct smbconf_ctx *ctx,
TALLOC_CTX *mem_ctx,
@ -342,7 +342,7 @@ sbcErr smbconf_get_global_parameter(struct smbconf_ctx *ctx,
* @param[in] param The name of the parameter to delete.
*
* @return SBC_ERR_OK on success, a corresponding sbcErr if an
* error occured.
* error occurred.
*/
sbcErr smbconf_delete_parameter(struct smbconf_ctx *ctx,
const char *service, const char *param);
@ -357,7 +357,7 @@ sbcErr smbconf_delete_parameter(struct smbconf_ctx *ctx,
* @param[in] param The name of the parameter to delete.
*
* @return SBC_ERR_OK on success, a corresponding sbcErr if an
* error occured.
* error occurred.
*/
sbcErr smbconf_delete_global_parameter(struct smbconf_ctx *ctx,
const char *param);
@ -376,7 +376,7 @@ sbcErr smbconf_delete_global_parameter(struct smbconf_ctx *ctx,
* @param[out] includes A pointer to store the paths of the included files.
*
* @return SBC_ERR_OK on success, a corresponding sbcErr if an
* error occured.
* error occurred.
*/
sbcErr smbconf_get_includes(struct smbconf_ctx *ctx,
TALLOC_CTX *mem_ctx,
@ -395,7 +395,7 @@ sbcErr smbconf_get_includes(struct smbconf_ctx *ctx,
* @param[out] includes A pointer to store the paths of the included files.
*
* @return SBC_ERR_OK on success, a corresponding sbcErr if an
* error occured.
* error occurred.
*/
sbcErr smbconf_get_global_includes(struct smbconf_ctx *ctx,
TALLOC_CTX *mem_ctx,
@ -413,7 +413,7 @@ sbcErr smbconf_get_global_includes(struct smbconf_ctx *ctx,
* @param[in] includes A list of paths to include.
*
* @return SBC_ERR_OK on success, a corresponding sbcErr if an
* error occured.
* error occurred.
*/
sbcErr smbconf_set_includes(struct smbconf_ctx *ctx,
const char *service,
@ -429,7 +429,7 @@ sbcErr smbconf_set_includes(struct smbconf_ctx *ctx,
* @param[in] includes A list of paths to include.
*
* @return SBC_ERR_OK on success, a corresponding sbcErr if an
* error occured.
* error occurred.
*/
sbcErr smbconf_set_global_includes(struct smbconf_ctx *ctx,
uint32_t num_includes,
@ -443,7 +443,7 @@ sbcErr smbconf_set_global_includes(struct smbconf_ctx *ctx,
* @param[in] service The name of the service to delete the includes from.
*
* @return SBC_ERR_OK on success, a corresponding sbcErr if an
* error occured.
* error occurred.
*/
sbcErr smbconf_delete_includes(struct smbconf_ctx *ctx, const char *service);
@ -453,7 +453,7 @@ sbcErr smbconf_delete_includes(struct smbconf_ctx *ctx, const char *service);
* @param[in] ctx The smbconf context to use.
*
* @return SBC_ERR_OK on success, a corresponding sbcErr if an
* error occured.
* error occurred.
*/
sbcErr smbconf_delete_global_includes(struct smbconf_ctx *ctx);
@ -466,7 +466,7 @@ sbcErr smbconf_delete_global_includes(struct smbconf_ctx *ctx);
* @param[in] ctx The smbconf context to start the transaction.
*
* @return SBC_ERR_OK on success, a corresponding sbcErr if an
* error occured.
* error occurred.
*/
sbcErr smbconf_transaction_start(struct smbconf_ctx *ctx);
@ -479,7 +479,7 @@ sbcErr smbconf_transaction_start(struct smbconf_ctx *ctx);
* @param[in] ctx The smbconf context to commit the transaction.
*
* @return SBC_ERR_OK on success, a corresponding sbcErr if an
* error occured.
* error occurred.
*
* @see smbconf_transaction_start()
*/
@ -494,7 +494,7 @@ sbcErr smbconf_transaction_commit(struct smbconf_ctx *ctx);
* @param[in] ctx The smbconf context to cancel the transaction.
*
* @return SBC_ERR_OK on success, a corresponding sbcErr if an
* error occured.
* error occurred.
*
* @see smbconf_transaction_start()
*/

2
lib/util/modules.c
View File

@ -40,7 +40,7 @@ init_module_fn load_module(const char *path, bool is_probe, void **handle_out)
handle = dlopen(path, RTLD_NOW);
/* This call should reset any possible non-fatal errors that
occured since last call to dl* functions */
occurred since last call to dl* functions */
error = dlerror();
if (handle == NULL) {

4
source3/lib/netapi/examples/netdomjoin-gui/netdomjoin-gui.c
View File

@ -741,7 +741,7 @@ static void callback_do_join(GtkWidget *widget,
GTK_DIALOG_DESTROY_WITH_PARENT,
GTK_MESSAGE_ERROR,
GTK_BUTTONS_CLOSE,
"The following error occured attempting to unjoin the %s: \"%s\": %s",
"The following error occurred attempting to unjoin the %s: \"%s\": %s",
initial_workgroup_type,
state->name_buffer_initial,
err_str);
@ -830,7 +830,7 @@ static void callback_do_join(GtkWidget *widget,
GTK_DIALOG_DESTROY_WITH_PARENT,
GTK_MESSAGE_ERROR,
GTK_BUTTONS_CLOSE,
"The following error occured attempting to join the %s: \"%s\": %s",
"The following error occurred attempting to join the %s: \"%s\": %s",
new_workgroup_type,
state->name_buffer_new,
err_str);

2
source3/libads/ldap.c
View File

@ -1925,7 +1925,7 @@ bool ads_element_in_array(const char **el_array, size_t num_el, const char *el)
*
* @param[in] num_spns The number of principals stored in the array.
*
* @return 0 on success, or a ADS error if a failure occured.
* @return 0 on success, or a ADS error if a failure occurred.
*/
ADS_STATUS ads_get_service_principal_names(TALLOC_CTX *mem_ctx,
ADS_STRUCT *ads,

4
source3/modules/vfs_fruit.c
View File

@ -703,7 +703,7 @@ static bool ad_unpack(struct adouble *ad, const size_t nentries,
* bytes containing packed xattrs. Netatalk can't deal with that, so
* we simply discard the packed xattrs.
*
* @return -1 in case an error occured, 0 if no conversion was done, 1
* @return -1 in case an error occurred, 0 if no conversion was done, 1
* otherwise
**/
static int ad_convert(struct adouble *ad, int fd)
@ -1680,7 +1680,7 @@ static off_t denymode_to_netatalk_brl(enum apple_fork fork_type,
* Call fcntl() with an exclusive F_GETLK request in order to
* determine if there's an exisiting shared lock
*
* @return true if the requested lock was found or any error occured
* @return true if the requested lock was found or any error occurred
* false if the lock was not found
**/
static bool test_netatalk_lock(files_struct *fsp, off_t in_offset)

4
source3/rpc_client/cli_lsarpc.c
View File

@ -429,7 +429,7 @@ NTSTATUS dcerpc_lsa_lookup_sids_generic(struct dcerpc_binding_handle *h,
!NT_STATUS_EQUAL(hunk_result, STATUS_SOME_UNMAPPED) &&
!NT_STATUS_EQUAL(hunk_result, NT_STATUS_NONE_MAPPED))
{
/* An actual error occured */
/* An actual error occurred */
*presult = hunk_result;
goto fail;
}
@ -618,7 +618,7 @@ NTSTATUS dcerpc_lsa_lookup_names_generic(struct dcerpc_binding_handle *h,
if (!NT_STATUS_IS_OK(*presult) &&
!NT_STATUS_EQUAL(*presult, STATUS_SOME_UNMAPPED)) {
/* An actual error occured */
/* An actual error occurred */
goto done;
}

6
source3/rpc_server/rpc_ncacn_np.c
View File

@ -543,7 +543,7 @@ static NTSTATUS rpcint_binding_handle_ex(TALLOC_CTX *mem_ctx,
* dcerpc_binding_handle
*
* @return NT_STATUS_OK on success, a corresponding NT status if an
* error occured.
* error occurred.
*
* @code
* struct dcerpc_binding_handle *winreg_binding;
@ -590,7 +590,7 @@ NTSTATUS rpcint_binding_handle(TALLOC_CTX *mem_ctx,
* @param[out] presult A pointer to store the connected rpc client pipe.
*
* @return NT_STATUS_OK on success, a corresponding NT status if an
* error occured.
* error occurred.
*/
NTSTATUS rpc_pipe_open_internal(TALLOC_CTX *mem_ctx,
const struct ndr_interface_table *ndr_table,
@ -1015,7 +1015,7 @@ done:
* @param[out] presult A pointer to store the connected rpc client pipe.
*
* @return NT_STATUS_OK on success, a corresponding NT status if an
* error occured.
* error occurred.
*
* @code
* struct rpc_pipe_client *winreg_pipe;

2
source3/rpc_server/spoolss/srv_spoolss_nt.c
View File

@ -5949,7 +5949,7 @@ WERROR _spoolss_StartDocPrinter(struct pipes_struct *p,
Printer->devmode,
&Printer->jobid);
/* An error occured in print_job_start() so return an appropriate
/* An error occurred in print_job_start() so return an appropriate
NT error code. */
if (!W_ERROR_IS_OK(werr)) {

2
source3/winbindd/wb_group_members.c
View File

@ -206,7 +206,7 @@ static void wb_groups_members_done(struct tevent_req *subreq)
/*
* In this error handling here we might have to be a bit more generous
* and just continue if an error occured.
* and just continue if an error occurred.
*/
if (!NT_STATUS_IS_OK(status)) {

4
source4/selftest/win/wintest_setup.exp
View File

@ -10,7 +10,7 @@ proc setup_test { remote_prompt sharepath sharename username local_hostname \
set err_str [create_directory $remote_prompt $sharepath]
if { $err_str != "OK" } {
if { $err_str != "Directory already exists" } {
puts stderr "\nUnexpected error occured in setup_test.\n"
puts stderr "\nUnexpected error occurred in setup_test.\n"
puts stderr "Function create_directory returned $err_str."
} else {
puts stdout "\nDirectory $sharepath exists."
@ -33,7 +33,7 @@ proc setup_test { remote_prompt sharepath sharename username local_hostname \
$sharename]
if { $err_str != "OK" } {
if { $err_str != "The name has already been shared" } {
puts stderr "\nUnexpected error occured in setup_test."
puts stderr "\nUnexpected error occurred in setup_test."
puts stderr "Function create_share returned $err_str."
} else {
puts stdout "\nShare $sharename exists."

2
source4/torture/basic/misc.c
View File

@ -967,7 +967,7 @@ bool run_benchrw(struct torture_context *tctx)
req->async.fn = benchrw_callback;
req->async.private_data=state[i];
break;
/* error occured , finish */
/* error occurred , finish */
case ERROR:
finished++;
success=false;