emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

whitespace cleanup. no code changes

Browse Source 
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko
2013-01-14 15:57:44 +01:00
parent b8173b603f
commit 60cb48ca50
59 changed files with 233 additions and 219 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
util-linux/fdisk_osf.c
View File

@ -898,8 +898,7 @@ xbsd_initlabel(struct partition *p)
pp->p_fstype = BSD_FS_UNUSED;
#else
d->d_npartitions = 3;
pp = &d->d_partitions[2]; /* Partition C should be
the whole disk */
pp = &d->d_partitions[2]; /* Partition C should be the whole disk */
pp->p_offset = 0;
pp->p_size = d->d_secperunit;
pp->p_fstype = BSD_FS_UNUSED;
@ -935,7 +934,7 @@ xbsd_readlabel(struct partition *p)
fdisk_fatal(unable_to_read);
memmove(d, &disklabelbuffer[BSD_LABELSECTOR * SECTOR_SIZE + BSD_LABELOFFSET],
sizeof(struct xbsd_disklabel));
sizeof(struct xbsd_disklabel));
if (d->d_magic != BSD_DISKMAGIC || d->d_magic2 != BSD_DISKMAGIC)
return 0;

67
util-linux/fsck_minix.c
View File

@ -13,7 +13,7 @@
* 10.11.91 - updated, does checking, no repairs yet.
* Sent out to the mailing-list for testing.
*
* 14.11.91 - Testing seems to have gone well. Added some
* 14.11.91 - Testing seems to have gone well. Added some
* correction-code, and changed some functions.
*
* 15.11.91 - More correction code. Hopefully it notices most
@ -22,11 +22,10 @@
* 16.11.91 - More corrections (thanks to Mika Jalava). Most
* things seem to work now. Yeah, sure.
*
*
* 19.04.92 - Had to start over again from this old version, as a
* 19.04.92 - Had to start over again from this old version, as a
* kernel bug ate my enhanced fsck in february.
*
* 28.02.93 - added support for different directory entry sizes..
* 28.02.93 - added support for different directory entry sizes..
*
* Sat Mar 6 18:59:42 1993, faith@cs.unc.edu: Output namelen with
* superblock information
@ -35,31 +34,31 @@
* to that required by fsutil
*
* Mon Jan 3 11:06:52 1994 - Dr. Wettstein (greg%wind.uucp@plains.nodak.edu)
* Added support for file system valid flag. Also
* added program_version variable and output of
* program name and version number when program
* is executed.
* Added support for file system valid flag. Also
* added program_version variable and output of
* program name and version number when program
* is executed.
*
* 30.10.94 - added support for v2 filesystem
* (Andreas Schwab, schwab@issan.informatik.uni-dortmund.de)
* 30.10.94 - added support for v2 filesystem
* (Andreas Schwab, schwab@issan.informatik.uni-dortmund.de)
*
* 10.12.94 - added test to prevent checking of mounted fs adapted
* from Theodore Ts'o's (tytso@athena.mit.edu) e2fsck
* program. (Daniel Quinlan, quinlan@yggdrasil.com)
* 10.12.94 - added test to prevent checking of mounted fs adapted
* from Theodore Ts'o's (tytso@athena.mit.edu) e2fsck
* program. (Daniel Quinlan, quinlan@yggdrasil.com)
*
* 01.07.96 - Fixed the v2 fs stuff to use the right #defines and such
* for modern libcs (janl@math.uio.no, Nicolai Langfeldt)
* for modern libcs (janl@math.uio.no, Nicolai Langfeldt)
*
* 02.07.96 - Added C bit fiddling routines from rmk@ecs.soton.ac.uk
* (Russell King). He made them for ARM. It would seem
* that the ARM is powerful enough to do this in C whereas
* that the ARM is powerful enough to do this in C whereas
* i386 and m64k must use assembly to get it fast >:-)
* This should make minix fsck system-independent.
* (janl@math.uio.no, Nicolai Langfeldt)
* This should make minix fsck system-independent.
* (janl@math.uio.no, Nicolai Langfeldt)
*
* 04.11.96 - Added minor fixes from Andreas Schwab to avoid compiler
* warnings. Added mc68k bitops from
* Joerg Dorchain <dorchain@mpi-sb.mpg.de>.
* Joerg Dorchain <dorchain@mpi-sb.mpg.de>.
*
* 06.11.96 - Added v2 code submitted by Joerg Dorchain, but written by
* Andreas Schwab.
@ -1131,7 +1130,7 @@ static void check_counts(void)
continue;
}
printf("Zone %d: %sin use, counted=%d\n",
i, zone_in_use(i) ? "" : "not ", zone_count[i]);
i, zone_in_use(i) ? "" : "not ", zone_count[i]);
}
}
@ -1183,7 +1182,7 @@ static void check_counts2(void)
continue;
}
printf("Zone %d: %sin use, counted=%d\n",
i, zone_in_use(i) ? "" : "not ", zone_count[i]);
i, zone_in_use(i) ? "" : "not ", zone_count[i]);
}
}
#endif
@ -1253,7 +1252,7 @@ int fsck_minix_main(int argc UNUSED_PARAM, char **argv)
printf("Forcing filesystem check on %s\n", device_name);
else if (OPT_repair)
printf("Filesystem on %s is dirty, needs checking\n",
device_name);
device_name);
read_tables();
@ -1280,23 +1279,23 @@ int fsck_minix_main(int argc UNUSED_PARAM, char **argv)
if (!inode_in_use(i))
free_cnt++;
printf("\n%6u inodes used (%u%%)\n", (INODES - free_cnt),
100 * (INODES - free_cnt) / INODES);
100 * (INODES - free_cnt) / INODES);
for (i = FIRSTZONE, free_cnt = 0; i < ZONES; i++)
if (!zone_in_use(i))
free_cnt++;
printf("%6u zones used (%u%%)\n\n"
"%6u regular files\n"
"%6u directories\n"
"%6u character device files\n"
"%6u block device files\n"
"%6u links\n"
"%6u symbolic links\n"
"------\n"
"%6u files\n",
(ZONES - free_cnt), 100 * (ZONES - free_cnt) / ZONES,
regular, directory, chardev, blockdev,
links - 2 * directory + 1, symlinks,
total - 2 * directory + 1);
"%6u regular files\n"
"%6u directories\n"
"%6u character device files\n"
"%6u block device files\n"
"%6u links\n"
"%6u symbolic links\n"
"------\n"
"%6u files\n",
(ZONES - free_cnt), 100 * (ZONES - free_cnt) / ZONES,
regular, directory, chardev, blockdev,
links - 2 * directory + 1, symlinks,
total - 2 * directory + 1);
}
if (changed) {
write_tables();

2
util-linux/getopt.c
View File

@ -372,7 +372,7 @@ int getopt_main(int argc, char **argv)
if (!argv[1]) {
if (compatible) {
/* For some reason, the original getopt gave no error
when there were no arguments. */
* when there were no arguments. */
printf(" --\n");
return 0;
}

2
util-linux/ipcs.c
View File

@ -152,7 +152,7 @@ static NOINLINE void do_shm(void)
if ((shmctl(0, IPC_INFO, (struct shmid_ds *) (void *) &shminfo)) < 0)
return;
/* glibc 2.1.3 and all earlier libc's have ints as fields
of struct shminfo; glibc 2.1.91 has unsigned long; ach */
* of struct shminfo; glibc 2.1.91 has unsigned long; ach */
printf("max number of segments = %lu\n"
"max seg size (kbytes) = %lu\n"
"max total shared memory (pages) = %lu\n"

2
util-linux/volume_id/nilfs.c
View File

@ -86,7 +86,7 @@ int FAST_FUNC volume_id_probe_nilfs(struct volume_id *id /*,uint64_t off*/)
// When used it is at 4K from the end of the partition (sb->s_dev_size - NILFS_SB2_OFFSET).
volume_id_set_label_string(id, sb->s_volume_name, NILFS_LABEL_SIZE < VOLUME_ID_LABEL_SIZE ?
NILFS_LABEL_SIZE : VOLUME_ID_LABEL_SIZE);
NILFS_LABEL_SIZE : VOLUME_ID_LABEL_SIZE);
volume_id_set_uuid(id, sb->s_uuid, UUID_DCE);
if (sb->s_rev_level == 2)

4
util-linux/volume_id/ntfs.c
View File

@ -132,7 +132,7 @@ int FAST_FUNC volume_id_probe_ntfs(struct volume_id *id /*,uint64_t off*/)
dbg("mft record size %i", mft_record_size);
buf = volume_id_get_buffer(id, off + mft_off + (MFT_RECORD_VOLUME * mft_record_size),
mft_record_size);
mft_record_size);
if (buf == NULL)
goto found;
@ -165,7 +165,7 @@ int FAST_FUNC volume_id_probe_ntfs(struct volume_id *id /*,uint64_t off*/)
break;
dbg("found attribute type 0x%x, len %i, at offset %i",
attr_type, attr_len, attr_off);
attr_type, attr_len, attr_off);
// if (attr_type == MFT_RECORD_ATTR_VOLUME_INFO) {
// struct volume_info *info;

2
util-linux/volume_id/udf.c
View File

@ -109,7 +109,7 @@ nsr:
return -1;
dbg("vsd: %c%c%c%c%c",
vsd->id[0], vsd->id[1], vsd->id[2], vsd->id[3], vsd->id[4]);
vsd->id[0], vsd->id[1], vsd->id[2], vsd->id[3], vsd->id[4]);
if (vsd->id[0] == '\0')
return -1;

2
util-linux/volume_id/unused_msdos.c
View File

@ -109,7 +109,7 @@ int FAST_FUNC volume_id_probe_msdos_part_table(struct volume_id *id, uint64_t of
extended = off + poff;
} else {
dbg("found 0x%x data partition at 0x%llx, len 0x%llx",
part[i].sys_ind, (unsigned long long) poff, (unsigned long long) plen);
part[i].sys_ind, (unsigned long long) poff, (unsigned long long) plen);
// if (is_raid(part[i].sys_ind))
// volume_id_set_usage_part(p, VOLUME_ID_RAID);

2
util-linux/volume_id/unused_silicon_raid.c
View File

@ -62,7 +62,7 @@ int FAST_FUNC volume_id_probe_silicon_medley_raid(struct volume_id *id, uint64_t
// volume_id_set_usage(id, VOLUME_ID_RAID);
// snprintf(id->type_version, sizeof(id->type_version)-1, "%u.%u",
// le16_to_cpu(sil->major_ver), le16_to_cpu(sil->minor_ver));
// le16_to_cpu(sil->major_ver), le16_to_cpu(sil->minor_ver));
// id->type = "silicon_medley_raid_member";
return 0;