On 2023-09-09 07:58, Bruno Haible wrote:
Can we untabify
mcel.h
mountlist.c
verify.h
(as we do with all source files that are not shared with glibc)?
Actually verify.h is shared with glibc but I guess we're upstream.
I installed the attached.
From 17ca38df4fbdba1cc0644583534e8c00958106a8 Mon Sep 17 00:00:00 2001
From: Paul Eggert <egg...@cs.ucla.edu>
Date: Sat, 9 Sep 2023 10:13:50 -0700
Subject: [PATCH] Remove tabs from mcel.h, mountlist.h, verify.h
---
lib/mcel.h | 16 ++++++++--------
lib/mountlist.c | 6 +++---
lib/verify.h | 10 +++++-----
3 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/lib/mcel.h b/lib/mcel.h
index 400604f8b2..54ae125957 100644
--- a/lib/mcel.h
+++ b/lib/mcel.h
@@ -38,9 +38,9 @@
char *p = ..., *lim = ...;
for (mcel_t g; p < lim; p += g.len)
{
- g = mcel_scan (p, lim);
- process (g);
- }
+ g = mcel_scan (p, lim);
+ process (g);
+ }
You can select from G using G.ch, G.err, and G.len.
G is an encoding error if G.err is nonzero, a character otherwise.
@@ -51,16 +51,16 @@
char *p = ...;
for (; *p; p++)
- process (*p);
+ process (*p);
You can use this multi-byte code:
char *p = ...;
for (mcel_t g; *p; p += g.len)
- {
- g = mcel_scanz (p);
- process (g);
- }
+ {
+ g = mcel_scanz (p);
+ process (g);
+ }
mcel_scant (P, TERMINATOR) is like mcel_scanz (P) except the
string is terminated by TERMINATOR. The C standard says that the
diff --git a/lib/mountlist.c b/lib/mountlist.c
index 8b06e7b7ee..5bdc54eddd 100644
--- a/lib/mountlist.c
+++ b/lib/mountlist.c
@@ -192,11 +192,11 @@
we grant an exception to any with "bind" in its list of mount options.
I.e., those are *not* dummy entries. */
#ifdef MOUNTED_GETMNTENT1
-# define ME_DUMMY(Fs_name, Fs_type, Bind) \
- (ME_DUMMY_0 (Fs_name, Fs_type) \
+# define ME_DUMMY(Fs_name, Fs_type, Bind) \
+ (ME_DUMMY_0 (Fs_name, Fs_type) \
|| (strcmp (Fs_type, "none") == 0 && !Bind))
#else
-# define ME_DUMMY(Fs_name, Fs_type) \
+# define ME_DUMMY(Fs_name, Fs_type) \
(ME_DUMMY_0 (Fs_name, Fs_type) || strcmp (Fs_type, "none") == 0)
#endif
diff --git a/lib/verify.h b/lib/verify.h
index e4af91517e..181dc6c292 100644
--- a/lib/verify.h
+++ b/lib/verify.h
@@ -188,9 +188,9 @@ template <int w>
_gl_verify_type<(R) ? 1 : -1>
#elif defined _GL_HAVE__STATIC_ASSERT
# define _GL_VERIFY_TYPE(R, DIAGNOSTIC) \
- struct { \
- _Static_assert (R, DIAGNOSTIC); \
- int _gl_dummy; \
+ struct { \
+ _Static_assert (R, DIAGNOSTIC); \
+ int _gl_dummy; \
}
#else
# define _GL_VERIFY_TYPE(R, DIAGNOSTIC) \
@@ -212,8 +212,8 @@ template <int w>
#elif defined _GL_HAVE__STATIC_ASSERT
# define _GL_VERIFY(R, DIAGNOSTIC, ...) _Static_assert (R, DIAGNOSTIC)
#else
-# define _GL_VERIFY(R, DIAGNOSTIC, ...) \
- extern int (*_GL_GENSYM (_gl_verify_function) (void)) \
+# define _GL_VERIFY(R, DIAGNOSTIC, ...) \
+ extern int (*_GL_GENSYM (_gl_verify_function) (void)) \
[_GL_VERIFY_TRUE (R, DIAGNOSTIC)]
# if 4 < __GNUC__ + (6 <= __GNUC_MINOR__)
# pragma GCC diagnostic ignored "-Wnested-externs"
--
2.39.2
