From: Karel Zak <kzak@redhat.com>
Date: Wed, 1 May 2024 19:17:52 +0000 (+0200)
Subject: Merge branch 'lsfd/fcntl' of https://github.com/t-8ch/util-linux
X-Git-Tag: v2.42-start~371
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3f0473ae211b3ba98d55129b1d468b7feeb9cfb5;p=thirdparty%2Futil-linux.git

Merge branch 'lsfd/fcntl' of https://github.com/t-8ch/util-linux

* 'lsfd/fcntl' of https://github.com/t-8ch/util-linux:
  lsfd: include buffer.h in decode-file-flags.h
  buffer: replace include of c.h with stddef.h
  lsfd: move interface of decode-file-flags to header
---

3f0473ae211b3ba98d55129b1d468b7feeb9cfb5
diff --cc lsfd-cmd/decode-file-flags.c
index 29c8999cd3,3f7ecd8f71..322216c11f
--- a/lsfd-cmd/decode-file-flags.c
+++ b/lsfd-cmd/decode-file-flags.c
@@@ -41,18 -41,15 +41,9 @@@
   * /usr/include/fcntl.h includes /usr/include/bits/fcntl.h.
   */
  
 -#if defined HAVE_ASM_FCNTL_H
 -#include <asm/fcntl.h>
 -#elif defined HAVE_ASM_GENERIC_FCNTL_H
 -#include <asm-generic/fcntl.h>
 -#else
 -#error "kernel's fcntl.h is not available"
 -#endif
 +#include <linux/fcntl.h>
  
- #include <stddef.h>		/* for size_t */
- struct ul_buffer;
- 
- void lsfd_decode_file_flags(struct ul_buffer *buf, int flags);
- 
- /* We cannot include buffer.h because buffer.h includes
-  * /usr/include/fcntl.h indirectly. */
- extern int ul_buffer_is_empty(struct ul_buffer *buf);
- extern int ul_buffer_append_data(struct ul_buffer *buf, const char *data, size_t sz);
- extern int ul_buffer_append_string(struct ul_buffer *buf, const char *str);
+ #include "decode-file-flags.h"
  
  void lsfd_decode_file_flags(struct ul_buffer *buf, int flags)
  {