summaryrefslogtreecommitdiff
path: root/util-linux
diff options
context:
space:
mode:
authorDenys Vlasenko2010-10-28 18:57:19 +0200
committerDenys Vlasenko2010-10-28 18:57:19 +0200
commite4dcba1c103dc28e927e004791e331aaf604383d (patch)
treea18094ecc54fcea2cb523a802e0c414c3e6f85bf /util-linux
parent776509544123c68bbc128c0fdb2f699062d294cf (diff)
downloadbusybox-e4dcba1c103dc28e927e004791e331aaf604383d.zip
busybox-e4dcba1c103dc28e927e004791e331aaf604383d.tar.gz
*: whitespace fixes
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'util-linux')
-rw-r--r--util-linux/acpid.c2
-rw-r--r--util-linux/fdformat.c2
-rw-r--r--util-linux/fdisk_gpt.c2
-rw-r--r--util-linux/fdisk_sun.c2
-rw-r--r--util-linux/ipcrm.c7
-rw-r--r--util-linux/mkfs_ext2.c4
-rw-r--r--util-linux/mkfs_vfat.c2
-rw-r--r--util-linux/readprofile.c4
-rw-r--r--util-linux/rtcwake.c2
-rw-r--r--util-linux/script.c2
10 files changed, 14 insertions, 15 deletions
diff --git a/util-linux/acpid.c b/util-linux/acpid.c
index 5a3bd5a..0b227a8 100644
--- a/util-linux/acpid.c
+++ b/util-linux/acpid.c
@@ -52,7 +52,7 @@ struct globals {
int n_evt;
} FIX_ALIASING;
#define G (*ptr_to_globals)
-#define act_tab (G.act_tab)
+#define act_tab (G.act_tab)
#define n_act (G.n_act )
#define evt_tab (G.evt_tab)
#define n_evt (G.n_evt )
diff --git a/util-linux/fdformat.c b/util-linux/fdformat.c
index f5c386c..57e9c26 100644
--- a/util-linux/fdformat.c
+++ b/util-linux/fdformat.c
@@ -36,7 +36,7 @@ struct format_descr {
unsigned int device,head,track;
};
#define FDFMTBEG _IO(2,0x47)
-#define FDFMTTRK _IOW(2,0x48, struct format_descr)
+#define FDFMTTRK _IOW(2,0x48, struct format_descr)
#define FDFMTEND _IO(2,0x49)
#define FDGETPRM _IOR(2, 0x04, struct floppy_struct)
#define FD_FILL_BYTE 0xF6 /* format fill byte. */
diff --git a/util-linux/fdisk_gpt.c b/util-linux/fdisk_gpt.c
index 1ab1293..d43d9c7 100644
--- a/util-linux/fdisk_gpt.c
+++ b/util-linux/fdisk_gpt.c
@@ -7,7 +7,7 @@
#define GPT_MAGIC 0x5452415020494645ULL
enum {
- LEGACY_GPT_TYPE = 0xee,
+ LEGACY_GPT_TYPE = 0xee,
GPT_MAX_PARTS = 256,
GPT_MAX_PART_ENTRY_LEN = 4096,
GUID_LEN = 16,
diff --git a/util-linux/fdisk_sun.c b/util-linux/fdisk_sun.c
index 6b7940c..e7fcc06 100644
--- a/util-linux/fdisk_sun.c
+++ b/util-linux/fdisk_sun.c
@@ -654,7 +654,7 @@ sun_list_table(int xtra)
uint32_t start = SUN_SSWAP32(sunlabel->partitions[i].start_cylinder) * g_heads * g_sectors;
uint32_t len = SUN_SSWAP32(sunlabel->partitions[i].num_sectors);
printf("%s %c%c %9lu %9lu %9lu%c %2x %s\n",
- partname(disk_device, i+1, w), /* device */
+ partname(disk_device, i+1, w), /* device */
(sunlabel->infos[i].flags & 0x01) ? 'u' : ' ', /* flags */
(sunlabel->infos[i].flags & 0x10) ? 'r' : ' ',
(long) scround(start), /* start */
diff --git a/util-linux/ipcrm.c b/util-linux/ipcrm.c
index 6360c70..731216c 100644
--- a/util-linux/ipcrm.c
+++ b/util-linux/ipcrm.c
@@ -43,7 +43,6 @@ typedef enum type_id {
static int remove_ids(type_id type, int argc, char **argv)
{
unsigned long id;
- int ret = 0; /* silence gcc */
int nb_errors = 0;
union semun arg;
@@ -55,6 +54,7 @@ static int remove_ids(type_id type, int argc, char **argv)
bb_error_msg("invalid id: %s", argv[0]);
nb_errors++;
} else {
+ int ret = 0;
if (type == SEM)
ret = semctl(id, 0, IPC_RMID, arg);
else if (type == MSG)
@@ -92,14 +92,13 @@ int ipcrm_main(int argc, char **argv)
type_id what = 0; /* silence gcc */
char w;
- w=argv[1][0];
+ w = argv[1][0];
if ( ((w == 'm' && argv[1][1] == 's' && argv[1][2] == 'g')
|| (argv[1][0] == 's'
- && ((w=argv[1][1]) == 'h' || w == 'e')
+ && ((w = argv[1][1]) == 'h' || w == 'e')
&& argv[1][2] == 'm')
) && argv[1][3] == '\0'
) {
-
if (argc < 3)
bb_show_usage();
diff --git a/util-linux/mkfs_ext2.c b/util-linux/mkfs_ext2.c
index 6dccd3a..871ec83 100644
--- a/util-linux/mkfs_ext2.c
+++ b/util-linux/mkfs_ext2.c
@@ -11,8 +11,8 @@
#include <linux/fs.h>
#include <linux/ext2_fs.h>
-#define ENABLE_FEATURE_MKFS_EXT2_RESERVED_GDT 0
-#define ENABLE_FEATURE_MKFS_EXT2_DIR_INDEX 1
+#define ENABLE_FEATURE_MKFS_EXT2_RESERVED_GDT 0
+#define ENABLE_FEATURE_MKFS_EXT2_DIR_INDEX 1
// from e2fsprogs
#define s_reserved_gdt_blocks s_padding1
diff --git a/util-linux/mkfs_vfat.c b/util-linux/mkfs_vfat.c
index 45760f7..bb5b59c 100644
--- a/util-linux/mkfs_vfat.c
+++ b/util-linux/mkfs_vfat.c
@@ -28,7 +28,7 @@
#define ATTR_VOLUME 8
-#define NUM_FATS 2
+#define NUM_FATS 2
/* FAT32 filesystem looks like this:
* sector -nn...-1: "hidden" sectors, all sectors before this partition
diff --git a/util-linux/readprofile.c b/util-linux/readprofile.c
index 00b3382..f8a6e0c 100644
--- a/util-linux/readprofile.c
+++ b/util-linux/readprofile.c
@@ -97,7 +97,7 @@ int readprofile_main(int argc UNUSED_PARAM, char **argv)
*/
to_write = sizeof(int);
if (!optMult)
- to_write = 1; /* sth different from sizeof(int) */
+ to_write = 1; /* sth different from sizeof(int) */
fd = xopen(defaultpro, O_WRONLY);
xwrite(fd, &multiplier, to_write);
@@ -179,7 +179,7 @@ int readprofile_main(int argc UNUSED_PARAM, char **argv)
if (*mode != 'T' && *mode != 't'
&& *mode != 'W' && *mode != 'w'
) {
- break; /* only text is profiled */
+ break; /* only text is profiled */
}
if (indx >= len / sizeof(*buf))
diff --git a/util-linux/rtcwake.c b/util-linux/rtcwake.c
index 26e5b47..06ed7ea 100644
--- a/util-linux/rtcwake.c
+++ b/util-linux/rtcwake.c
@@ -50,7 +50,7 @@ static NOINLINE bool may_wakeup(const char *rtcname)
static NOINLINE void setup_alarm(int fd, time_t *wakeup, time_t rtc_time)
{
struct tm *ptm;
- struct linux_rtc_wkalrm wake;
+ struct linux_rtc_wkalrm wake;
/* The wakeup time is in POSIX time (more or less UTC).
* Ideally RTCs use that same time; but PCs can't do that
diff --git a/util-linux/script.c b/util-linux/script.c
index 0860bb0..b9317fc 100644
--- a/util-linux/script.c
+++ b/util-linux/script.c
@@ -6,7 +6,7 @@
*
* Based on code from util-linux v 2.12r
* Copyright (c) 1980
- * The Regents of the University of California. All rights reserved.
+ * The Regents of the University of California. All rights reserved.
*
* Licensed under GPLv2 or later, see file LICENSE in this source tree.
*/