compiler-rt-netbsd: Fix style of the code

[Kamil Rytarowski <n54%gmx.com@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By:	kamil
Date:		Thu Jun 14 16:03:55 2018 +0200
Changeset:	1fdf250b484fc7a644d45b1882280a7f221a34f5

Modified Files:
	compiler-rt-netbsd/distinfo
	compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__common__interceptors.inc

Log Message:
compiler-rt-netbsd: Fix style of the code

In order to execute the tests for sanitizers, there is need to restruct code to
80 columns.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=1fdf250b484fc7a644d45b1882280a7f221a34f5

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 compiler-rt-netbsd/distinfo                        |  2 +-
 ...zer__common_sanitizer__common__interceptors.inc | 34 ++++++++++++----------
 2 files changed, 20 insertions(+), 16 deletions(-)

diffs:
diff --git a/compiler-rt-netbsd/distinfo b/compiler-rt-netbsd/distinfo
index 3827ebaab1..16286a83e1 100644
--- a/compiler-rt-netbsd/distinfo
+++ b/compiler-rt-netbsd/distinfo
@@ -10,7 +10,7 @@ SHA1 (patch-lib_fuzzer_tests_CMakeLists.txt) = e2e0e397eaf148df329f2c25ca9185f57
 SHA1 (patch-lib_interception_interception.h) = a7f97b191769c846be27e17430bbe39435976642
 SHA1 (patch-lib_msan_msan__interceptors.cc) = bfb0d6ba97382a26d54141c3e4cc0c0f584178a1
 SHA1 (patch-lib_msan_msan__linux.cc) = dc3431b7606f3e1c106ffd2568ab4a6c77321731
-SHA1 (patch-lib_sanitizer__common_sanitizer__common__interceptors.inc) = 488090d6ad98c6d252ad9ec6839a3dfd6aa141f7
+SHA1 (patch-lib_sanitizer__common_sanitizer__common__interceptors.inc) = 80ef7549ac8d2f7a6f5b9a8103360f0eaafc75bb
 SHA1 (patch-lib_sanitizer__common_sanitizer__internal__defs.h) = 9ffcb3ae5ccfcb99d842efe55f6d698cd2e02846
 SHA1 (patch-lib_sanitizer__common_sanitizer__linux.cc) = 83636321cef6a17281a27e2ed3dd1b71e5429a6a
 SHA1 (patch-lib_sanitizer__common_sanitizer__linux__libcdep.cc) = ac04d9b155c7281dde98741b7f79714e98c2bbc3
diff --git a/compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__common__interceptors.inc b/compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__common__interceptors.inc
index 6df234d12d..e8c3a9e4a4 100644
--- a/compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__common__interceptors.inc
+++ b/compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__common__interceptors.inc
@@ -49,7 +49,7 @@ $NetBSD$
    void *ctx;
    COMMON_INTERCEPTOR_ENTER(ctx, statvfs, path, buf);
    if (path) COMMON_INTERCEPTOR_READ_RANGE(ctx, path, REAL(strlen)(path) + 1);
-@@ -7234,6 +7241,1510 @@ INTERCEPTOR(struct __sanitizer_netent *,
+@@ -7234,6 +7241,1514 @@ INTERCEPTOR(struct __sanitizer_netent *,
  #define INIT_NETENT
  #endif
  
@@ -1408,13 +1408,13 @@ $NetBSD$
 +  return ret;
 +}
 +
-+#define INIT_RMD160                                                              \
-+  COMMON_INTERCEPT_FUNCTION(RMD160Init);                                         \
-+  COMMON_INTERCEPT_FUNCTION(RMD160Update);                                       \
-+  COMMON_INTERCEPT_FUNCTION(RMD160Final);                                        \
-+  COMMON_INTERCEPT_FUNCTION(RMD160Transform);                                    \
-+  COMMON_INTERCEPT_FUNCTION(RMD160End);                                          \
-+  COMMON_INTERCEPT_FUNCTION(RMD160File);                                         \
++#define INIT_RMD160                                                            \
++  COMMON_INTERCEPT_FUNCTION(RMD160Init);                                       \
++  COMMON_INTERCEPT_FUNCTION(RMD160Update);                                     \
++  COMMON_INTERCEPT_FUNCTION(RMD160Final);                                      \
++  COMMON_INTERCEPT_FUNCTION(RMD160Transform);                                  \
++  COMMON_INTERCEPT_FUNCTION(RMD160End);                                        \
++  COMMON_INTERCEPT_FUNCTION(RMD160File);                                       \
 +  COMMON_INTERCEPT_FUNCTION(RMD160Data)
 +#else
 +#define INIT_RMD160
@@ -1446,13 +1446,15 @@ $NetBSD$
 +      COMMON_INTERCEPTOR_READ_RANGE(ctx, context, SHA##LEN##_CTX_sz); \
 +    REAL(SHA##LEN##_Pad)(context); \
 +  } \
-+  INTERCEPTOR(void, SHA##LEN##_Final, u8 digest[SHA##LEN##_digest_length], void *context) { \
++  INTERCEPTOR(void, SHA##LEN##_Final, u8 digest[SHA##LEN##_digest_length], \
++  void *context) { \
 +    void *ctx; \
 +    COMMON_INTERCEPTOR_ENTER(ctx, SHA##LEN##_Final, digest, context); \
 +    REAL(SHA##LEN##_Final)(digest, context); \
 +    if (digest) \
 +      COMMON_INTERCEPTOR_WRITE_RANGE(ctx, digest, \
-+                                     sizeof(digest[0]) * SHA##LEN##_digest_length); \
++                                     sizeof(digest[0]) * \
++  SHA##LEN##_digest_length); \
 +  } \
 +  INTERCEPTOR(void, SHA##LEN##_Transform, SHA2_STATE_T state[8], \
 +              const u8 buffer[SHA##LEN##_block_length]) { \
@@ -1462,7 +1464,8 @@ $NetBSD$
 +      COMMON_INTERCEPTOR_READ_RANGE(ctx, state, sizeof(state[0]) * 8); \
 +    if (buffer) \
 +      COMMON_INTERCEPTOR_READ_RANGE(ctx, buffer, \
-+                                    sizeof(buffer[0]) * SHA##LEN##_block_length); \
++                                    sizeof(buffer[0]) * \
++  SHA##LEN##_block_length); \
 +    REAL(SHA##LEN##_Transform)(state, buffer); \
 +  } \
 +  INTERCEPTOR(char *, SHA##LEN##_End, void *context, char *buf) { \
@@ -1479,7 +1482,7 @@ $NetBSD$
 +    void *ctx; \
 +    COMMON_INTERCEPTOR_ENTER(ctx, SHA##LEN##_File, filename, buf); \
 +    if (filename) \
-+      COMMON_INTERCEPTOR_READ_RANGE(ctx, filename, REAL(strlen)(filename) + 1); \
++      COMMON_INTERCEPTOR_READ_RANGE(ctx, filename, REAL(strlen)(filename) + 1);\
 +    char *ret = REAL(SHA##LEN##_File)(filename, buf); \
 +    if (ret) \
 +      COMMON_INTERCEPTOR_WRITE_RANGE(ctx, ret, SHA##LEN##_return_length); \
@@ -1488,9 +1491,10 @@ $NetBSD$
 +  INTERCEPTOR(char *, SHA##LEN##_FileChunk, const char *filename, char *buf, \
 +              OFF_T offset, OFF_T length) { \
 +    void *ctx; \
-+    COMMON_INTERCEPTOR_ENTER(ctx, SHA##LEN##_FileChunk, filename, buf, offset, length); \
++    COMMON_INTERCEPTOR_ENTER(ctx, SHA##LEN##_FileChunk, filename, buf, offset, \
++  length); \
 +    if (filename) \
-+      COMMON_INTERCEPTOR_READ_RANGE(ctx, filename, REAL(strlen)(filename) + 1); \
++      COMMON_INTERCEPTOR_READ_RANGE(ctx, filename, REAL(strlen)(filename) + 1);\
 +    char *ret = REAL(SHA##LEN##_FileChunk)(filename, buf, offset, length); \
 +    if (ret) \
 +      COMMON_INTERCEPTOR_WRITE_RANGE(ctx, ret, SHA##LEN##_return_length); \
@@ -1560,7 +1564,7 @@ $NetBSD$
  static void InitializeCommonInterceptors() {
    static u64 metadata_mem[sizeof(MetadataHashMap) / sizeof(u64) + 1];
    interceptor_metadata_map = new((void *)&metadata_mem) MetadataHashMap();
-@@ -7483,6 +8994,27 @@ static void InitializeCommonInterceptors
+@@ -7483,6 +8998,27 @@ static void InitializeCommonInterceptors
    INIT_TTYENT;
    INIT_PROTOENT;
    INIT_NETENT;