From: Andy Polyakov <appro@openssl.org>
Date: Wed, 16 Aug 2017 21:08:03 +0000 (+0200)
Subject: err/err.c: improve readability.
X-Git-Tag: OpenSSL_1_1_1-pre1~824
X-Git-Url: https://git.openssl.org/?p=openssl.git;a=commitdiff_plain;h=8909c2ceeee2c1683f783d905f975bca8626ad33;ds=sidebyside

err/err.c: improve readability.

Reviewed-by: Rich Salz <rsalz@openssl.org>
---

diff --git a/crypto/err/err.c b/crypto/err/err.c
index 8d0da79f30..eec071236e 100644
--- a/crypto/err/err.c
+++ b/crypto/err/err.c
@@ -800,9 +800,7 @@ int ERR_pop_to_mark(void)
     while (es->bottom != es->top
            && (es->err_flags[es->top] & ERR_FLAG_MARK) == 0) {
         err_clear(es, es->top);
-        es->top -= 1;
-        if (es->top == -1)
-            es->top = ERR_NUM_ERRORS - 1;
+        es->top = es->top > 0 ? es->top - 1 : ERR_NUM_ERRORS - 1;
     }
 
     if (es->bottom == es->top)
@@ -823,9 +821,7 @@ int ERR_clear_last_mark(void)
     top = es->top;
     while (es->bottom != top
            && (es->err_flags[top] & ERR_FLAG_MARK) == 0) {
-        top -= 1;
-        if (top == -1)
-            top = ERR_NUM_ERRORS - 1;
+        top = top > 0 ? top - 1 : ERR_NUM_ERRORS - 1;
     }
 
     if (es->bottom == top)