summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMathieu Parent <math.parent@gmail.com>2019-08-29 21:31:07 +0200
committerAndrew Bartlett <abartlet@samba.org>2019-09-01 22:21:26 +0000
commit4449f5d1b8d42ea862f22a80ee7156e04cb95a00 (patch)
treed5dbd1d3fe9691becfa1df5bbbec222b08cf370e
parent6b47c12549c71485d775a6d1b5a631ce79c8f278 (diff)
downloadsamba-4449f5d1b8d42ea862f22a80ee7156e04cb95a00.tar.gz
Spelling fixes s/convertion/conversion/
Signed-off-by: Mathieu Parent <math.parent@gmail.com> Reviewed-by: Andrew Bartlett <abartlet@samba.org> Reviewed-by: Gary Lockyer <gary@catalyst.net.nz>
-rw-r--r--lib/replace/replace.c4
-rw-r--r--lib/replace/wscript2
-rw-r--r--source3/libads/util.c2
3 files changed, 4 insertions, 4 deletions
diff --git a/lib/replace/replace.c b/lib/replace/replace.c
index a14322b8e57..99b18e82590 100644
--- a/lib/replace/replace.c
+++ b/lib/replace/replace.c
@@ -547,7 +547,7 @@ long long int rep_strtoll(const char *str, char **endptr, int base)
if (errno == EINVAL) {
if (base == 0 || (base >1 && base <37)) {
/* Base was ok so it's because we were not
- * able to make the convertion.
+ * able to make the conversion.
* Let's reset errno.
*/
errno = saved_errno;
@@ -583,7 +583,7 @@ unsigned long long int rep_strtoull(const char *str, char **endptr, int base)
if (errno == EINVAL) {
if (base == 0 || (base >1 && base <37)) {
/* Base was ok so it's because we were not
- * able to make the convertion.
+ * able to make the conversion.
* Let's reset errno.
*/
errno = saved_errno;
diff --git a/lib/replace/wscript b/lib/replace/wscript
index 4df1b4d77c4..9af8ac49b2c 100644
--- a/lib/replace/wscript
+++ b/lib/replace/wscript
@@ -404,7 +404,7 @@ def configure(conf):
msg="Checking whether we can use SO_PEERCRED to get socket credentials",
headers='sys/types.h sys/socket.h')
- #Some OS (ie. freebsd) return EINVAL if the convertion could not be done, it's not what we expect
+ #Some OS (ie. freebsd) return EINVAL if the conversion could not be done, it's not what we expect
#Let's detect those cases
if conf.CONFIG_SET('HAVE_STRTOLL'):
conf.CHECK_CODE('''
diff --git a/source3/libads/util.c b/source3/libads/util.c
index 354125b74fe..edbb368a2de 100644
--- a/source3/libads/util.c
+++ b/source3/libads/util.c
@@ -223,7 +223,7 @@ struct spn_struct *parse_spn(TALLOC_CTX *ctx, const char *srvprinc)
|| result->port > 65535
|| errno == ERANGE) {
DBG_ERR("Failed to parse spn %s, port number "
- "convertion failed\n", srvprinc);
+ "conversion failed\n", srvprinc);
errno = 0;
goto fail;
}