[openssl-commits] [openssl] master update

[Emilia Kasper]

The branch master has been updated
       via  f4f78ff7daf15f609a8bef1179d01cc982e37478 (commit)
      from  bbafa47b554fa2c89cf944951c170bbe21edf469 (commit)


- Log -----------------------------------------------------------------
commit f4f78ff7daf15f609a8bef1179d01cc982e37478
Author: Emilia Kasper <emilia at openssl.org>
Date:   Thu Oct 15 12:53:35 2015 +0200

    PACKET: fix __owur
    
    Reviewed-by: Matt Caswell <matt at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 ssl/packet_locl.h | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/ssl/packet_locl.h b/ssl/packet_locl.h
index 778ec77..507d64f 100644
--- a/ssl/packet_locl.h
+++ b/ssl/packet_locl.h
@@ -86,7 +86,7 @@ static inline void packet_forward(PACKET *pkt, size_t len)
 /*
  * Returns the number of bytes remaining to be read in the PACKET
  */
-__owur static inline size_t PACKET_remaining(const PACKET *pkt)
+static inline size_t PACKET_remaining(const PACKET *pkt)
 {
     return pkt->remaining;
 }
@@ -107,7 +107,8 @@ static inline unsigned char *PACKET_data(const PACKET *pkt)
  * copy of the data so |buf| must be present for the whole time that the PACKET
  * is being used.
  */
-static inline int PACKET_buf_init(PACKET *pkt, unsigned char *buf, size_t len)
+__owur static inline int PACKET_buf_init(PACKET *pkt, unsigned char *buf,
+                                         size_t len)
 {
     /* Sanity check for negative values. */
     if (buf + len < buf)
@@ -148,9 +149,7 @@ __owur static inline int PACKET_peek_sub_packet(const PACKET *pkt,
     if (PACKET_remaining(pkt) < len)
         return 0;
 
-    PACKET_buf_init(subpkt, pkt->curr, len);
-
-    return 1;
+    return PACKET_buf_init(subpkt, pkt->curr, len);
 }
 
 /*