Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 7 Feb 2020 10:30:02 +0000 (UTC)
From:      Tobias Kortkamp <tobik@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r525473 - head/devel/libexplain/files
Message-ID:  <202002071030.017AU2kL093026@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: tobik
Date: Fri Feb  7 10:30:01 2020
New Revision: 525473
URL: https://svnweb.freebsd.org/changeset/ports/525473

Log:
  devel/libexplain: Unbreak after base r357412
  
  libexplain/buffer/open_flags.c:187:10: error: duplicate case value '262144'
      case O_EXEC:
           ^
  /usr/include/fcntl.h:121:17: note: expanded from macro 'O_EXEC'
  #define O_EXEC          0x00040000      /* Open for execute only */
                          ^
  libexplain/buffer/open_flags.c:180:11: note: previous case defined here
       case O_SEARCH:
            ^
  /usr/include/fcntl.h:122:18: note: expanded from macro 'O_SEARCH'
  #define O_SEARCH        O_EXEC
                          ^
  /usr/include/fcntl.h:121:17: note: expanded from macro 'O_EXEC'
  #define O_EXEC          0x00040000      /* Open for execute only */
                          ^
  1 error generated.
  
  http://beefy17.nyi.freebsd.org/data/head-i386-default/p525358_s357606/logs/libexplain-1.3.D012_6.log

Added:
  head/devel/libexplain/files/patch-libexplain_buffer_open__flags.c   (contents, props changed)

Added: head/devel/libexplain/files/patch-libexplain_buffer_open__flags.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/libexplain/files/patch-libexplain_buffer_open__flags.c	Fri Feb  7 10:30:01 2020	(r525473)
@@ -0,0 +1,30 @@
+Unbreak after base r357412
+
+libexplain/buffer/open_flags.c:187:10: error: duplicate case value '262144'
+    case O_EXEC:
+         ^
+/usr/include/fcntl.h:121:17: note: expanded from macro 'O_EXEC'
+#define O_EXEC          0x00040000      /* Open for execute only */
+                        ^
+libexplain/buffer/open_flags.c:180:11: note: previous case defined here
+     case O_SEARCH:
+          ^
+/usr/include/fcntl.h:122:18: note: expanded from macro 'O_SEARCH'
+#define O_SEARCH        O_EXEC
+                        ^
+/usr/include/fcntl.h:121:17: note: expanded from macro 'O_EXEC'
+#define O_EXEC          0x00040000      /* Open for execute only */
+                        ^
+1 error generated.
+
+--- libexplain/buffer/open_flags.c.orig	2020-02-07 09:55:29 UTC
++++ libexplain/buffer/open_flags.c
+@@ -176,7 +176,7 @@ explain_buffer_open_flags(explain_string_buffer_t *sb,
+         explain_string_buffer_puts(sb, "O_WRONLY");
+         break;
+ 
+-#if defined(O_SEARCH) && O_SEARCH != 0
++#if defined(O_SEARCH) && O_SEARCH != 0 && O_SEARCH != O_EXEC
+      case O_SEARCH:
+         /* open a directory for searchin only */
+         explain_string_buffer_puts(sb, "O_SEARCH");



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202002071030.017AU2kL093026>