← Commit list

6830ade6a

Denys Vlasenko

2013-01-15

SUCCESS Duration: 189s

Subject

whitespace fixes. no code changes

Binary

No binary (build failed)

Architecture & Compiler Flags

Architecture: x86_64-linux-gnu Compiler: gcc (Ubuntu 11.4.0-1ubuntu1~22.04.3) 11.4.0

—

Build Log

(log yok)

Commit Diff GitHub →

console-tools/loadfont.c+1 -1

@@ -229,7 +229,7 @@ static void do_loadtable(int fd, unsigned char *inbuf, int tailsz, int fontsize,
	}

	/* Note: after PIO_UNIMAPCLR and before PIO_UNIMAP
-	this printf did not work on many kernels */
+	* this printf did not work on many kernels */

	advice.advised_hashsize = 0;
	advice.advised_hashstep = 0;

coreutils/cal.c+2 -2

@@ -43,7 +43,7 @@ static const unsigned char days_in_month[] ALIGN1 = {
	};

	static const unsigned char sep1752[] ALIGN1 = {
-	1, 2, 14, 15, 16,
+	1, 2, 14, 15, 16,
	17, 18, 19, 20, 21, 22, 23,
	24, 25, 26, 27, 28, 29, 30
	};
@@ -183,7 +183,7 @@ int cal_main(int argc UNUSED_PARAM, char **argv)
	center(lineout,
	(WEEK_LEN * 3 + HEAD_SEP * 2)
	+ julian * (J_WEEK_LEN * 2 + HEAD_SEP
-	- (WEEK_LEN * 3 + HEAD_SEP * 2)),
+	- (WEEK_LEN * 3 + HEAD_SEP * 2)),
	0
	);
	puts("\n"); /* two \n's */

coreutils/chown.c+2 -2

@@ -126,8 +126,8 @@ int chown_main(int argc UNUSED_PARAM, char **argv)
	/* This matches coreutils behavior (almost - see below) */
	param.chown_func = chown;
	if (OPT_NODEREF
-	/* \|\| (OPT_RECURSE && !OPT_TRAVERSE_TOP): */
-	IF_DESKTOP( \|\| (opt & (BIT_RECURSE\|BIT_TRAVERSE_TOP)) == BIT_RECURSE)
+	/* \|\| (OPT_RECURSE && !OPT_TRAVERSE_TOP): */
+	IF_DESKTOP( \|\| (opt & (BIT_RECURSE\|BIT_TRAVERSE_TOP)) == BIT_RECURSE)
	) {
	param.chown_func = lchown;
	}

coreutils/df.c+2 -2

@@ -110,8 +110,8 @@ int df_main(int argc UNUSED_PARAM, char **argv)
	df_disp_hr = xatoul_range(chp, 1, ULONG_MAX); /* disallow 0 */

	/* From the manpage of df from coreutils-6.10:
-	Disk space is shown in 1K blocks by default, unless the environment
-	variable POSIXLY_CORRECT is set, in which case 512-byte blocks are used.
+	* Disk space is shown in 1K blocks by default, unless the environment
+	* variable POSIXLY_CORRECT is set, in which case 512-byte blocks are used.
	*/
	if (getenv("POSIXLY_CORRECT")) /* TODO - a new libbb function? */
	df_disp_hr = 512;

coreutils/sort.c+1 -1

@@ -219,7 +219,7 @@ static int compare_keys(const void xarg, const void yarg)
	y = get_key((char *)yarg, key, flags);
	#else
	/* This curly bracket serves no purpose but to match the nesting
-	level of the for () loop we're not using */
+	* level of the for () loop we're not using */
	{
	x = (char *)xarg;
	y = (char *)yarg;

coreutils/sum.c+2 -2

@@ -94,8 +94,8 @@ int sum_main(int argc UNUSED_PARAM, char **argv)
	n = sum_file("-", type);
	} else {
	/* Need to print the name if either
-	- more than one file given
-	- doing sysv */
+	* - more than one file given
+	* - doing sysv */
	type += (argv[1] \|\| type == SUM_SYSV);
	n = 1;
	do {

editors/sed.c+1 -1

@@ -1077,7 +1077,7 @@ static void process_files(void)
	/* or does this line matches our last address regex */
	\|\| (sed_cmd->end_match && old_matched
	&& (regexec(sed_cmd->end_match,
-	pattern_space, 0, NULL, 0) == 0)
+	pattern_space, 0, NULL, 0) == 0)
	)
	);
	}

editors/vi.c+5 -5

@@ -1929,11 +1929,11 @@ static int find_range(char start, char stop, char c)
	dot_end(); // find NL
	q = dot;
	} else {
-	// nothing -- this causes any other values of c to
-	// represent the one-character range under the
-	// cursor. this is correct for ' ' and 'l', but
-	// perhaps no others.
-	//
+	// nothing -- this causes any other values of c to
+	// represent the one-character range under the
+	// cursor. this is correct for ' ' and 'l', but
+	// perhaps no others.
+	//
	}
	if (q < p) {
	t = q;

include/bb_archive.h+3 -3

@@ -220,9 +220,9 @@ IF_DESKTOP(long long) int unpack_xz_stream(transformer_aux_data_t *aux, int src_

	char* append_ext(char filename, const char expected_ext) FAST_FUNC;
	int bbunpack(char **argv,
-	IF_DESKTOP(long long) int FAST_FUNC (unpacker)(transformer_aux_data_t aux),
-	char* FAST_FUNC (make_new_name)(char filename, const char *expected_ext),
-	const char *expected_ext
+	IF_DESKTOP(long long) int FAST_FUNC (unpacker)(transformer_aux_data_t aux),
+	char* FAST_FUNC (make_new_name)(char filename, const char *expected_ext),
+	const char *expected_ext
	) FAST_FUNC;

	void check_errors_in_children(int signo);

include/grp_.h+12 -12

@@ -64,7 +64,7 @@ extern struct group fgetgrent(FILE __stream);

	/* Write the given entry onto the given stream. */
	extern int putgrent(const struct group *__restrict __p,
-	FILE *__restrict __f);
+	FILE *__restrict __f);
	#endif

	/* Search for an entry with a matching group ID. */
@@ -82,32 +82,32 @@ extern struct group getgrnam(const char __name);
	POSIX people would choose. */

	extern int getgrent_r(struct group *__restrict __resultbuf,
-	char *__restrict __buffer, size_t __buflen,
-	struct group **__restrict __result);
+	char *__restrict __buffer, size_t __buflen,
+	struct group **__restrict __result);

	/* Search for an entry with a matching group ID. */
	extern int getgrgid_r(gid_t __gid, struct group *__restrict __resultbuf,
-	char *__restrict __buffer, size_t __buflen,
-	struct group **__restrict __result);
+	char *__restrict __buffer, size_t __buflen,
+	struct group **__restrict __result);

	/* Search for an entry with a matching group name. */
	extern int getgrnam_r(const char *__restrict __name,
-	struct group *__restrict __resultbuf,
-	char *__restrict __buffer, size_t __buflen,
-	struct group **__restrict __result);
+	struct group *__restrict __resultbuf,
+	char *__restrict __buffer, size_t __buflen,
+	struct group **__restrict __result);

	/* Read a group entry from STREAM. This function is not standardized
	an probably never will. */
	extern int fgetgrent_r(FILE *__restrict __stream,
-	struct group *__restrict __resultbuf,
-	char *__restrict __buffer, size_t __buflen,
-	struct group **__restrict __result);
+	struct group *__restrict __resultbuf,
+	char *__restrict __buffer, size_t __buflen,
+	struct group **__restrict __result);

	/* Store at most *NGROUPS members of the group set for USER into
	*GROUPS. Also include GROUP. The actual number of groups found is
	returned in NGROUPS. Return -1 if the if NGROUPS is too small. */
	extern int getgrouplist(const char *__user, gid_t __group,
-	gid_t __groups, int __ngroups);
+	gid_t __groups, int __ngroups);

	/* Initialize the group set for the current user
	by reading the group database and using all groups

include/libbb.h+1 -1

@@ -1516,7 +1516,7 @@ struct smaprec {
	procps_read_smaps(pid, total)
	#endif
	int FAST_FUNC procps_read_smaps(pid_t pid, struct smaprec *total,
-	void (cb)(struct smaprec , void ), void data);
+	void (cb)(struct smaprec , void ), void data);

	typedef struct procps_status_t {
	DIR *dir;

include/pwd_.h+12 -12

@@ -63,7 +63,7 @@ extern struct passwd fgetpwent(FILE __stream);

	/* Write the given entry onto the given stream. */
	extern int putpwent(const struct passwd *__restrict __p,
-	FILE *__restrict __f);
+	FILE *__restrict __f);
	#endif

	/* Search for an entry with a matching user ID. */
@@ -81,25 +81,25 @@ extern struct passwd getpwnam(const char __name);
	POSIX people would choose. */

	extern int getpwent_r(struct passwd *__restrict __resultbuf,
-	char *__restrict __buffer, size_t __buflen,
-	struct passwd **__restrict __result);
+	char *__restrict __buffer, size_t __buflen,
+	struct passwd **__restrict __result);

	extern int getpwuid_r(uid_t __uid,
-	struct passwd *__restrict __resultbuf,
-	char *__restrict __buffer, size_t __buflen,
-	struct passwd **__restrict __result);
+	struct passwd *__restrict __resultbuf,
+	char *__restrict __buffer, size_t __buflen,
+	struct passwd **__restrict __result);

	extern int getpwnam_r(const char *__restrict __name,
-	struct passwd *__restrict __resultbuf,
-	char *__restrict __buffer, size_t __buflen,
-	struct passwd **__restrict __result);
+	struct passwd *__restrict __resultbuf,
+	char *__restrict __buffer, size_t __buflen,
+	struct passwd **__restrict __result);

	/* Read an entry from STREAM. This function is not standardized and
	probably never will. */
	extern int fgetpwent_r(FILE *__restrict __stream,
-	struct passwd *__restrict __resultbuf,
-	char *__restrict __buffer, size_t __buflen,
-	struct passwd **__restrict __result);
+	struct passwd *__restrict __resultbuf,
+	char *__restrict __buffer, size_t __buflen,
+	struct passwd **__restrict __result);

	POP_SAVED_FUNCTION_VISIBILITY

include/shadow_.h+7 -7

@@ -79,21 +79,21 @@ extern int putspent(const struct spwd __p, FILE __stream);

	/* Reentrant versions of some of the functions above */
	extern int getspent_r(struct spwd __result_buf, char __buffer,
-	size_t __buflen, struct spwd **__result);
+	size_t __buflen, struct spwd **__result);
	#endif

	extern int getspnam_r(const char __name, struct spwd __result_buf,
-	char *__buffer, size_t __buflen,
-	struct spwd **__result);
+	char *__buffer, size_t __buflen,
+	struct spwd **__result);

	#ifdef UNUSED_FOR_NOW
	extern int sgetspent_r(const char __string, struct spwd __result_buf,
-	char *__buffer, size_t __buflen,
-	struct spwd **__result);
+	char *__buffer, size_t __buflen,
+	struct spwd **__result);

	extern int fgetspent_r(FILE __stream, struct spwd __result_buf,
-	char *__buffer, size_t __buflen,
-	struct spwd **__result);
+	char *__buffer, size_t __buflen,
+	struct spwd **__result);
	/* Protect password file against multi writers */
	extern int lckpwdf(void);

libbb/xatonum_template.c+1 -1

@@ -59,7 +59,7 @@ unsigned type FAST_FUNC xstrtou(_range_sfx)(const char *numstr, int base,
	}

	/* Note: trailing space is an error.
-	It would be easy enough to allow though if desired. */
+	* It would be easy enough to allow though if desired. */
	if (*e)
	goto inval;
	chk_range:

miscutils/devfsd.c+15 -15

@@ -803,8 +803,8 @@ static void action_execute(const struct devfsd_notify_struct *info,


	static void action_copy(const struct devfsd_notify_struct *info,
-	const struct config_entry_struct *entry,
-	const regmatch_t *regexpr, unsigned int numexpr)
+	const struct config_entry_struct *entry,
+	const regmatch_t *regexpr, unsigned int numexpr)
	/* [SUMMARY] Copy permissions.
	<info> The devfs change.
	<entry> The config file entry.
@@ -1259,11 +1259,11 @@ static int make_dir_tree(const char *path)
	} /* End Function make_dir_tree */

	static int expand_expression(char *output, unsigned int outsize,
-	const char *input,
-	const char (get_variable_func)(const char variable, void info),
-	void *info,
-	const char *devname,
-	const regmatch_t *ex, unsigned int numexp)
+	const char *input,
+	const char (get_variable_func)(const char variable, void info),
+	void *info,
+	const char *devname,
+	const regmatch_t *ex, unsigned int numexp)
	/* [SUMMARY] Expand environment variables and regular subexpressions in string.
	<output> The output expanded expression is written here.
	<length> The size of the output buffer.
@@ -1288,8 +1288,8 @@ static int expand_expression(char *output, unsigned int outsize,
	} /* End Function expand_expression */

	static void expand_regexp(char output, size_t outsize, const char input,
-	const char *devname,
-	const regmatch_t *ex, unsigned int numex)
+	const char *devname,
+	const regmatch_t *ex, unsigned int numex)
	/* [SUMMARY] Expand all occurrences of the regular subexpressions \0 to \9.
	<output> The output expanded expression is written here.
	<outsize> The size of the output buffer.
@@ -1385,7 +1385,7 @@ static struct translate_struct translate_table[] =
	};

	const char get_old_name(const char devname, unsigned int namelen,
-	char *buffer, unsigned int major, unsigned int minor)
+	char *buffer, unsigned int major, unsigned int minor)
	/* [SUMMARY] Translate a kernel-supplied name into an old name.
	<devname> The device name provided by the kernel.
	<namelen> The length of the name.
@@ -1423,7 +1423,7 @@ const char get_old_name(const char devname, unsigned int namelen,
	};

	for (trans = translate_table; trans->match != NULL; ++trans) {
-	len = strlen(trans->match);
+	len = strlen(trans->match);

	if (strncmp(devname, trans->match, len) == 0) {
	if (trans->format == NULL)
@@ -1549,9 +1549,9 @@ static char write_old_sd_name(char buffer,
	/EXPERIMENTAL_FUNCTION/

	int st_expr_expand(char output, unsigned int length, const char input,
-	const char (get_variable_func)(const char *variable,
-	void *info),
-	void *info)
+	const char (get_variable_func)(const char *variable,
+	void *info),
+	void *info)
	/* [SUMMARY] Expand an expression using Borne Shell-like unquoted rules.
	<output> The output expanded expression is written here.
	<length> The size of the output buffer.
@@ -1643,7 +1643,7 @@ st_expr_expand_out:
	static const char expand_variable(char buffer, unsigned int length,
	unsigned int out_pos, const char input,
	const char (func)(const char *variable,
-	void *info),
+	void *info),
	void *info)
	/* [SUMMARY] Expand a variable.
	<buffer> The buffer to write to.

miscutils/hdparm.c+1 -1

@@ -1038,7 +1038,7 @@ static void identify(uint16_t *val)
	val[ACOUSTIC] & 0x00ff);
	}
	} else {
-	/* ATAPI */
+	/* ATAPI */
	if (eqpt != CDROM && (val[CAPAB_0] & SWRST_REQ))
	printf("\tATA sw reset required\n");

miscutils/less.c+3 -3

@@ -709,9 +709,9 @@ static void print_found(const char *line)
	/* buf[] holds quarantined version of str */

	/* Each part of the line that matches has the HIGHLIGHT
-	and NORMAL escape sequences placed around it.
-	NB: we regex against line, but insert text
-	from quarantined copy (buf[]) */
+	* and NORMAL escape sequences placed around it.
+	* NB: we regex against line, but insert text
+	* from quarantined copy (buf[]) */
	str = buf;
	growline = NULL;
	eflags = 0;

miscutils/rx.c+2 -2

@@ -193,8 +193,8 @@ static int receive(/int read_fd, /int file_fd)
	}
	if (cksum_or_crc != expected) {
	bb_error_msg(do_crc ? "crc error, expected 0x%04x, got 0x%04x"
-	: "checksum error, expected 0x%02x, got 0x%02x",
-	expected, cksum_or_crc);
+	: "checksum error, expected 0x%02x, got 0x%02x",
+	expected, cksum_or_crc);
	goto error;
	}

miscutils/time.c+1 -1

@@ -70,7 +70,7 @@ static void resuse_end(pid_t pid, resource_t *resp)
	pid_t caught;

	/* Ignore signals, but don't ignore the children. When wait3
-	returns the child process, set the time the command finished. */
+	* returns the child process, set the time the command finished. */
	while ((caught = wait3(&resp->waitstatus, 0, &resp->ru)) != pid) {
	if (caught == -1 && errno != EINTR) {
	bb_perror_msg("wait");

shell/hush.c+1 -1

@@ -8281,7 +8281,7 @@ static int FAST_FUNC builtin_exit(char **argv)
	* (if there are _stopped_ jobs, running ones don't count)
	* # exit
	* exit
-	# EEE (then bash exits)
+	* EEE (then bash exits)
	*
	* TODO: we can use G.exiting = -1 as indicator "last cmd was exit"
	*/