Change the indent options that "make indent" uses to that "make
indent" and "make sc_spaces_not_tabs" have consistent expectations.
* cfg.mk (indent_args): use the --no-tabs option of indent so that
"make indent" produces an output which is acceptalbe to "make
sc_spaces_not_tabs".
* find/ftsfind.c: Re-indent with "make indent".
* find/parser.c: Likewise.
* find/print.c: Likewise.
* find/util.c: Likewise.
* gnulib-local/lib/gcc-function-attributes.h: Likewise.
* locate/locate.c: Likewise.
* tests/xargs/test-sigusr.c: Likewise.
* xargs/xargs.c: Likewise.
---
cfg.mk | 4 +
find/ftsfind.c | 2 +-
find/parser.c | 32 +++---
find/print.c | 120 ++++++++++-----------
find/util.c | 2 +-
gnulib-local/lib/gcc-function-attributes.h | 26 ++---
locate/locate.c | 6 +-
tests/xargs/test-sigusr.c | 4 +-
xargs/xargs.c | 14 +--
9 files changed, 107 insertions(+), 103 deletions(-)
diff --git a/cfg.mk b/cfg.mk
index 6ef1bd09..0789056b 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -301,6 +301,10 @@ sc_spaces_not_tabs:
&& { echo '$(ME): Indent C sources with spaces, not tabs (fix with
build-aux/tabs-to-spaces.sh)' 1>&2; exit 1; } \
|| :
+# Ensure that the output of "make indent" is acceptable to
+# sc_spaces_not_tabs.
+indent_args = --no-tabs --ignore-profile --preprocessor-indentation 1
+
# Enforce standard references "standard input/output/error".
sc_standard_outputs:
@cd $(srcdir) || exit 1; \
diff --git a/find/ftsfind.c b/find/ftsfind.c
index 1532fc76..c30d43fc 100644
--- a/find/ftsfind.c
+++ b/find/ftsfind.c
@@ -659,7 +659,7 @@ process_all_startpoints (int argc, char *argv[])
{
case AI_ERR_EOF:
goto argv_iter_done;
- case AI_ERR_READ: /* may only happen with -files0-from */
+ case AI_ERR_READ: /* may only happen with -files0-from */
error (0, errno, _("%s: read error"), files0_filename_quoted);
state.exit_status = EXIT_FAILURE;
ok = false;
diff --git a/find/parser.c b/find/parser.c
index dec494c3..4ecd634f 100644
--- a/find/parser.c
+++ b/find/parser.c
@@ -411,7 +411,7 @@ fallback_getfilecon (int fd, const char *name, char **p,
int prev_rv)
case ELOOP:
case ENAMETOOLONG:
#ifdef EOVERFLOW
- case EOVERFLOW: /* EOVERFLOW is not #defined on UNICOS. */
+ case EOVERFLOW: /* EOVERFLOW is not #defined on UNICOS. */
#endif
default:
return prev_rv;
@@ -561,13 +561,13 @@ set_follow_state (enum SymlinkOption opt)
{
switch (opt)
{
- case SYMLINK_ALWAYS_DEREF: /* -L */
+ case SYMLINK_ALWAYS_DEREF: /* -L */
options.xstat = optionl_stat;
options.x_getfilecon = optionl_getfilecon;
options.no_leaf_check = true;
break;
- case SYMLINK_NEVER_DEREF: /* -P (default) */
+ case SYMLINK_NEVER_DEREF: /* -P (default) */
options.xstat = optionp_stat;
options.x_getfilecon = optionp_getfilecon;
/* Can't turn no_leaf_check off because the user might have specified
@@ -575,7 +575,7 @@ set_follow_state (enum SymlinkOption opt)
*/
break;
- case SYMLINK_DEREF_ARGSONLY: /* -H */
+ case SYMLINK_DEREF_ARGSONLY: /* -H */
options.xstat = optionh_stat;
options.x_getfilecon = optionh_getfilecon;
options.no_leaf_check = true;
@@ -1898,7 +1898,7 @@ parse_perm (const struct parser_table *entry, char
**argv, int *arg_ptr)
rate = 0.2;
break;
- case '/': /* GNU extension */
+ case '/': /* GNU extension */
mode_start = 1;
kind = PERM_ANY;
rate = 0.3;
@@ -2170,12 +2170,12 @@ parse_size (const struct parser_table *entry, char
**argv, int *arg_ptr)
arg[len - 1] = '\0';
break;
- case 'M': /* Mebibytes */
+ case 'M': /* Mebibytes */
blksize = 1024 * 1024;
arg[len - 1] = '\0';
break;
- case 'G': /* Gibibytes */
+ case 'G': /* Gibibytes */
blksize = 1024 * 1024 * 1024;
arg[len - 1] = '\0';
break;
@@ -2671,23 +2671,23 @@ insert_type (char **argv, int *arg_ptr,
switch (*typeletter)
{
- case 'b': /* block special */
+ case 'b': /* block special */
type_cell = FTYPE_BLK;
rate = 0.000888f;
break;
- case 'c': /* character special */
+ case 'c': /* character special */
type_cell = FTYPE_CHR;
rate = 0.000443f;
break;
- case 'd': /* directory */
+ case 'd': /* directory */
type_cell = FTYPE_DIR;
rate = 0.0922f;
break;
- case 'f': /* regular file */
+ case 'f': /* regular file */
type_cell = FTYPE_REG;
rate = 0.875f;
break;
- case 'l': /* symbolic link */
+ case 'l': /* symbolic link */
#ifdef S_IFLNK
type_cell = FTYPE_LNK;
rate = 0.0311f;
@@ -2699,7 +2699,7 @@ insert_type (char **argv, int *arg_ptr,
pred_string, (*typeletter));
#endif
break;
- case 'p': /* pipe */
+ case 'p': /* pipe */
#ifdef S_IFIFO
type_cell = FTYPE_FIFO;
rate = 7.554e-6f;
@@ -2711,7 +2711,7 @@ insert_type (char **argv, int *arg_ptr,
pred_string, (*typeletter));
#endif
break;
- case 's': /* socket */
+ case 's': /* socket */
#ifdef S_IFSOCK
type_cell = FTYPE_SOCK;
rate = 1.59e-5f;
@@ -2723,7 +2723,7 @@ insert_type (char **argv, int *arg_ptr,
pred_string, (*typeletter));
#endif
break;
- case 'D': /* Solaris door */
+ case 'D': /* Solaris door */
#ifdef S_IFDOOR
type_cell = FTYPE_DOOR;
/* There are no Solaris doors on the example system surveyed
@@ -2739,7 +2739,7 @@ insert_type (char **argv, int *arg_ptr,
pred_string, (*typeletter));
#endif
break;
- default: /* None of the above ... nuke 'em. */
+ default: /* None of the above ... nuke 'em. */
type_cell = 0;
error (EXIT_FAILURE, 0,
_("Unknown argument to %s: %c"), pred_string, (*typeletter));
diff --git a/find/print.c b/find/print.c
index 41c3e3c4..2377da28 100644
--- a/find/print.c
+++ b/find/print.c
@@ -103,82 +103,82 @@ _GL_ATTRIBUTE_FORMAT_PRINTF_STANDARD (2, 3);
assert (kind == KIND_FORMAT);
switch (format_char)
{
- case '%': /* literal % */
+ case '%': /* literal % */
*fmt++ = '%';
break;
- case 'l': /* object of symlink */
+ case 'l': /* object of symlink */
pred->need_stat = true;
mycost = NeedsLinkName;
*fmt++ = 's';
break;
- case 'y': /* file type */
+ case 'y': /* file type */
pred->need_type = true;
mycost = NeedsType;
*fmt++ = 's';
break;
- case 'i': /* inode number */
+ case 'i': /* inode number */
pred->need_inum = true;
mycost = NeedsInodeNumber;
*fmt++ = 's';
break;
- case 'a': /* atime in `ctime' format */
- case 'A': /* atime in user-specified strftime format */
- case 'B': /* birth time in user-specified strftime
format */
- case 'c': /* ctime in `ctime' format */
- case 'C': /* ctime in user-specified strftime format */
- case 'F': /* file system type */
- case 'g': /* group name */
- case 'M': /* mode in `ls -l' format (eg., "drwxr-xr-x")
*/
- case 's': /* size in bytes */
- case 't': /* mtime in `ctime' format */
- case 'T': /* mtime in user-specified strftime format */
- case 'u': /* user name */
+ case 'a': /* atime in `ctime' format */
+ case 'A': /* atime in user-specified strftime format */
+ case 'B': /* birth time in user-specified strftime format
*/
+ case 'c': /* ctime in `ctime' format */
+ case 'C': /* ctime in user-specified strftime format */
+ case 'F': /* file system type */
+ case 'g': /* group name */
+ case 'M': /* mode in `ls -l' format (eg., "drwxr-xr-x") */
+ case 's': /* size in bytes */
+ case 't': /* mtime in `ctime' format */
+ case 'T': /* mtime in user-specified strftime format */
+ case 'u': /* user name */
pred->need_stat = true;
mycost = NeedsStatInfo;
*fmt++ = 's';
break;
- case 'S': /* sparseness */
+ case 'S': /* sparseness */
pred->need_stat = true;
mycost = NeedsStatInfo;
*fmt++ = 'g';
break;
- case 'Y': /* symlink pointed file type */
+ case 'Y': /* symlink pointed file type */
pred->need_stat = true;
mycost = NeedsType; /* true for amortised effect */
*fmt++ = 's';
break;
- case 'f': /* basename of path */
- case 'h': /* leading directories part of path */
- case 'p': /* pathname */
- case 'P': /* pathname with ARGV element stripped */
+ case 'f': /* basename of path */
+ case 'h': /* leading directories part of path */
+ case 'p': /* pathname */
+ case 'P': /* pathname with ARGV element stripped */
*fmt++ = 's';
break;
- case 'Z': /* SELinux security context */
+ case 'Z': /* SELinux security context */
mycost = NeedsAccessInfo;
*fmt++ = 's';
break;
- case 'H': /* ARGV element file was found under */
+ case 'H': /* ARGV element file was found under */
*fmt++ = 's';
break;
/* Numeric items that one might expect to honour
* #, 0, + flags but which do not.
*/
- case 'G': /* GID number */
- case 'U': /* UID number */
- case 'b': /* size in 512-byte blocks (NOT birthtime in
ctime fmt) */
- case 'D': /* Filesystem device on which the file exits */
- case 'k': /* size in 1K blocks */
- case 'n': /* number of links */
+ case 'G': /* GID number */
+ case 'U': /* UID number */
+ case 'b': /* size in 512-byte blocks (NOT birthtime in
ctime fmt) */
+ case 'D': /* Filesystem device on which the file exits */
+ case 'k': /* size in 1K blocks */
+ case 'n': /* number of links */
pred->need_stat = true;
mycost = NeedsStatInfo;
*fmt++ = 's';
@@ -186,11 +186,11 @@ _GL_ATTRIBUTE_FORMAT_PRINTF_STANDARD (2, 3);
/* Numeric items that DO honour #, 0, + flags.
*/
- case 'd': /* depth in search tree (0 = ARGV element) */
+ case 'd': /* depth in search tree (0 = ARGV element) */
*fmt++ = 'd';
break;
- case 'm': /* mode as octal number (perms only) */
+ case 'm': /* mode as octal number (perms only) */
*fmt++ = 'o';
pred->need_stat = true;
mycost = NeedsStatInfo;
@@ -877,12 +877,12 @@ do_fprintf (struct format_val *dest,
switch (segment->segkind)
{
- case KIND_PLAIN: /* Plain text string (no % conversion). */
+ case KIND_PLAIN: /* Plain text string (no % conversion). */
/* trusted */
checked_fwrite (segment->text, 1, segment->text_len, dest);
break;
- case KIND_STOP: /* Terminate argument and flush output. */
+ case KIND_STOP: /* Terminate argument and flush output. */
/* trusted */
checked_fwrite (segment->text, 1, segment->text_len, dest);
checked_fflush (dest);
@@ -891,34 +891,34 @@ do_fprintf (struct format_val *dest,
case KIND_FORMAT:
switch (segment->format_char[0])
{
- case 'a': /* atime in `ctime' format. */
+ case 'a': /* atime in `ctime' format. */
/* UNTRUSTED, probably unexploitable */
checked_fprintf (dest, segment->text,
ctime_format (get_stat_atime (stat_buf)));
break;
- case 'b': /* size in 512-byte blocks */
+ case 'b': /* size in 512-byte blocks */
/* UNTRUSTED, probably unexploitable */
checked_fprintf (dest, segment->text,
human_readable ((uintmax_t) ST_NBLOCKS (*stat_buf),
hbuf, human_ceiling,
ST_NBLOCKSIZE, 512));
break;
- case 'c': /* ctime in `ctime' format */
+ case 'c': /* ctime in `ctime' format */
/* UNTRUSTED, probably unexploitable */
checked_fprintf (dest, segment->text,
ctime_format (get_stat_ctime (stat_buf)));
break;
- case 'd': /* depth in search tree */
+ case 'd': /* depth in search tree */
/* UNTRUSTED, probably unexploitable */
checked_fprintf (dest, segment->text, state.curdepth);
break;
- case 'D': /* Device on which file exists (stat.st_dev) */
+ case 'D': /* Device on which file exists (stat.st_dev) */
/* trusted */
checked_fprintf (dest, segment->text,
human_readable ((uintmax_t) stat_buf->st_dev, hbuf,
human_ceiling, 1, 1));
break;
- case 'f': /* base name of path */
+ case 'f': /* base name of path */
/* sanitised */
{
char *base = base_name (pathname);
@@ -926,12 +926,12 @@ do_fprintf (struct format_val *dest,
free (base);
}
break;
- case 'F': /* file system type */
+ case 'F': /* file system type */
/* trusted */
checked_print_quoted (dest, segment->text,
filesystem_type (stat_buf, pathname));
break;
- case 'g': /* group name */
+ case 'g': /* group name */
/* trusted */
/* (well, the actual group is selected by the user but
* its name was selected by the system administrator)
@@ -949,13 +949,13 @@ do_fprintf (struct format_val *dest,
}
FALLTHROUGH; /*...sometimes, so 'G' case. */
- case 'G': /* GID number */
+ case 'G': /* GID number */
/* UNTRUSTED, probably unexploitable */
checked_fprintf (dest, segment->text,
human_readable ((uintmax_t) stat_buf->st_gid, hbuf,
human_ceiling, 1, 1));
break;
- case 'h': /* leading directories part of path */
+ case 'h': /* leading directories part of path */
/* sanitised */
{
char *pname = xstrdup (pathname);
@@ -986,7 +986,7 @@ do_fprintf (struct format_val *dest,
}
break;
- case 'H': /* ARGV element file was found under */
+ case 'H': /* ARGV element file was found under */
/* trusted */
{
char *s = xmalloc (state.starting_path_length + 1);
@@ -997,7 +997,7 @@ do_fprintf (struct format_val *dest,
}
break;
- case 'i': /* inode number */
+ case 'i': /* inode number */
/* UNTRUSTED, but not exploitable I think */
/* POSIX does not guarantee that ino_t is unsigned or even
* integral (except as an XSI extension), but we'll work on
@@ -1008,14 +1008,14 @@ do_fprintf (struct format_val *dest,
human_readable ((uintmax_t) stat_buf->st_ino, hbuf,
human_ceiling, 1, 1));
break;
- case 'k': /* size in 1K blocks */
+ case 'k': /* size in 1K blocks */
/* UNTRUSTED, but not exploitable I think */
checked_fprintf (dest, segment->text,
human_readable ((uintmax_t) ST_NBLOCKS (*stat_buf),
hbuf, human_ceiling,
ST_NBLOCKSIZE, 1024));
break;
- case 'l': /* object of symlink */
+ case 'l': /* object of symlink */
/* sanitised */
#ifdef S_ISLNK
{
@@ -1046,7 +1046,7 @@ do_fprintf (struct format_val *dest,
#endif /* S_ISLNK */
break;
- case 'M': /* mode as 10 chars (eg., "-rwxr-x--x" */
+ case 'M': /* mode as 10 chars (eg., "-rwxr-x--x" */
/* UNTRUSTED, probably unexploitable */
{
char modestring[16];
@@ -1056,7 +1056,7 @@ do_fprintf (struct format_val *dest,
}
break;
- case 'm': /* mode as octal number (perms only) */
+ case 'm': /* mode as octal number (perms only) */
/* UNTRUSTED, probably unexploitable */
{
/* Output the mode portably using the traditional numbers,
@@ -1087,19 +1087,19 @@ do_fprintf (struct format_val *dest,
}
break;
- case 'n': /* number of links */
+ case 'n': /* number of links */
/* UNTRUSTED, probably unexploitable */
checked_fprintf (dest, segment->text,
human_readable ((uintmax_t) stat_buf->st_nlink,
hbuf, human_ceiling, 1, 1));
break;
- case 'p': /* pathname */
+ case 'p': /* pathname */
/* sanitised */
checked_print_quoted (dest, segment->text, pathname);
break;
- case 'P': /* pathname with ARGV element stripped */
+ case 'P': /* pathname with ARGV element stripped */
/* sanitised */
if (state.curdepth > 0)
{
@@ -1118,25 +1118,25 @@ do_fprintf (struct format_val *dest,
checked_print_quoted (dest, segment->text, cp);
break;
- case 's': /* size in bytes */
+ case 's': /* size in bytes */
/* UNTRUSTED, probably unexploitable */
checked_fprintf (dest, segment->text,
human_readable ((uintmax_t) stat_buf->st_size,
hbuf, human_ceiling, 1, 1));
break;
- case 'S': /* sparseness */
+ case 'S': /* sparseness */
/* UNTRUSTED, probably unexploitable */
checked_fprintf (dest, segment->text, file_sparseness (stat_buf));
break;
- case 't': /* mtime in `ctime' format */
+ case 't': /* mtime in `ctime' format */
/* UNTRUSTED, probably unexploitable */
checked_fprintf (dest, segment->text,
ctime_format (get_stat_mtime (stat_buf)));
break;
- case 'u': /* user name */
+ case 'u': /* user name */
/* trusted */
/* (well, the actual user is selected by the user on systems
* where chown is not restricted, but the user name was
@@ -1155,7 +1155,7 @@ do_fprintf (struct format_val *dest,
}
FALLTHROUGH; /* .. to case U */
- case 'U': /* UID number */
+ case 'U': /* UID number */
/* UNTRUSTED, probably unexploitable */
checked_fprintf (dest, segment->text,
human_readable ((uintmax_t) stat_buf->st_uid, hbuf,
@@ -1165,7 +1165,7 @@ do_fprintf (struct format_val *dest,
/* %Y: type of file system entry like `ls -l`:
* (d,-,l,s,p,b,c,n) n=nonexistent (symlink)
*/
- case 'Y': /* in case of symlink */
+ case 'Y': /* in case of symlink */
/* trusted */
{
#ifdef S_ISLNK
@@ -1221,7 +1221,7 @@ do_fprintf (struct format_val *dest,
}
break;
- case 'Z': /* SELinux security context */
+ case 'Z': /* SELinux security context */
{
char *scontext;
int rv =
diff --git a/find/util.c b/find/util.c
index 9939760b..8127c39e 100644
--- a/find/util.c
+++ b/find/util.c
@@ -600,7 +600,7 @@ fallback_stat (const char *name, struct stat *p, int
prev_rv)
case ELOOP:
case ENAMETOOLONG:
#ifdef EOVERFLOW
- case EOVERFLOW: /* EOVERFLOW is not #defined on UNICOS. */
+ case EOVERFLOW: /* EOVERFLOW is not #defined on UNICOS. */
#endif
default:
return prev_rv;
diff --git a/gnulib-local/lib/gcc-function-attributes.h
b/gnulib-local/lib/gcc-function-attributes.h
index 79f3ebfd..4ed8280b 100644
--- a/gnulib-local/lib/gcc-function-attributes.h
+++ b/gnulib-local/lib/gcc-function-attributes.h
@@ -103,7 +103,7 @@ visibility "default"
# define _GL_ATTRIBUTE_ALLOC_SIZE(args) __attribute__ ((__alloc_size__ args))
# else
# define _GL_ATTRIBUTE_ALLOC_SIZE(args)
- /* unsupported */
+ /* unsupported */
# endif
# endif
@@ -111,7 +111,7 @@ visibility "default"
# if __GNUC_PREREQ(3,1)
# define _GL_ATTRIBUTE_DEPRECATED __attribute__ ((__deprecated__))
# else
-# define _GL_ATTRIBUTE_DEPRECATED /* empty */
+# define _GL_ATTRIBUTE_DEPRECATED /* empty */
# endif
# endif
@@ -119,7 +119,7 @@ visibility "default"
# if __GNUC_PREREQ(2,7)
# define _GL_ATTRIBUTE_FORMAT(spec) __attribute__ ((__format__ spec))
# else
-# define _GL_ATTRIBUTE_FORMAT(spec) /* unsupported */
+# define _GL_ATTRIBUTE_FORMAT(spec) /* unsupported */
# endif
# endif
@@ -128,7 +128,7 @@ visibility "default"
# define _GL_ATTRIBUTE_FORMAT_PRINTF_SYSTEM(formatstring_parameter,
first_argument) \
_GL_ATTRIBUTE_FORMAT ((__printf__, formatstring_parameter, first_argument))
# else
-# define _GL_ATTRIBUTE_FORMAT_PRINTF_SYSTEM(spec) /* unsupported */
+# define _GL_ATTRIBUTE_FORMAT_PRINTF_SYSTEM(spec) /* unsupported */
# endif
# endif
@@ -142,7 +142,7 @@ visibility "default"
_GL_ATTRIBUTE_FORMAT ((__printf__, formatstring_parameter,
first_argument))
# endif
# else
-# define _GL_ATTRIBUTE_FORMAT_PRINTF_STANDARD(spec) /* unsupported */
+# define _GL_ATTRIBUTE_FORMAT_PRINTF_STANDARD(spec) /* unsupported */
# endif
# endif
@@ -152,7 +152,7 @@ visibility "default"
_GL_ATTRIBUTE_FORMAT ((__scanf__, formatstring_parameter, first_argument))
# else
# define _GL_ATTRIBUTE_FORMAT_SCANF_SYSTEM(spec)
- /* unsupported */
+ /* unsupported */
# endif
# endif
@@ -166,7 +166,7 @@ visibility "default"
_GL_ATTRIBUTE_FORMAT ((__scanf__, formatstring_parameter, first_argument))
# endif
# else
-# define _GL_ATTRIBUTE_FORMAT_SCANF(spec) /* unsupported */
+# define _GL_ATTRIBUTE_FORMAT_SCANF(spec) /* unsupported */
# endif
# endif
@@ -174,7 +174,7 @@ visibility "default"
# if __GNUC_PREREQ(3,0)
# define _GL_ATTRIBUTE_MALLOC __attribute__ ((__malloc__))
# else
-# define _GL_ATTRIBUTE_MALLOC /* unsupported */
+# define _GL_ATTRIBUTE_MALLOC /* unsupported */
# endif
# endif
@@ -183,7 +183,7 @@ visibility "default"
# if __GNUC_PREREQ(3,3)
# define _GL_ATTRIBUTE_NONNULL(m) __attribute__ ((__nonnull__ (m)))
# else
-# define _GL_ATTRIBUTE_NONNULL(m) /* unsupported */
+# define _GL_ATTRIBUTE_NONNULL(m) /* unsupported */
# endif
# endif
# ifndef _GL_ARG_NONNULL
@@ -197,7 +197,7 @@ visibility "default"
# define _GL_ATTRIBUTE_NORETURN __attribute__ ((__noreturn__))
# else
# define _GL_ATTRIBUTE_NORETURN
- /* unsupported */
+ /* unsupported */
# endif
# endif
@@ -205,7 +205,7 @@ visibility "default"
# if __GNUC_PREREQ(2,96)
# define _GL_ATTRIBUTE_PURE __attribute__ ((__pure__))
# else
-# define _GL_ATTRIBUTE_PURE /* unsupported */
+# define _GL_ATTRIBUTE_PURE /* unsupported */
# endif
# endif
@@ -217,7 +217,7 @@ visibility "default"
*/
# define _GL_ATTRIBUTE_SENTINEL(backward_arg_num) __attribute__
((__sentinel__(backward_arg_num)))
# else
-# define _GL_ATTRIBUTE_SENTINEL(backward_arg_num) /* unsupported */
+# define _GL_ATTRIBUTE_SENTINEL(backward_arg_num) /* unsupported */
# endif
# endif
@@ -225,7 +225,7 @@ visibility "default"
# if __GNUC_PREREQ(3,4)
# define _GL_ATTRIBUTE_WUR __attribute__ ((__warn__unused_result__))
# else
-# define _GL_ATTRIBUTE_WUR /* unsupported */
+# define _GL_ATTRIBUTE_WUR /* unsupported */
# endif
# endif
# ifndef _GL_ATTRIBUTE_RETURN_CHECK
diff --git a/locate/locate.c b/locate/locate.c
index 607899a4..98376b8f 100644
--- a/locate/locate.c
+++ b/locate/locate.c
@@ -1261,7 +1261,7 @@ search_one_database (int argc,
add_visitor (visit_non_existing_nofollow, NULL);
break;
- case ACCEPT_EITHER: /* Default, neither -E nor -e */
+ case ACCEPT_EITHER: /* Default, neither -E nor -e */
/* do nothing; no extra processing. */
break;
}
@@ -1683,8 +1683,8 @@ dolocate (int argc, char **argv, int secure_db_fd)
}
break;
- case 's': /* use stdio */
- case 'm': /* use mmap */
+ case 's': /* use stdio */
+ case 'm': /* use mmap */
/* These options are implemented simply for
* compatibility with FreeBSD
*/
diff --git a/tests/xargs/test-sigusr.c b/tests/xargs/test-sigusr.c
index 7375e278..fb3fa7b5 100644
--- a/tests/xargs/test-sigusr.c
+++ b/tests/xargs/test-sigusr.c
@@ -207,13 +207,13 @@ run_xargs (const char *option, const char *opt_arg, int
send_signal)
case -1:
error (EXIT_FAILURE, errno, "cannot fork");
break;
- case 0: /* child */
+ case 0: /* child */
close (pipefd[0]); /* close read end */
/* The child will close the write end of the pipe on successful exec. */
run_child (argv, pipefd[1]);
abort ();
break;
- default: /* parent */
+ default: /* parent */
close (pipefd[1]); /* close write end */
if (read (pipefd[0], &child_errno, sizeof child_errno) <
sizeof child_errno)
diff --git a/xargs/xargs.c b/xargs/xargs.c
index 12fd7ff3..b30f9f9f 100644
--- a/xargs/xargs.c
+++ b/xargs/xargs.c
@@ -538,8 +538,8 @@ main (int argc, char **argv)
input_delimiter = get_input_delimiter (optarg);
break;
- case 'E': /* POSIX */
- case 'e': /* deprecated */
+ case 'E': /* POSIX */
+ case 'e': /* deprecated */
if (optarg && (strlen (optarg) > 0))
eof_str = optarg;
else
@@ -549,8 +549,8 @@ main (int argc, char **argv)
case 'h':
usage (EXIT_SUCCESS);
- case 'I': /* POSIX */
- case 'i': /* deprecated */
+ case 'I': /* POSIX */
+ case 'i': /* deprecated */
if (optarg)
bc_ctl.replace_pat = optarg;
else
@@ -568,7 +568,7 @@ main (int argc, char **argv)
}
break;
- case 'L': /* POSIX */
+ case 'L': /* POSIX */
bc_ctl.lines_per_exec = parse_num (optarg, 'L', 1L, -1L, 1);
/* -L excludes -i -n. */
if (bc_ctl.args_per_exec != 0)
@@ -583,7 +583,7 @@ main (int argc, char **argv)
}
break;
- case 'l': /* deprecated */
+ case 'l': /* deprecated */
if (optarg)
bc_ctl.lines_per_exec = parse_num (optarg, 'l', 1L, -1L, 1);
else
@@ -1371,7 +1371,7 @@ xargs_do_exec (struct buildcmd_control *ctl, void
*usercontext, int argc,
error (EXIT_FAILURE, errno, _("cannot fork"));
}
- case 0: /* Child. */
+ case 0: /* Child. */
{
close (fd[0]);
child_error = EXIT_SUCCESS;
--
2.47.3
