You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mynewt.apache.org by cc...@apache.org on 2016/09/08 18:22:06 UTC

[1/2] incubator-mynewt-core git commit: Fix compiler warning in x509_crl.c

Repository: incubator-mynewt-core
Updated Branches:
  refs/heads/develop 7f28def42 -> d9aa9e242


Fix compiler warning in x509_crl.c

Fixed compiler warning with added parens.

Compiling x509_crl.c
x509_crl.c: In function 'mbedtls_x509_crl_parse':
x509_crl.c:508:5: error: this 'else' clause does not guard... [-Werror=misleading-indentation]
     else
          ^~~~
x509_crl.c:514:9: note: ...this statement, but the latter is misleadingly indented as if it is guarded by the 'else'
           if( ret == 0 )
             ^~
 cc1: all warnings being treated as errors
 Testing package @apache-mynewt-core/sys/log


Project: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/commit/94b22bcc
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/tree/94b22bcc
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/diff/94b22bcc

Branch: refs/heads/develop
Commit: 94b22bccf18b23710a6269870a558b0c914301a0
Parents: 7f28def
Author: Peter Snyder <gi...@peterfs.com>
Authored: Thu Sep 8 01:01:35 2016 -0700
Committer: Peter Snyder <gi...@peterfs.com>
Committed: Thu Sep 8 01:01:35 2016 -0700

----------------------------------------------------------------------
 libs/mbedtls/src/x509_crl.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/94b22bcc/libs/mbedtls/src/x509_crl.c
----------------------------------------------------------------------
diff --git a/libs/mbedtls/src/x509_crl.c b/libs/mbedtls/src/x509_crl.c
index 125a773..7ddbf02 100644
--- a/libs/mbedtls/src/x509_crl.c
+++ b/libs/mbedtls/src/x509_crl.c
@@ -503,9 +503,9 @@ int mbedtls_x509_crl_parse( mbedtls_x509_crl *chain, const unsigned char *buf, s
         mbedtls_pem_init( &pem );
 
     /* Avoid calling mbedtls_pem_read_buffer() on non-null-terminated string */
-    if( buflen == 0 || buf[buflen - 1] != '\0' )
+    if( buflen == 0 || buf[buflen - 1] != '\0' ) {
         ret = MBEDTLS_ERR_PEM_NO_HEADER_FOOTER_PRESENT;
-    else
+    } else {
         ret = mbedtls_pem_read_buffer( &pem,
                                "-----BEGIN X509 CRL-----",
                                "-----END X509 CRL-----",
@@ -535,6 +535,7 @@ int mbedtls_x509_crl_parse( mbedtls_x509_crl *chain, const unsigned char *buf, s
             return( ret );
         }
     }
+    }
     /* In the PEM case, buflen is 1 at the end, for the terminated NULL byte.
      * And a valid CRL cannot be less than 1 byte anyway. */
     while( is_pem && buflen > 1 );


[2/2] incubator-mynewt-core git commit: This closes #105.

Posted by cc...@apache.org.
This closes #105.

Merge remote-tracking branch 'peterfs/logfix' into develop

* peterfs/logfix:
  Fix compiler warning in x509_crl.c


Project: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/commit/d9aa9e24
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/tree/d9aa9e24
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/diff/d9aa9e24

Branch: refs/heads/develop
Commit: d9aa9e242c4e9adab5e1361b066238683677477c
Parents: 7f28def 94b22bc
Author: Christopher Collins <cc...@apache.org>
Authored: Thu Sep 8 10:17:38 2016 -0700
Committer: Christopher Collins <cc...@apache.org>
Committed: Thu Sep 8 10:17:38 2016 -0700

----------------------------------------------------------------------
 libs/mbedtls/src/x509_crl.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------