[PATCH 2/2] python: fix typos

[PATCH 2/2] python: fix typos

[Christian Göttsche]

From: Christian Göttsche <cgzones@googlemail.com>

Found by codespell(1) and typos[1].

[1]: https://github.com/crate-ci/typos

Signed-off-by: Christian Göttsche <cgzones@googlemail.com>
---
 python/sepolgen/src/sepolgen/module.py      | 2 +-
 python/sepolgen/src/sepolgen/objectmodel.py | 2 +-
 python/sepolgen/src/sepolgen/refpolicy.py   | 6 +++---
 python/sepolicy/sepolicy/sepolicy.glade     | 6 +++---
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/python/sepolgen/src/sepolgen/module.py b/python/sepolgen/src/sepolgen/module.py
index 745364cd..b7d64627 100644
--- a/python/sepolgen/src/sepolgen/module.py
+++ b/python/sepolgen/src/sepolgen/module.py
@@ -111,7 +111,7 @@ class ModuleCompiler:
      .semodule_package [string] Fully qualified path to the module
                    packager. Defaults to /usr/bin/semodule_package.
      .output       [file object] File object used to write verbose
-                   output of the compililation and packaging process.
+                   output of the compilation and packaging process.
     """
     def __init__(self, output=None):
         """Create a ModuleCompiler instance, optionally with an
diff --git a/python/sepolgen/src/sepolgen/objectmodel.py b/python/sepolgen/src/sepolgen/objectmodel.py
index ccce86c1..29c18ec8 100644
--- a/python/sepolgen/src/sepolgen/objectmodel.py
+++ b/python/sepolgen/src/sepolgen/objectmodel.py
@@ -59,7 +59,7 @@ implicitly_typed_objects = ["socket", "fd", "process", "file", "lnk_file", "fifo
 # to and object ("write") or to a subject from an object ("read"). Read
 # or write is described from the subject point-of-view. It is also possible
 # for a permission to represent both a read and write (though the flow is
-# typical asymettric in terms of bandwidth). It is also possible for
+# typical asymmetric in terms of bandwidth). It is also possible for
 # permission to not flow information (meaning that the result is pure
 # side-effect).
 #
diff --git a/python/sepolgen/src/sepolgen/refpolicy.py b/python/sepolgen/src/sepolgen/refpolicy.py
index 32278896..78725397 100644
--- a/python/sepolgen/src/sepolgen/refpolicy.py
+++ b/python/sepolgen/src/sepolgen/refpolicy.py
@@ -324,7 +324,7 @@ class SecurityContext(Leaf):
     def to_string(self, default_level=None):
         """Return a string representing this security context.
 
-        By default, the string will contiain a MCS / MLS level
+        By default, the string will contain a MCS / MLS level
         potentially from the default which is passed in if none was
         set.
 
@@ -333,7 +333,7 @@ class SecurityContext(Leaf):
              empty string.
 
         Returns:
-           A string represening the security context in the form
+           A string representing the security context in the form
               'user:role:type:level'.
         """
         fields = [self.user, self.role, self.type]
@@ -609,7 +609,7 @@ class AVRule(Leaf):
     def to_string(self):
         """Return a string representation of the rule
         that is a valid policy language representation (assuming
-        that the types, object class, etc. are valie).
+        that the types, object class, etc. are valid).
         """
         if self.gen_cil:
             s = ""
diff --git a/python/sepolicy/sepolicy/sepolicy.glade b/python/sepolicy/sepolicy/sepolicy.glade
index 30e7b03f..a9e4cb3a 100644
--- a/python/sepolicy/sepolicy/sepolicy.glade
+++ b/python/sepolicy/sepolicy/sepolicy.glade
@@ -235,7 +235,7 @@
       <column type="gchararray"/>
       <!-- column-name Label -->
       <column type="gboolean"/>
-      <!-- column-name Mislabled -->
+      <!-- column-name Mislabeled -->
       <column type="gboolean"/>
       <!-- column-name Cur -->
       <column type="gchararray"/>
@@ -392,7 +392,7 @@
       <column type="gchararray"/>
       <!-- column-name Fix -->
       <column type="gboolean"/>
-      <!-- column-name Mislabled -->
+      <!-- column-name Mislabeled -->
       <column type="gboolean"/>
       <!-- column-name Cur -->
       <column type="gchararray"/>
@@ -5538,7 +5538,7 @@ s0-s0:c1023</property>
       <column type="gchararray"/>
       <!-- column-name Label -->
       <column type="gboolean"/>
-      <!-- column-name Mislabled -->
+      <!-- column-name Mislabeled -->
       <column type="gboolean"/>
       <!-- column-name Cur -->
       <column type="gchararray"/>
-- 
2.45.2

[PATCH 1/2] libsepol: fix typos

[Christian Göttsche]

From: Christian Göttsche <cgzones@googlemail.com>

Found by codespell(1) and typos[1].

[1]: https://github.com/crate-ci/typos

Signed-off-by: Christian Göttsche <cgzones@googlemail.com>
---
 libsepol/src/kernel_to_cil.c | 2 +-
 libsepol/src/module_to_cil.c | 2 +-
 libsepol/src/policydb.c      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/libsepol/src/kernel_to_cil.c b/libsepol/src/kernel_to_cil.c
index 2d563e7d..ddca2b62 100644
--- a/libsepol/src/kernel_to_cil.c
+++ b/libsepol/src/kernel_to_cil.c
@@ -1802,7 +1802,7 @@ static char *avtab_node_to_str(struct policydb *pdb, avtab_key_t *key, avtab_dat
 		} else if (datum->xperms->specified == AVTAB_XPERMS_NLMSG) {
 			xperm = (char *) "nlmsg";
 		} else {
-			ERR(NULL, "Unknown extended permssion");
+			ERR(NULL, "Unknown extended permission");
 			goto exit;
 		}
 		rule = create_str("(%s %s %s (%s %s (%s)))",
diff --git a/libsepol/src/module_to_cil.c b/libsepol/src/module_to_cil.c
index 0ede0c9b..ae9a2b5d 100644
--- a/libsepol/src/module_to_cil.c
+++ b/libsepol/src/module_to_cil.c
@@ -709,7 +709,7 @@ static int avrulex_to_cil(int indent, struct policydb *pdb, uint32_t type, const
 	} else if (xperms->specified == AVTAB_XPERMS_NLMSG) {
 		xperm = "nlmsg";
 	} else {
-		ERR(NULL, "Unkown avrule xperms->specified: %i", xperms->specified);
+		ERR(NULL, "Unknown avrule xperms->specified: %i", xperms->specified);
 		rc = -1;
 		goto exit;
 	}
diff --git a/libsepol/src/policydb.c b/libsepol/src/policydb.c
index 0747e789..8443380b 100644
--- a/libsepol/src/policydb.c
+++ b/libsepol/src/policydb.c
@@ -1662,7 +1662,7 @@ int policydb_load_isids(policydb_t * p, sidtab_t * s)
  *
  * arguments:
  *   policydb_t *pol       module policy to modify
- *   uint32_t sym          the symbole table for insertion (SYM_*)
+ *   uint32_t sym          the symbol table for insertion (SYM_*)
  *   hashtab_key_t key     the key for the symbol - not cloned
  *   hashtab_datum_t data  the data for the symbol - not cloned
  *   scope                 scope of this symbol, either SCOPE_REQ or SCOPE_DECL
-- 
2.45.2

Re: [PATCH 1/2] libsepol: fix typos

[James Carter]

On Mon, Dec 30, 2024 at 9:05 AM Christian Göttsche
<cgoettsche@seltendoof.de> wrote:
>
> From: Christian Göttsche <cgzones@googlemail.com>
>
> Found by codespell(1) and typos[1].
>
> [1]: https://github.com/crate-ci/typos
>
> Signed-off-by: Christian Göttsche <cgzones@googlemail.com>

For these two patches:
Acked-by: James Carter <jwcart2@gmail.com>

> ---
>  libsepol/src/kernel_to_cil.c | 2 +-
>  libsepol/src/module_to_cil.c | 2 +-
>  libsepol/src/policydb.c      | 2 +-
>  3 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/libsepol/src/kernel_to_cil.c b/libsepol/src/kernel_to_cil.c
> index 2d563e7d..ddca2b62 100644
> --- a/libsepol/src/kernel_to_cil.c
> +++ b/libsepol/src/kernel_to_cil.c
> @@ -1802,7 +1802,7 @@ static char *avtab_node_to_str(struct policydb *pdb, avtab_key_t *key, avtab_dat
>                 } else if (datum->xperms->specified == AVTAB_XPERMS_NLMSG) {
>                         xperm = (char *) "nlmsg";
>                 } else {
> -                       ERR(NULL, "Unknown extended permssion");
> +                       ERR(NULL, "Unknown extended permission");
>                         goto exit;
>                 }
>                 rule = create_str("(%s %s %s (%s %s (%s)))",
> diff --git a/libsepol/src/module_to_cil.c b/libsepol/src/module_to_cil.c
> index 0ede0c9b..ae9a2b5d 100644
> --- a/libsepol/src/module_to_cil.c
> +++ b/libsepol/src/module_to_cil.c
> @@ -709,7 +709,7 @@ static int avrulex_to_cil(int indent, struct policydb *pdb, uint32_t type, const
>         } else if (xperms->specified == AVTAB_XPERMS_NLMSG) {
>                 xperm = "nlmsg";
>         } else {
> -               ERR(NULL, "Unkown avrule xperms->specified: %i", xperms->specified);
> +               ERR(NULL, "Unknown avrule xperms->specified: %i", xperms->specified);
>                 rc = -1;
>                 goto exit;
>         }
> diff --git a/libsepol/src/policydb.c b/libsepol/src/policydb.c
> index 0747e789..8443380b 100644
> --- a/libsepol/src/policydb.c
> +++ b/libsepol/src/policydb.c
> @@ -1662,7 +1662,7 @@ int policydb_load_isids(policydb_t * p, sidtab_t * s)
>   *
>   * arguments:
>   *   policydb_t *pol       module policy to modify
> - *   uint32_t sym          the symbole table for insertion (SYM_*)
> + *   uint32_t sym          the symbol table for insertion (SYM_*)
>   *   hashtab_key_t key     the key for the symbol - not cloned
>   *   hashtab_datum_t data  the data for the symbol - not cloned
>   *   scope                 scope of this symbol, either SCOPE_REQ or SCOPE_DECL
> --
> 2.45.2
>
>

Re: [PATCH 1/2] libsepol: fix typos

[Petr Lautrbach]

James Carter <jwcart2@gmail.com> writes:

> On Mon, Dec 30, 2024 at 9:05 AM Christian Göttsche
> <cgoettsche@seltendoof.de> wrote:
>>
>> From: Christian Göttsche <cgzones@googlemail.com>
>>
>> Found by codespell(1) and typos[1].
>>
>> [1]: https://github.com/crate-ci/typos
>>
>> Signed-off-by: Christian Göttsche <cgzones@googlemail.com>
>
> For these two patches:
> Acked-by: James Carter <jwcart2@gmail.com>

Merged. Thanks!

>> ---
>>  libsepol/src/kernel_to_cil.c | 2 +-
>>  libsepol/src/module_to_cil.c | 2 +-
>>  libsepol/src/policydb.c      | 2 +-
>>  3 files changed, 3 insertions(+), 3 deletions(-)
>>
>> diff --git a/libsepol/src/kernel_to_cil.c b/libsepol/src/kernel_to_cil.c
>> index 2d563e7d..ddca2b62 100644
>> --- a/libsepol/src/kernel_to_cil.c
>> +++ b/libsepol/src/kernel_to_cil.c
>> @@ -1802,7 +1802,7 @@ static char *avtab_node_to_str(struct policydb *pdb, avtab_key_t *key, avtab_dat
>>                 } else if (datum->xperms->specified == AVTAB_XPERMS_NLMSG) {
>>                         xperm = (char *) "nlmsg";
>>                 } else {
>> -                       ERR(NULL, "Unknown extended permssion");
>> +                       ERR(NULL, "Unknown extended permission");
>>                         goto exit;
>>                 }
>>                 rule = create_str("(%s %s %s (%s %s (%s)))",
>> diff --git a/libsepol/src/module_to_cil.c b/libsepol/src/module_to_cil.c
>> index 0ede0c9b..ae9a2b5d 100644
>> --- a/libsepol/src/module_to_cil.c
>> +++ b/libsepol/src/module_to_cil.c
>> @@ -709,7 +709,7 @@ static int avrulex_to_cil(int indent, struct policydb *pdb, uint32_t type, const
>>         } else if (xperms->specified == AVTAB_XPERMS_NLMSG) {
>>                 xperm = "nlmsg";
>>         } else {
>> -               ERR(NULL, "Unkown avrule xperms->specified: %i", xperms->specified);
>> +               ERR(NULL, "Unknown avrule xperms->specified: %i", xperms->specified);
>>                 rc = -1;
>>                 goto exit;
>>         }
>> diff --git a/libsepol/src/policydb.c b/libsepol/src/policydb.c
>> index 0747e789..8443380b 100644
>> --- a/libsepol/src/policydb.c
>> +++ b/libsepol/src/policydb.c
>> @@ -1662,7 +1662,7 @@ int policydb_load_isids(policydb_t * p, sidtab_t * s)
>>   *
>>   * arguments:
>>   *   policydb_t *pol       module policy to modify
>> - *   uint32_t sym          the symbole table for insertion (SYM_*)
>> + *   uint32_t sym          the symbol table for insertion (SYM_*)
>>   *   hashtab_key_t key     the key for the symbol - not cloned
>>   *   hashtab_datum_t data  the data for the symbol - not cloned
>>   *   scope                 scope of this symbol, either SCOPE_REQ or SCOPE_DECL
>> --
>> 2.45.2
>>
>>