| Message ID | 20180924181052.130507-1-nnk@google.com (mailing list archive) |
|---|---|
| State | Not Applicable |
| Headers | show |
| Series | [1/2] whitespace and spelling cleanup | expand |
ack On Mon, Sep 24, 2018 at 11:12 AM Nick Kralevich via Selinux < selinux@tycho.nsa.gov> wrote: > Signed-off-by: Nick Kralevich <nnk@google.com> > --- > libsepol/include/sepol/errcodes.h | 2 +- > secilc/secilc.c | 14 +++++++------- > 2 files changed, 8 insertions(+), 8 deletions(-) > > diff --git a/libsepol/include/sepol/errcodes.h > b/libsepol/include/sepol/errcodes.h > index 0136564a..6e9ff316 100644 > --- a/libsepol/include/sepol/errcodes.h > +++ b/libsepol/include/sepol/errcodes.h > @@ -12,7 +12,7 @@ extern "C" { > #define SEPOL_OK 0 > > /* These first error codes are defined for compatibility with > - * previous version of libsepol. In the future, custome error > + * previous version of libsepol. In the future, custom error > * codes that don't map to system error codes should be defined > * outside of the range of system error codes. > */ > diff --git a/secilc/secilc.c b/secilc/secilc.c > index 0be6975b..e1347205 100644 > --- a/secilc/secilc.c > +++ b/secilc/secilc.c > @@ -1,16 +1,16 @@ > /* > * Copyright 2011 Tresys Technology, LLC. All rights reserved. > - * > + * > * Redistribution and use in source and binary forms, with or without > * modification, are permitted provided that the following conditions are > met: > - * > + * > * 1. Redistributions of source code must retain the above copyright > notice, > * this list of conditions and the following disclaimer. > - * > + * > * 2. Redistributions in binary form must reproduce the above > copyright notice, > * this list of conditions and the following disclaimer in the > documentation > * and/or other materials provided with the distribution. > - * > + * > * THIS SOFTWARE IS PROVIDED BY TRESYS TECHNOLOGY, LLC ``AS IS'' AND ANY > EXPRESS > * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED > WARRANTIES OF > * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. > IN NO > @@ -21,7 +21,7 @@ > * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING > NEGLIGENCE > * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN > IF > * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. > - * > + * > * The views and conclusions contained in the software and documentation > are those > * of the authors and should not be interpreted as representing official > policies, > * either expressed or implied, of Tresys Technology, LLC. > @@ -259,7 +259,7 @@ int main(int argc, char *argv[]) > fprintf(stderr, "Could not stat file: %s\n", > argv[i]); > goto exit; > } > - file_size = filedata.st_size; > + file_size = filedata.st_size; > > buffer = malloc(file_size); > rc = fread(buffer, file_size, 1, file); > @@ -347,7 +347,7 @@ int main(int argc, char *argv[]) > fprintf(stderr, "Failed to open file_contexts file\n"); > goto exit; > } > - > + > if (fwrite(fc_buf, sizeof(char), fc_size, file_contexts) != > fc_size) { > fprintf(stderr, "Failed to write file_contexts file\n"); > goto exit; > -- > 2.19.0.444.g18242da7ef-goog > > _______________________________________________ > Selinux mailing list > Selinux@tycho.nsa.gov > To unsubscribe, send email to Selinux-leave@tycho.nsa.gov. > To get help, send an email containing "help" to > Selinux-request@tycho.nsa.gov. > <div dir="ltr">ack</div><br><div class="gmail_quote"><div dir="ltr">On Mon, Sep 24, 2018 at 11:12 AM Nick Kralevich via Selinux <<a href="mailto:selinux@tycho.nsa.gov">selinux@tycho.nsa.gov</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Signed-off-by: Nick Kralevich <<a href="mailto:nnk@google.com" target="_blank">nnk@google.com</a>><br> ---<br> libsepol/include/sepol/errcodes.h | 2 +-<br> secilc/secilc.c | 14 +++++++-------<br> 2 files changed, 8 insertions(+), 8 deletions(-)<br> <br> diff --git a/libsepol/include/sepol/errcodes.h b/libsepol/include/sepol/errcodes.h<br> index 0136564a..6e9ff316 100644<br> --- a/libsepol/include/sepol/errcodes.h<br> +++ b/libsepol/include/sepol/errcodes.h<br> @@ -12,7 +12,7 @@ extern "C" {<br> #define SEPOL_OK 0<br> <br> /* These first error codes are defined for compatibility with<br> - * previous version of libsepol. In the future, custome error<br> + * previous version of libsepol. In the future, custom error<br> * codes that don't map to system error codes should be defined<br> * outside of the range of system error codes.<br> */<br> diff --git a/secilc/secilc.c b/secilc/secilc.c<br> index 0be6975b..e1347205 100644<br> --- a/secilc/secilc.c<br> +++ b/secilc/secilc.c<br> @@ -1,16 +1,16 @@<br> /*<br> * Copyright 2011 Tresys Technology, LLC. All rights reserved.<br> - * <br> + *<br> * Redistribution and use in source and binary forms, with or without<br> * modification, are permitted provided that the following conditions are met:<br> - * <br> + *<br> * 1. Redistributions of source code must retain the above copyright notice,<br> * this list of conditions and the following disclaimer.<br> - * <br> + *<br> * 2. Redistributions in binary form must reproduce the above copyright notice,<br> * this list of conditions and the following disclaimer in the documentation<br> * and/or other materials provided with the distribution.<br> - * <br> + *<br> * THIS SOFTWARE IS PROVIDED BY TRESYS TECHNOLOGY, LLC ``AS IS'' AND ANY EXPRESS<br> * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF<br> * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO<br> @@ -21,7 +21,7 @@<br> * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE<br> * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF<br> * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.<br> - * <br> + *<br> * The views and conclusions contained in the software and documentation are those<br> * of the authors and should not be interpreted as representing official policies,<br> * either expressed or implied, of Tresys Technology, LLC.<br> @@ -259,7 +259,7 @@ int main(int argc, char *argv[])<br> fprintf(stderr, "Could not stat file: %s\n", argv[i]);<br> goto exit;<br> }<br> - file_size = filedata.st_size; <br> + file_size = filedata.st_size;<br> <br> buffer = malloc(file_size);<br> rc = fread(buffer, file_size, 1, file);<br> @@ -347,7 +347,7 @@ int main(int argc, char *argv[])<br> fprintf(stderr, "Failed to open file_contexts file\n");<br> goto exit;<br> }<br> - <br> +<br> if (fwrite(fc_buf, sizeof(char), fc_size, file_contexts) != fc_size) {<br> fprintf(stderr, "Failed to write file_contexts file\n");<br> goto exit;<br> -- <br> 2.19.0.444.g18242da7ef-goog<br> <br> _______________________________________________<br> Selinux mailing list<br> <a href="mailto:Selinux@tycho.nsa.gov" target="_blank">Selinux@tycho.nsa.gov</a><br> To unsubscribe, send email to <a href="mailto:Selinux-leave@tycho.nsa.gov" target="_blank">Selinux-leave@tycho.nsa.gov</a>.<br> To get help, send an email containing "help" to <a href="mailto:Selinux-request@tycho.nsa.gov" target="_blank">Selinux-request@tycho.nsa.gov</a>.<br> </blockquote></div>
Both patches were applied: https://github.com/SELinuxProject/selinux/pull/100 On Mon, Sep 24, 2018 at 11:55 AM William Roberts <bill.c.roberts@gmail.com> wrote: > ack > > On Mon, Sep 24, 2018 at 11:12 AM Nick Kralevich via Selinux < > selinux@tycho.nsa.gov> wrote: > >> Signed-off-by: Nick Kralevich <nnk@google.com> >> --- >> libsepol/include/sepol/errcodes.h | 2 +- >> secilc/secilc.c | 14 +++++++------- >> 2 files changed, 8 insertions(+), 8 deletions(-) >> >> diff --git a/libsepol/include/sepol/errcodes.h >> b/libsepol/include/sepol/errcodes.h >> index 0136564a..6e9ff316 100644 >> --- a/libsepol/include/sepol/errcodes.h >> +++ b/libsepol/include/sepol/errcodes.h >> @@ -12,7 +12,7 @@ extern "C" { >> #define SEPOL_OK 0 >> >> /* These first error codes are defined for compatibility with >> - * previous version of libsepol. In the future, custome error >> + * previous version of libsepol. In the future, custom error >> * codes that don't map to system error codes should be defined >> * outside of the range of system error codes. >> */ >> diff --git a/secilc/secilc.c b/secilc/secilc.c >> index 0be6975b..e1347205 100644 >> --- a/secilc/secilc.c >> +++ b/secilc/secilc.c >> @@ -1,16 +1,16 @@ >> /* >> * Copyright 2011 Tresys Technology, LLC. All rights reserved. >> - * >> + * >> * Redistribution and use in source and binary forms, with or without >> * modification, are permitted provided that the following conditions >> are met: >> - * >> + * >> * 1. Redistributions of source code must retain the above copyright >> notice, >> * this list of conditions and the following disclaimer. >> - * >> + * >> * 2. Redistributions in binary form must reproduce the above >> copyright notice, >> * this list of conditions and the following disclaimer in the >> documentation >> * and/or other materials provided with the distribution. >> - * >> + * >> * THIS SOFTWARE IS PROVIDED BY TRESYS TECHNOLOGY, LLC ``AS IS'' AND ANY >> EXPRESS >> * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED >> WARRANTIES OF >> * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. >> IN NO >> @@ -21,7 +21,7 @@ >> * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING >> NEGLIGENCE >> * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, >> EVEN IF >> * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. >> - * >> + * >> * The views and conclusions contained in the software and documentation >> are those >> * of the authors and should not be interpreted as representing official >> policies, >> * either expressed or implied, of Tresys Technology, LLC. >> @@ -259,7 +259,7 @@ int main(int argc, char *argv[]) >> fprintf(stderr, "Could not stat file: %s\n", >> argv[i]); >> goto exit; >> } >> - file_size = filedata.st_size; >> + file_size = filedata.st_size; >> >> buffer = malloc(file_size); >> rc = fread(buffer, file_size, 1, file); >> @@ -347,7 +347,7 @@ int main(int argc, char *argv[]) >> fprintf(stderr, "Failed to open file_contexts file\n"); >> goto exit; >> } >> - >> + >> if (fwrite(fc_buf, sizeof(char), fc_size, file_contexts) != >> fc_size) { >> fprintf(stderr, "Failed to write file_contexts file\n"); >> goto exit; >> -- >> 2.19.0.444.g18242da7ef-goog >> >> _______________________________________________ >> Selinux mailing list >> Selinux@tycho.nsa.gov >> To unsubscribe, send email to Selinux-leave@tycho.nsa.gov. >> To get help, send an email containing "help" to >> Selinux-request@tycho.nsa.gov. >> > <div dir="ltr"><div dir="ltr">Both patches were applied: <a href="https://github.com/SELinuxProject/selinux/pull/100">https://github.com/SELinuxProject/selinux/pull/100</a></div></div><br><div class="gmail_quote"><div dir="ltr">On Mon, Sep 24, 2018 at 11:55 AM William Roberts <<a href="mailto:bill.c.roberts@gmail.com">bill.c.roberts@gmail.com</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div dir="ltr">ack</div><br><div class="gmail_quote"><div dir="ltr">On Mon, Sep 24, 2018 at 11:12 AM Nick Kralevich via Selinux <<a href="mailto:selinux@tycho.nsa.gov" target="_blank">selinux@tycho.nsa.gov</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Signed-off-by: Nick Kralevich <<a href="mailto:nnk@google.com" target="_blank">nnk@google.com</a>><br> ---<br> libsepol/include/sepol/errcodes.h | 2 +-<br> secilc/secilc.c | 14 +++++++-------<br> 2 files changed, 8 insertions(+), 8 deletions(-)<br> <br> diff --git a/libsepol/include/sepol/errcodes.h b/libsepol/include/sepol/errcodes.h<br> index 0136564a..6e9ff316 100644<br> --- a/libsepol/include/sepol/errcodes.h<br> +++ b/libsepol/include/sepol/errcodes.h<br> @@ -12,7 +12,7 @@ extern "C" {<br> #define SEPOL_OK 0<br> <br> /* These first error codes are defined for compatibility with<br> - * previous version of libsepol. In the future, custome error<br> + * previous version of libsepol. In the future, custom error<br> * codes that don't map to system error codes should be defined<br> * outside of the range of system error codes.<br> */<br> diff --git a/secilc/secilc.c b/secilc/secilc.c<br> index 0be6975b..e1347205 100644<br> --- a/secilc/secilc.c<br> +++ b/secilc/secilc.c<br> @@ -1,16 +1,16 @@<br> /*<br> * Copyright 2011 Tresys Technology, LLC. All rights reserved.<br> - * <br> + *<br> * Redistribution and use in source and binary forms, with or without<br> * modification, are permitted provided that the following conditions are met:<br> - * <br> + *<br> * 1. Redistributions of source code must retain the above copyright notice,<br> * this list of conditions and the following disclaimer.<br> - * <br> + *<br> * 2. Redistributions in binary form must reproduce the above copyright notice,<br> * this list of conditions and the following disclaimer in the documentation<br> * and/or other materials provided with the distribution.<br> - * <br> + *<br> * THIS SOFTWARE IS PROVIDED BY TRESYS TECHNOLOGY, LLC ``AS IS'' AND ANY EXPRESS<br> * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF<br> * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO<br> @@ -21,7 +21,7 @@<br> * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE<br> * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF<br> * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.<br> - * <br> + *<br> * The views and conclusions contained in the software and documentation are those<br> * of the authors and should not be interpreted as representing official policies,<br> * either expressed or implied, of Tresys Technology, LLC.<br> @@ -259,7 +259,7 @@ int main(int argc, char *argv[])<br> fprintf(stderr, "Could not stat file: %s\n", argv[i]);<br> goto exit;<br> }<br> - file_size = filedata.st_size; <br> + file_size = filedata.st_size;<br> <br> buffer = malloc(file_size);<br> rc = fread(buffer, file_size, 1, file);<br> @@ -347,7 +347,7 @@ int main(int argc, char *argv[])<br> fprintf(stderr, "Failed to open file_contexts file\n");<br> goto exit;<br> }<br> - <br> +<br> if (fwrite(fc_buf, sizeof(char), fc_size, file_contexts) != fc_size) {<br> fprintf(stderr, "Failed to write file_contexts file\n");<br> goto exit;<br> -- <br> 2.19.0.444.g18242da7ef-goog<br> <br> _______________________________________________<br> Selinux mailing list<br> <a href="mailto:Selinux@tycho.nsa.gov" target="_blank">Selinux@tycho.nsa.gov</a><br> To unsubscribe, send email to <a href="mailto:Selinux-leave@tycho.nsa.gov" target="_blank">Selinux-leave@tycho.nsa.gov</a>.<br> To get help, send an email containing "help" to <a href="mailto:Selinux-request@tycho.nsa.gov" target="_blank">Selinux-request@tycho.nsa.gov</a>.<br> </blockquote></div> </blockquote></div>
diff --git a/libsepol/include/sepol/errcodes.h b/libsepol/include/sepol/errcodes.h index 0136564a..6e9ff316 100644 --- a/libsepol/include/sepol/errcodes.h +++ b/libsepol/include/sepol/errcodes.h @@ -12,7 +12,7 @@ extern "C" { #define SEPOL_OK 0 /* These first error codes are defined for compatibility with - * previous version of libsepol. In the future, custome error + * previous version of libsepol. In the future, custom error * codes that don't map to system error codes should be defined * outside of the range of system error codes. */ diff --git a/secilc/secilc.c b/secilc/secilc.c index 0be6975b..e1347205 100644 --- a/secilc/secilc.c +++ b/secilc/secilc.c @@ -1,16 +1,16 @@ /* * Copyright 2011 Tresys Technology, LLC. All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: - * + * * 1. Redistributions of source code must retain the above copyright notice, * this list of conditions and the following disclaimer. - * + * * 2. Redistributions in binary form must reproduce the above copyright notice, * this list of conditions and the following disclaimer in the documentation * and/or other materials provided with the distribution. - * + * * THIS SOFTWARE IS PROVIDED BY TRESYS TECHNOLOGY, LLC ``AS IS'' AND ANY EXPRESS * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO @@ -21,7 +21,7 @@ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * + * * The views and conclusions contained in the software and documentation are those * of the authors and should not be interpreted as representing official policies, * either expressed or implied, of Tresys Technology, LLC. @@ -259,7 +259,7 @@ int main(int argc, char *argv[]) fprintf(stderr, "Could not stat file: %s\n", argv[i]); goto exit; } - file_size = filedata.st_size; + file_size = filedata.st_size; buffer = malloc(file_size); rc = fread(buffer, file_size, 1, file); @@ -347,7 +347,7 @@ int main(int argc, char *argv[]) fprintf(stderr, "Failed to open file_contexts file\n"); goto exit; } - + if (fwrite(fc_buf, sizeof(char), fc_size, file_contexts) != fc_size) { fprintf(stderr, "Failed to write file_contexts file\n"); goto exit;
Signed-off-by: Nick Kralevich <nnk@google.com> --- libsepol/include/sepol/errcodes.h | 2 +- secilc/secilc.c | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-)