You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by ic...@apache.org on 2018/01/03 10:21:54 UTC

svn commit: r1819943 - in /httpd/httpd/trunk/modules/md: md.h md_crypt.c

Author: icing
Date: Wed Jan  3 10:21:54 2018
New Revision: 1819943

URL: http://svn.apache.org/viewvc?rev=1819943&view=rev
Log:
On the trunk:

Fixed gcc warnings in latest mod_md version.


Modified:
    httpd/httpd/trunk/modules/md/md.h
    httpd/httpd/trunk/modules/md/md_crypt.c

Modified: httpd/httpd/trunk/modules/md/md.h
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/md/md.h?rev=1819943&r1=1819942&r2=1819943&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/md/md.h (original)
+++ httpd/httpd/trunk/modules/md/md.h Wed Jan  3 10:21:54 2018
@@ -280,7 +280,7 @@ struct md_creds_t {
  * cascaded apr_status_t checks. */
 #define MD_CHK_VARS                 const char *md_chk_
 #define MD_LAST_CHK                 md_chk_
-#define MD_CHK_STEP(c, status, s)   (md_chk_ = s, status == (rv = (c)))
+#define MD_CHK_STEP(c, status, s)   (md_chk_ = s, (void)md_chk_, status == (rv = (c)))
 #define MD_CHK(c, status)           MD_CHK_STEP(c, status, #c)
 #define MD_IS_ERR(c, err)           (md_chk_ = #c, APR_STATUS_IS_##err((rv = (c))))
 #define MD_CHK_SUCCESS(c)           MD_CHK(c, APR_SUCCESS)

Modified: httpd/httpd/trunk/modules/md/md_crypt.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/md/md_crypt.c?rev=1819943&r1=1819942&r2=1819943&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/md/md_crypt.c (original)
+++ httpd/httpd/trunk/modules/md/md_crypt.c Wed Jan  3 10:21:54 2018
@@ -1107,7 +1107,7 @@ static apr_status_t sk_add_alt_names(STA
 #define MD_OID_MUST_STAPLE_SNAME        "tlsfeature"
 #define MD_OID_MUST_STAPLE_LNAME        "TLS Feature" 
 
-static int get_must_staple_nid()
+static int get_must_staple_nid(void)
 {
     /* Funny API, the OID for must staple might be configured or
      * might be not. In the second case, we need to add it. But adding