diff --git a/source_code/main.c b/source_code/main.c index e945025..607f6f1 100644 --- a/source_code/main.c +++ b/source_code/main.c @@ -1445,7 +1445,7 @@ main(void) ASSERT( args.Service != NULL ); /* Set up the name of the program, as it will be - * displayed in the proces status list. + * displayed in the process status list. */ name = FilePart(program_name); @@ -2282,7 +2282,7 @@ add_error_message(const TEXT * fmt,APTR args) /****************************************************************************/ -/* Report an error that has occured; if the program was not launched +/* Report an error that has occurred; if the program was not launched * from Shell, error messages will be accumulated for later display. */ void VARARGS68K diff --git a/source_code/proc.c b/source_code/proc.c index b3ecae2..89dd2ef 100644 --- a/source_code/proc.c +++ b/source_code/proc.c @@ -220,7 +220,7 @@ static const err_code_struct hard_msgs[] = {"ERRbadunit", 20, "Unknown unit"}, {"ERRnotready", 21, "Drive not ready"}, {"ERRbadcmd", 22, "Unknown command"}, - {"ERRdata", 23, "A problem has occured in the physical I/O"}, + {"ERRdata", 23, "A problem has occurred in the physical I/O"}, {"ERRbadreq", 24, "Bad request structure length"}, {"ERRseek", 25, "Seek error"}, {"ERRbadmedia", 26, "Unknown media type"}, @@ -310,7 +310,7 @@ copy_latin1_to_utf16le(const struct smb_server *server, byte * to,int to_size, c int i; // Tygre 21/05/15: Asymmetry - // The arguments of this function are not symetrical + // The arguments of this function are not symmetrical // with those of copy_utf16le_to_latin1(). While in // copy_utf16le_to_latin1(), the "from" represents // a single part of a path, i.e., "toto". Here, the diff --git a/source_code/quad_math.c b/source_code/quad_math.c index e237c1e..04e383f 100644 --- a/source_code/quad_math.c +++ b/source_code/quad_math.c @@ -219,7 +219,7 @@ add_64_plus_64_to_64(const QUAD * const a,const QUAD * const b,QUAD * ab) /* Subtract a 64 bit integer from another 64 bit integer, producing a * 64 bit integer difference, returning a 32 bit integer that indicates - * whether or not an underflow occured. + * whether or not an underflow occurred. */ ULONG subtract_64_from_64_to_64(const QUAD * const minuend,const QUAD * const subtrahend,QUAD * difference) diff --git a/source_code/smb_abstraction.c b/source_code/smb_abstraction.c index 936ee3e..5d8cb20 100644 --- a/source_code/smb_abstraction.c +++ b/source_code/smb_abstraction.c @@ -345,7 +345,7 @@ smba_connect ( report_error("Not enough memory."); (*error_ptr) = ENOMEM; - goto error_occured; + goto error_occurred; } memset (res, 0, sizeof(*res)); @@ -429,7 +429,7 @@ smba_connect ( (*error_ptr) = ENOMEM; report_error("Directory cache initialization failed (%ld, %s).",(*error_ptr),posix_strerror(*error_ptr)); - goto error_occured; + goto error_occurred; } strlcpy(data.workgroup_name,workgroup_name,sizeof(data.workgroup_name)); @@ -441,7 +441,7 @@ smba_connect ( if(gethostname (hostname, MAXHOSTNAMELEN) < 0) { report_error("Could not look up local host name (%ld, %s).",(*error_ptr),posix_strerror(*error_ptr)); - goto error_occured; + goto error_occurred; } /* Only retain the host name, drop any domain names following it. */ @@ -491,7 +491,7 @@ smba_connect ( report_error("Port number '%s' is out of range.", tcp_service_name); (*error_ptr) = EINVAL; - goto error_occured; + goto error_occurred; } } else @@ -499,7 +499,7 @@ smba_connect ( report_error("Invalid service '%s'.", tcp_service_name); (*error_ptr) = EINVAL; - goto error_occured; + goto error_occurred; } } } @@ -538,7 +538,7 @@ smba_connect ( report_error("socket() call failed (%ld, %s).", errno, posix_strerror(errno)); (*error_ptr) = errno; - goto error_occured; + goto error_occurred; } strlcpy (data.service, connect_parameters->service, sizeof(data.service)); @@ -569,7 +569,7 @@ smba_connect ( report_error("Server name '%s' is too long for NetBIOS (%ld characters are possible).",connect_parameters->server_ipname,16); (*error_ptr) = ENAMETOOLONG; - goto error_occured; + goto error_occurred; } strlcpy (data.server_name, connect_parameters->server_ipname, sizeof(data.server_name)); @@ -584,7 +584,7 @@ smba_connect ( report_error("Local host name '%s' is too long for NetBIOS (%ld characters are possible).", hostname, 16); (*error_ptr) = ENAMETOOLONG; - goto error_occured; + goto error_occurred; } strlcpy (data.client_name, hostname, sizeof(data.client_name)); @@ -600,7 +600,7 @@ smba_connect ( res->server.latin1_to_utf16le_sizes = kvs_create(strcmp); if (smb_proc_connect (&res->server, error_ptr) < 0) - goto error_occured; + goto error_occurred; if (!use_E) res->supports_E_known = TRUE; @@ -610,7 +610,7 @@ smba_connect ( result = 0; - error_occured: + error_occurred: if(res != NULL) { @@ -1811,7 +1811,7 @@ smba_readdir (smba_file_t * f, int offs, int restart, void *callback_data, smba_ D(("cachefill returned %ld entries", num_entries)); /* The cache may have been invalidated because an error - * occured (e.g. server connection was terminated), or if + * occurred (e.g. server connection was terminated), or if * the cache size was changed. */ if (f->dircache == NULL || !f->dircache->is_valid)