Correct misc typos
PATCH 1/1 Correct misc typos
Found by codespell(1) and typos[1].
[1]: https://github.com/crate-ci/typos
Signed-off-by Christian Göttsche <[email protected]>
--- libselinux/src/label_db.c | 2 +- libselinux/src/regex.c | 2 +- libselinux/src/sha1.c | 2 +- libsepol/cil/src/cil_post.c | 2 +- libsepol/cil/src/cil_resolve_ast.c | 2 +- libsepol/src/module_to_cil.c | 2 +- libsepol/tests/policies/test-deps/base-metreq.conf | 2 +- libsepol/tests/policies/test-deps/base-notmetreq.conf | 2 +- libsepol/tests/policies/test-deps/small-base.conf | 2 +- libsepol/tests/policies/test-expander/alias-base.conf | 2 +- libsepol/tests/policies/test-expander/role-base.conf | 2 +- libsepol/tests/policies/test-expander/small-base.conf | 2 +- libsepol/tests/policies/test-expander/user-base.conf | 2 +- libsepol/tests/policies/test-hooks/cmp_policy.conf | 2 +- libsepol/tests/policies/test-hooks/small-base.conf | 2 +- libsepol/tests/policies/test-linker/small-base.conf | 2 +- policycoreutils/newrole/newrole.c | 2 +- python/semanage/semanage | 2 +- python/sepolicy/sepolicy/manpage.py | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-)
libselinux/src/label_db.c +1 -1
@@ -31,7 +31,7 @@* For example: * ---------------------------------------- * # -* # It is an example specfile for database obejcts +* # It is an example specfile for database objects * # * db_database template1 system_u:object_r:sepgsql_db_t:s0 *
libselinux/src/regex.c +1 -1
@@ -167,7 +167,7 @@ int regex_writef(struct regex_data *regex, FILE *fp, int do_write_precompregex)PCRE2_UCHAR *bytes =NULL ;if (do_write_precompregex) { -/* encode the patter for serialization */ +/* encode the pattern for serialization */ rc =pcre2_serialize_encode ((const pcre2_code **)®ex->regex,1 , &bytes, &serialized_size,NULL );if (rc !=1 ) {
libselinux/src/sha1.c +1 -1
@@ -11,7 +11,7 @@// Modified to: // - stop symbols being exported for libselinux shared library - October 2015 // Richard Haines <[email protected]> -// - Not cast the workspace from a byte array to a CHAR64LONG16 due to alignment isses. +// - Not cast the workspace from a byte array to a CHAR64LONG16 due to alignment issues. // Fixes: // sha1.c:73:33: error: cast from 'uint8_t *' (aka 'unsigned char *') to 'CHAR64LONG16 *' increases required alignment from 1 to 4 [-Werror,-Wcast-align] // CHAR64LONG16* block = (CHAR64LONG16*) workspace;
libsepol/cil/src/cil_post.c +1 -1
@@ -1193,7 +1193,7 @@ static int __cil_cat_expr_range_to_bitmap_helper(struct cil_list_item *i1, strucstruct cil_cat *c2 = (struct cil_cat *)d2;if (n1->flavor ==CIL_CATSET || n2->flavor ==CIL_CATSET ) { -cil_log (CIL_ERR ,"Category sets cannont be used in a category range\n" ); +cil_log (CIL_ERR ,"Category sets cannot be used in a category range\n" ); goto exit; }
libsepol/cil/src/cil_resolve_ast.c +1 -1
@@ -778,7 +778,7 @@ int cil_resolve_classcommon(struct cil_tree_node *current, void *extra_args) class = (struct cil_class *)class_datum; common = (struct cil_class *)common_datum;if (class->common !=NULL ) { -cil_log (CIL_ERR ,"class cannot be associeated with more than one common\n" ); +cil_log (CIL_ERR ,"class cannot be associated with more than one common\n" ); rc =SEPOL_ERR ; goto exit; }
libsepol/src/module_to_cil.c +1 -1
@@ -2330,7 +2330,7 @@ static int user_to_cil(int indent, struct policydb *pdb, struct avrule_block *bl }if (block->flags &AVRULE_OPTIONAL ) { -// sensitivites in user statements in optionals do not have the +// sensitivities in user statements in optionals do not have the // standard -1 offset sens_offset =0 ; }
libsepol/tests/policies/test-deps/base-metreq.conf +1 -1
@@ -33,7 +33,7 @@ class key_socket class unix_stream_socket class unix_dgram_socket -# sysv-ipc-related clases +# sysv-ipc-related classes class sem class msg class msgq
libsepol/tests/policies/test-deps/base-notmetreq.conf +1 -1
@@ -33,7 +33,7 @@ class key_socket class unix_stream_socket class unix_dgram_socket -# sysv-ipc-related clases +# sysv-ipc-related classes class msg class msgq class shm
libsepol/tests/policies/test-deps/small-base.conf +1 -1
@@ -33,7 +33,7 @@ class key_socket class unix_stream_socket class unix_dgram_socket -# sysv-ipc-related clases +# sysv-ipc-related classes class sem class msg class msgq
libsepol/tests/policies/test-expander/alias-base.conf +1 -1
@@ -33,7 +33,7 @@ class key_socket class unix_stream_socket class unix_dgram_socket -# sysv-ipc-related clases +# sysv-ipc-related classes class sem class msg class msgq
libsepol/tests/policies/test-expander/role-base.conf +1 -1
@@ -33,7 +33,7 @@ class key_socket class unix_stream_socket class unix_dgram_socket -# sysv-ipc-related clases +# sysv-ipc-related classes class sem class msg class msgq
libsepol/tests/policies/test-expander/small-base.conf +1 -1
@@ -33,7 +33,7 @@ class key_socket class unix_stream_socket class unix_dgram_socket -# sysv-ipc-related clases +# sysv-ipc-related classes class sem class msg class msgq
libsepol/tests/policies/test-expander/user-base.conf +1 -1
@@ -33,7 +33,7 @@ class key_socket class unix_stream_socket class unix_dgram_socket -# sysv-ipc-related clases +# sysv-ipc-related classes class sem class msg class msgq
libsepol/tests/policies/test-hooks/cmp_policy.conf +1 -1
@@ -33,7 +33,7 @@ class key_socket class unix_stream_socket class unix_dgram_socket -# sysv-ipc-related clases +# sysv-ipc-related classes class sem class msg class msgq
libsepol/tests/policies/test-hooks/small-base.conf +1 -1
@@ -33,7 +33,7 @@ class key_socket class unix_stream_socket class unix_dgram_socket -# sysv-ipc-related clases +# sysv-ipc-related classes class sem class msg class msgq
libsepol/tests/policies/test-linker/small-base.conf +1 -1
@@ -33,7 +33,7 @@ class key_socket class unix_stream_socket class unix_dgram_socket -# sysv-ipc-related clases +# sysv-ipc-related classes class sem class msg class msgq
policycoreutils/newrole/newrole.c +1 -1
@@ -1289,7 +1289,7 @@ int main(int argc, char *argv[])/* * Step 5: Execute a new shell with the new context in `new_context'. * -* Establish context, namesapce and any options for the new shell +* Establish context, namespace and any options for the new shell */ if (optind <1 ) optind =1 ;
python/semanage/semanage +1 -1
@@ -130,7 +130,7 @@ class SetImportFile(argparse.Action): sys.exit(1) setattr(namespace, self.dest, values) -# define dictionary for seobject OBEJCTS +# define dictionary for seobject OBJECTS object_dict = { 'login': seobject.loginRecords, 'user': seobject.seluserRecords,
python/sepolicy/sepolicy/manpage.py +1 -1
@@ -739,7 +739,7 @@ SELinux %(domainname)s policy is very flexible allowing users to setup their %(d .B STANDARD FILE CONTEXT SELinux defines the file context types for the %(domainname)s, if you wanted to -store files with these types in a diffent paths, you need to execute the semanage command to specify alternate labeling and then use restorecon to put the labels on disk. +store files with these types in a different paths, you need to execute the semanage command to specify alternate labeling and then use restorecon to put the labels on disk. .B semanage fcontext -a -t %(type)s '/srv/%(domainname)s/content(/.*)?' .br
Signature · 1 line
2.39.0
Quoted 6 lines · Christian Göttsche
Found by codespell(1) and typos[1].
[1]: https://github.com/crate-ci/typos
Signed-off-by Christian Göttsche <[email protected]>
Acked-by James Carter <[email protected]>
Quoted 272 lines
--- libselinux/src/label_db.c | 2 +- libselinux/src/regex.c | 2 +- libselinux/src/sha1.c | 2 +- libsepol/cil/src/cil_post.c | 2 +- libsepol/cil/src/cil_resolve_ast.c | 2 +- libsepol/src/module_to_cil.c | 2 +- libsepol/tests/policies/test-deps/base-metreq.conf | 2 +- libsepol/tests/policies/test-deps/base-notmetreq.conf | 2 +- libsepol/tests/policies/test-deps/small-base.conf | 2 +- libsepol/tests/policies/test-expander/alias-base.conf | 2 +- libsepol/tests/policies/test-expander/role-base.conf | 2 +- libsepol/tests/policies/test-expander/small-base.conf | 2 +- libsepol/tests/policies/test-expander/user-base.conf | 2 +- libsepol/tests/policies/test-hooks/cmp_policy.conf | 2 +- libsepol/tests/policies/test-hooks/small-base.conf | 2 +- libsepol/tests/policies/test-linker/small-base.conf | 2 +- policycoreutils/newrole/newrole.c | 2 +- python/semanage/semanage | 2 +- python/sepolicy/sepolicy/manpage.py | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-)libselinux/src/label_db.c +1
-1@@ -31,7 +31,7 @@* For example: * ---------------------------------------- * # -* # It is an example specfile for database obejcts +* # It is an example specfile for database objects * # * db_database template1 system_u:object_r:sepgsql_db_t:s0 * libselinux/src/regex.c +1
-1@@ -167,7 +167,7 @@ int regex_writef(struct regex_data *regex, FILE *fp, int do_write_precompregex)PCRE2_UCHAR *bytes =NULL ;if (do_write_precompregex) { -/* encode the patter for serialization */ +/* encode the pattern for serialization */ rc =pcre2_serialize_encode ((const pcre2_code **)®ex->regex,1 , &bytes, &serialized_size,NULL );if (rc !=1 ) {libselinux/src/sha1.c +1
-1@@ -11,7 +11,7 @@// Modified to: // - stop symbols being exported for libselinux shared library - October 2015 // Richard Haines <[email protected]> -// - Not cast the workspace from a byte array to a CHAR64LONG16 due to alignment isses. +// - Not cast the workspace from a byte array to a CHAR64LONG16 due to alignment issues. // Fixes: // sha1.c:73:33: error: cast from 'uint8_t *' (aka 'unsigned char *') to 'CHAR64LONG16 *' increases required alignment from 1 to 4 [-Werror,-Wcast-align] // CHAR64LONG16* block = (CHAR64LONG16*) workspace; libsepol/cil/src/cil_post.c +1
-1@@ -1193,7 +1193,7 @@ static int __cil_cat_expr_range_to_bitmap_helper(struct cil_list_item *i1, strucstruct cil_cat *c2 = (struct cil_cat *)d2;if (n1->flavor ==CIL_CATSET || n2->flavor ==CIL_CATSET ) { -cil_log (CIL_ERR ,"Category sets cannont be used in a category range\n" ); +cil_log (CIL_ERR ,"Category sets cannot be used in a category range\n" ); goto exit; }libsepol/cil/src/cil_resolve_ast.c +1
-1@@ -778,7 +778,7 @@ int cil_resolve_classcommon(struct cil_tree_node *current, void *extra_args) class = (struct cil_class *)class_datum; common = (struct cil_class *)common_datum;if (class->common !=NULL ) { -cil_log (CIL_ERR ,"class cannot be associeated with more than one common\n" ); +cil_log (CIL_ERR ,"class cannot be associated with more than one common\n" ); rc =SEPOL_ERR ; goto exit; }libsepol/src/module_to_cil.c +1
-1@@ -2330,7 +2330,7 @@ static int user_to_cil(int indent, struct policydb *pdb, struct avrule_block *bl }if (block->flags &AVRULE_OPTIONAL ) { -// sensitivites in user statements in optionals do not have the +// sensitivities in user statements in optionals do not have the // standard -1 offset sens_offset =0 ; }libsepol/tests/policies/test-deps/base-metreq.conf +1
-1@@ -33,7 +33,7 @@ class key_socket class unix_stream_socket class unix_dgram_socket -# sysv-ipc-related clases +# sysv-ipc-related classes class sem class msg class msgqlibsepol/tests/policies/test-deps/base-notmetreq.conf +1
-1@@ -33,7 +33,7 @@ class key_socket class unix_stream_socket class unix_dgram_socket -# sysv-ipc-related clases +# sysv-ipc-related classes class msg class msgq class shmlibsepol/tests/policies/test-deps/small-base.conf +1
-1@@ -33,7 +33,7 @@ class key_socket class unix_stream_socket class unix_dgram_socket -# sysv-ipc-related clases +# sysv-ipc-related classes class sem class msg class msgqlibsepol/tests/policies/test-expander/alias-base.conf +1
-1@@ -33,7 +33,7 @@ class key_socket class unix_stream_socket class unix_dgram_socket -# sysv-ipc-related clases +# sysv-ipc-related classes class sem class msg class msgqlibsepol/tests/policies/test-expander/role-base.conf +1
-1@@ -33,7 +33,7 @@ class key_socket class unix_stream_socket class unix_dgram_socket -# sysv-ipc-related clases +# sysv-ipc-related classes class sem class msg class msgqlibsepol/tests/policies/test-expander/small-base.conf +1
-1@@ -33,7 +33,7 @@ class key_socket class unix_stream_socket class unix_dgram_socket -# sysv-ipc-related clases +# sysv-ipc-related classes class sem class msg class msgqlibsepol/tests/policies/test-expander/user-base.conf +1
-1@@ -33,7 +33,7 @@ class key_socket class unix_stream_socket class unix_dgram_socket -# sysv-ipc-related clases +# sysv-ipc-related classes class sem class msg class msgqlibsepol/tests/policies/test-hooks/cmp_policy.conf +1
-1@@ -33,7 +33,7 @@ class key_socket class unix_stream_socket class unix_dgram_socket -# sysv-ipc-related clases +# sysv-ipc-related classes class sem class msg class msgqlibsepol/tests/policies/test-hooks/small-base.conf +1
-1@@ -33,7 +33,7 @@ class key_socket class unix_stream_socket class unix_dgram_socket -# sysv-ipc-related clases +# sysv-ipc-related classes class sem class msg class msgqlibsepol/tests/policies/test-linker/small-base.conf +1
-1@@ -33,7 +33,7 @@ class key_socket class unix_stream_socket class unix_dgram_socket -# sysv-ipc-related clases +# sysv-ipc-related classes class sem class msg class msgqpolicycoreutils/newrole/newrole.c +1
-1@@ -1289,7 +1289,7 @@ int main(int argc, char *argv[])/* * Step 5: Execute a new shell with the new context in `new_context'. * -* Establish context, namesapce and any options for the new shell +* Establish context, namespace and any options for the new shell */ if (optind <1 ) optind =1 ;python/semanage/semanage +1
-1@@ -130,7 +130,7 @@ class SetImportFile(argparse.Action): sys.exit(1) setattr(namespace, self.dest, values) -# define dictionary for seobject OBEJCTS +# define dictionary for seobject OBJECTS object_dict = { 'login': seobject.loginRecords, 'user': seobject.seluserRecords,python/sepolicy/sepolicy/manpage.py +1
-2@@ -739,7 +739,7 @@ SELinux %(domainname)s policy is very flexible allowing users to setup their %(d .B STANDARD FILE CONTEXT SELinux defines the file context types for the %(domainname)s, if you wanted to -store files with these types in a diffent paths, you need to execute the semanage command to specify alternate labeling and then use restorecon to put the labels on disk. +store files with these types in a different paths, you need to execute the semanage command to specify alternate labeling and then use restorecon to put the labels on disk. .B semanage fcontext -a -t %(type)s '/srv/%(domainname)s/content(/.*)?' .br --2.39.0
Quoted 4 lines · James Carter
Quoted 1 line · Christian Göttsche
Quoted 8 lines
Quoted 5 lines
Found by codespell(1) and typos[1].
[1]: https://github.com/crate-ci/typos
Signed-off-by Christian Göttsche <[email protected]>Acked-by James Carter <[email protected]>
Merged.
Thanks,
Jim
Quoted 272 lines
Quoted 272 lines
--- libselinux/src/label_db.c | 2 +- libselinux/src/regex.c | 2 +- libselinux/src/sha1.c | 2 +- libsepol/cil/src/cil_post.c | 2 +- libsepol/cil/src/cil_resolve_ast.c | 2 +- libsepol/src/module_to_cil.c | 2 +- libsepol/tests/policies/test-deps/base-metreq.conf | 2 +- libsepol/tests/policies/test-deps/base-notmetreq.conf | 2 +- libsepol/tests/policies/test-deps/small-base.conf | 2 +- libsepol/tests/policies/test-expander/alias-base.conf | 2 +- libsepol/tests/policies/test-expander/role-base.conf | 2 +- libsepol/tests/policies/test-expander/small-base.conf | 2 +- libsepol/tests/policies/test-expander/user-base.conf | 2 +- libsepol/tests/policies/test-hooks/cmp_policy.conf | 2 +- libsepol/tests/policies/test-hooks/small-base.conf | 2 +- libsepol/tests/policies/test-linker/small-base.conf | 2 +- policycoreutils/newrole/newrole.c | 2 +- python/semanage/semanage | 2 +- python/sepolicy/sepolicy/manpage.py | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-)libselinux/src/label_db.c +1
-1@@ -31,7 +31,7 @@* For example: * ---------------------------------------- * # -* # It is an example specfile for database obejcts +* # It is an example specfile for database objects * # * db_database template1 system_u:object_r:sepgsql_db_t:s0 * libselinux/src/regex.c +1
-1@@ -167,7 +167,7 @@ int regex_writef(struct regex_data *regex, FILE *fp, int do_write_precompregex)PCRE2_UCHAR *bytes =NULL ;if (do_write_precompregex) { -/* encode the patter for serialization */ +/* encode the pattern for serialization */ rc =pcre2_serialize_encode ((const pcre2_code **)®ex->regex,1 , &bytes, &serialized_size,NULL );if (rc !=1 ) {libselinux/src/sha1.c +1
-1@@ -11,7 +11,7 @@// Modified to: // - stop symbols being exported for libselinux shared library - October 2015 // Richard Haines <[email protected]> -// - Not cast the workspace from a byte array to a CHAR64LONG16 due to alignment isses. +// - Not cast the workspace from a byte array to a CHAR64LONG16 due to alignment issues. // Fixes: // sha1.c:73:33: error: cast from 'uint8_t *' (aka 'unsigned char *') to 'CHAR64LONG16 *' increases required alignment from 1 to 4 [-Werror,-Wcast-align] // CHAR64LONG16* block = (CHAR64LONG16*) workspace; libsepol/cil/src/cil_post.c +1
-1@@ -1193,7 +1193,7 @@ static int __cil_cat_expr_range_to_bitmap_helper(struct cil_list_item *i1, strucstruct cil_cat *c2 = (struct cil_cat *)d2;if (n1->flavor ==CIL_CATSET || n2->flavor ==CIL_CATSET ) { -cil_log (CIL_ERR ,"Category sets cannont be used in a category range\n" ); +cil_log (CIL_ERR ,"Category sets cannot be used in a category range\n" ); goto exit; }libsepol/cil/src/cil_resolve_ast.c +1
-1@@ -778,7 +778,7 @@ int cil_resolve_classcommon(struct cil_tree_node *current, void *extra_args) class = (struct cil_class *)class_datum; common = (struct cil_class *)common_datum;if (class->common !=NULL ) { -cil_log (CIL_ERR ,"class cannot be associeated with more than one common\n" ); +cil_log (CIL_ERR ,"class cannot be associated with more than one common\n" ); rc =SEPOL_ERR ; goto exit; }libsepol/src/module_to_cil.c +1
-1@@ -2330,7 +2330,7 @@ static int user_to_cil(int indent, struct policydb *pdb, struct avrule_block *bl }if (block->flags &AVRULE_OPTIONAL ) { -// sensitivites in user statements in optionals do not have the +// sensitivities in user statements in optionals do not have the // standard -1 offset sens_offset =0 ; }libsepol/tests/policies/test-deps/base-metreq.conf +1
-1@@ -33,7 +33,7 @@ class key_socket class unix_stream_socket class unix_dgram_socket -# sysv-ipc-related clases +# sysv-ipc-related classes class sem class msg class msgqlibsepol/tests/policies/test-deps/base-notmetreq.conf +1
-1@@ -33,7 +33,7 @@ class key_socket class unix_stream_socket class unix_dgram_socket -# sysv-ipc-related clases +# sysv-ipc-related classes class msg class msgq class shmlibsepol/tests/policies/test-deps/small-base.conf +1
-1@@ -33,7 +33,7 @@ class key_socket class unix_stream_socket class unix_dgram_socket -# sysv-ipc-related clases +# sysv-ipc-related classes class sem class msg class msgqlibsepol/tests/policies/test-expander/alias-base.conf +1
-1@@ -33,7 +33,7 @@ class key_socket class unix_stream_socket class unix_dgram_socket -# sysv-ipc-related clases +# sysv-ipc-related classes class sem class msg class msgqlibsepol/tests/policies/test-expander/role-base.conf +1
-1@@ -33,7 +33,7 @@ class key_socket class unix_stream_socket class unix_dgram_socket -# sysv-ipc-related clases +# sysv-ipc-related classes class sem class msg class msgqlibsepol/tests/policies/test-expander/small-base.conf +1
-1@@ -33,7 +33,7 @@ class key_socket class unix_stream_socket class unix_dgram_socket -# sysv-ipc-related clases +# sysv-ipc-related classes class sem class msg class msgqlibsepol/tests/policies/test-expander/user-base.conf +1
-1@@ -33,7 +33,7 @@ class key_socket class unix_stream_socket class unix_dgram_socket -# sysv-ipc-related clases +# sysv-ipc-related classes class sem class msg class msgqlibsepol/tests/policies/test-hooks/cmp_policy.conf +1
-1@@ -33,7 +33,7 @@ class key_socket class unix_stream_socket class unix_dgram_socket -# sysv-ipc-related clases +# sysv-ipc-related classes class sem class msg class msgqlibsepol/tests/policies/test-hooks/small-base.conf +1
-1@@ -33,7 +33,7 @@ class key_socket class unix_stream_socket class unix_dgram_socket -# sysv-ipc-related clases +# sysv-ipc-related classes class sem class msg class msgqlibsepol/tests/policies/test-linker/small-base.conf +1
-1@@ -33,7 +33,7 @@ class key_socket class unix_stream_socket class unix_dgram_socket -# sysv-ipc-related clases +# sysv-ipc-related classes class sem class msg class msgqpolicycoreutils/newrole/newrole.c +1
-1@@ -1289,7 +1289,7 @@ int main(int argc, char *argv[])/* * Step 5: Execute a new shell with the new context in `new_context'. * -* Establish context, namesapce and any options for the new shell +* Establish context, namespace and any options for the new shell */ if (optind <1 ) optind =1 ;python/semanage/semanage +1
-1@@ -130,7 +130,7 @@ class SetImportFile(argparse.Action): sys.exit(1) setattr(namespace, self.dest, values) -# define dictionary for seobject OBEJCTS +# define dictionary for seobject OBJECTS object_dict = { 'login': seobject.loginRecords, 'user': seobject.seluserRecords,python/sepolicy/sepolicy/manpage.py +1
-2@@ -739,7 +739,7 @@ SELinux %(domainname)s policy is very flexible allowing users to setup their %(d .B STANDARD FILE CONTEXT SELinux defines the file context types for the %(domainname)s, if you wanted to -store files with these types in a diffent paths, you need to execute the semanage command to specify alternate labeling and then use restorecon to put the labels on disk. +store files with these types in a different paths, you need to execute the semanage command to specify alternate labeling and then use restorecon to put the labels on disk. .B semanage fcontext -a -t %(type)s '/srv/%(domainname)s/content(/.*)?' .br --2.39.0