[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  f625d383719b3edb0c498d9596ead025935d0453 (commit)
      from  7de1f0721f8439727ee9c71c56684b9d5ea7bdc3 (commit)


- Log -----------------------------------------------------------------
commit f625d383719b3edb0c498d9596ead025935d0453
Author: Richard Levitte <levitte at openssl.org>
Date:   Wed Jan 13 18:58:15 2016 +0100

    Simplify the EXIT macrot for VMS
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

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

Summary of changes:
 e_os.h | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/e_os.h b/e_os.h
index 8c644bf..4f2c775 100644
--- a/e_os.h
+++ b/e_os.h
@@ -376,24 +376,19 @@ extern FILE *_imp___iob;
 
      So, what we do here is to change 0 to 1 to get the default success status,
      and everything else is shifted up to fit into the status number field, and
-     the status is tagged as an error, which I believe is what is wanted here.
+     the status is tagged as an error, which is what is wanted here.
 
      Finally, we add the VMS C facility code 0x35a000, because there are some
      programs, such as Perl, that will reinterpret the code back to something
      POSIXly.  'man perlvms' explains it further.
+
      NOTE: the perlvms manual wants to turn all codes 2 to 255 into success
      codes (status type = 1).  I couldn't disagree more.  Fortunately, the
      status type doesn't seem to bother Perl.
      -- Richard Levitte
   */
-#   define EXIT(n)             do { int __VMS_EXIT = n; \
-                                     if (__VMS_EXIT == 0) \
-                                       __VMS_EXIT = 1; \
-                                     else \
-                                       __VMS_EXIT = (n << 3) | 2; \
-                                     __VMS_EXIT |= 0x10000000; \
-                                     __VMS_EXIT |=   0x35a000; \
-                                     exit(__VMS_EXIT); } while(0)
+#   define EXIT(n)  exit((n) ? (((n) << 3) | 2 | 0x10000000 | 0x35a000) : 1)
+
 #   define NO_SYS_PARAM_H
 #   define NO_SYS_UN_H