buildtools: Fix comments and documentation

Signed-off-by: Joseph Sutton <josephsutton@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>

diff --git a/buildtools/wafsamba/pkgconfig.py b/buildtools/wafsamba/pkgconfig.py
index b77bd618c8903789c7ba9e64a6972a4e080f1821..417bf030fe483f7724f4c87d3774059113826479 100644 (file)
--- a/buildtools/wafsamba/pkgconfig.py
+++ b/buildtools/wafsamba/pkgconfig.py
@@ -5,7 +5,7 @@ from waflib import Build, Logs
 from samba_utils import SUBST_VARS_RECURSIVE, TO_LIST
 
 def subst_at_vars(task):
-    '''substiture @VAR@ style variables in a file'''
+    '''substitute @VAR@ style variables in a file'''
 
     s = task.inputs[0].read()
     # split on the vars

diff --git a/buildtools/wafsamba/samba_deps.py b/buildtools/wafsamba/samba_deps.py
index 66adf40307e22442bbfafaafb628589375369e5b..80379d37a9cd93cd03ce6fa07540c56eeb893422 100644 (file)
--- a/buildtools/wafsamba/samba_deps.py
+++ b/buildtools/wafsamba/samba_deps.py
@@ -360,7 +360,7 @@ def show_final_deps(bld, tgt_list):
 
 
 def add_samba_attributes(bld, tgt_list):
-    '''ensure a target has a the required samba attributes'''
+    '''ensure a target has the required samba attributes'''
 
     targets = LOCAL_CACHE(bld, 'TARGET_TYPE')
 

diff --git a/buildtools/wafsamba/samba_install.py b/buildtools/wafsamba/samba_install.py
index 2957e16c3da8cea75c8e30a8347fe93a11f1bdec..a43d10398d3f7e07b7788a9ffb3be6158eef2222 100644 (file)
--- a/buildtools/wafsamba/samba_install.py
+++ b/buildtools/wafsamba/samba_install.py
@@ -188,7 +188,7 @@ def symlink_lib(self):
     blddir = os.path.dirname(self.bld.srcnode.abspath(self.bld.env))
     libpath = self.link_task.outputs[0].abspath(self.env)
 
-    # calculat the link target and put it in the environment
+    # calculate the link target and put it in the environment
     soext=""
     vnum = getattr(self, 'vnum', None)
     if vnum is not None:

diff --git a/buildtools/wafsamba/wscript b/buildtools/wafsamba/wscript
index 30cb366331a022e7f8aead582cf2d4403af83f3a..99a623737f1c974ee88efe4a9a82d73b9ea14dc4 100644 (file)
--- a/buildtools/wafsamba/wscript
+++ b/buildtools/wafsamba/wscript
@@ -37,7 +37,7 @@ def options(opt):
                    help=(f'''comma separated list of bundled libraries.
 
 {Context.g_module.APPNAME} includes copies of externally maintained
-system libraries (such as popt, cmokca) as well as Samba-maintained
+system libraries (such as popt, cmocka) as well as Samba-maintained
 libraries that can be found on the system already (such as talloc,
 tdb).
 
@@ -99,7 +99,7 @@ versions of libraries that we include match that found on the system,
 before we will select not to 'bundle'.
 
 This option, possibly useful for packagers, allows that specified
-version to be overridden (say, if it is absolutely known that a the
+version to be overridden (say, if it is absolutely known that the
 newer version included in this tarball has no relevant changes).
 
 Use this with extreme care
@@ -539,7 +539,7 @@ def configure(conf):
         # conf.DEFINE('_XOPEN_SOURCE', 600, add_to_cflags=True)
 
     # we should use the PIC options in waf instead
-    # Some compilo didn't support -fPIC but just print a warning
+    # Some compiler didn't support -fPIC but just print a warning
     if conf.env['COMPILER_CC'] == "suncc":
         conf.ADD_CFLAGS('-KPIC', testflags=True)
         # we really want define here as we need to have this
@@ -552,7 +552,7 @@ def configure(conf):
 
     # On Solaris 8 with suncc (at least) the flags for the linker to define the name of the
     # library are not always working (if the command line is very very long and with a lot
-    # files)
+    # of files)
 
     if conf.env['COMPILER_CC'] == "suncc":
         save = conf.env['SONAME_ST']
@@ -615,7 +615,7 @@ struct foo bar = { .y = 'X', .x = 1 };
 
     # see if we need special largefile flags
     if not conf.CHECK_LARGEFILE():
-        raise Errors.WafError('Samba requires large file support support, but not available on this platform: sizeof(off_t) < 8')
+        raise Errors.WafError('Samba requires large file support, but not available on this platform: sizeof(off_t) < 8')
 
     if conf.env.HAVE_STDDEF_H and conf.env.HAVE_STDLIB_H:
         conf.DEFINE('STDC_HEADERS', 1)
@@ -632,7 +632,7 @@ struct foo bar = { .y = 'X', .x = 1 };
     else:
         conf.define('SHLIBEXT', "so", quote=True)
 
-    # First try a header check for cross-compile friendlyness
+    # First try a header check for cross-compile friendliness
     conf.CHECK_CODE(code = """#ifdef __BYTE_ORDER
                         #define B __BYTE_ORDER
                         #elif defined(BYTE_ORDER)