titaniumtown/os161-assignments
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

clang-format

Browse Source
This commit is contained in:
Simon Gardling
2024-09-10 13:03:02 -04:00
parent 53c617d779
commit d66450e427
381 changed files with 28864 additions and 34170 deletions
Download Patch File Download Diff File Expand all files Collapse all files

90
userland/sbin/sfsck/sb.c
View File

@@ -27,8 +27,8 @@
* SUCH DAMAGE.
*/
#include <sys/types.h> /* for CHAR_BIT */
#include <limits.h> /* also for CHAR_BIT */
#include <sys/types.h> /* for CHAR_BIT */
#include <limits.h> /* also for CHAR_BIT */
#include <stdint.h>
#include <assert.h>
#include <err.h>
@@ -47,78 +47,62 @@ static struct sfs_superblock sb;
/*
* Load the superblock.
*/
void
sb_load(void)
{
sfs_readsb(SFS_SUPER_BLOCK, &sb);
if (sb.sb_magic != SFS_MAGIC) {
errx(EXIT_FATAL, "Not an sfs filesystem");
}
void sb_load(void) {
sfs_readsb(SFS_SUPER_BLOCK, &sb);
if (sb.sb_magic != SFS_MAGIC) {
errx(EXIT_FATAL, "Not an sfs filesystem");
}
assert(sb.sb_nblocks > 0);
assert(SFS_FREEMAPBLOCKS(sb.sb_nblocks) > 0);
assert(sb.sb_nblocks > 0);
assert(SFS_FREEMAPBLOCKS(sb.sb_nblocks) > 0);
}
/*
* Validate the superblock.
*/
void
sb_check(void)
{
int schanged=0;
void sb_check(void) {
int schanged = 0;
/*
* FUTURE: should we check sb.sb_nblocks against diskblocks()?
*/
/*
* FUTURE: should we check sb.sb_nblocks against diskblocks()?
*/
/* Check the superblock fields */
/* Check the superblock fields */
if (checknullstring(sb.sb_volname, sizeof(sb.sb_volname))) {
warnx("Volume name not null-terminated (fixed)");
setbadness(EXIT_RECOV);
schanged = 1;
}
if (checkbadstring(sb.sb_volname)) {
warnx("Volume name contains illegal characters (fixed)");
setbadness(EXIT_RECOV);
schanged = 1;
}
if (checkzeroed(sb.reserved, sizeof(sb.reserved))) {
warnx("Reserved section of superblock not zeroed (fixed)");
setbadness(EXIT_RECOV);
schanged = 1;
}
if (checknullstring(sb.sb_volname, sizeof(sb.sb_volname))) {
warnx("Volume name not null-terminated (fixed)");
setbadness(EXIT_RECOV);
schanged = 1;
}
if (checkbadstring(sb.sb_volname)) {
warnx("Volume name contains illegal characters (fixed)");
setbadness(EXIT_RECOV);
schanged = 1;
}
if (checkzeroed(sb.reserved, sizeof(sb.reserved))) {
warnx("Reserved section of superblock not zeroed (fixed)");
setbadness(EXIT_RECOV);
schanged = 1;
}
/* Write the superblock back if necessary */
if (schanged) {
sfs_writesb(SFS_SUPER_BLOCK, &sb);
}
/* Write the superblock back if necessary */
if (schanged) {
sfs_writesb(SFS_SUPER_BLOCK, &sb);
}
}
/*
* Return the total number of blocks in the volume.
*/
uint32_t
sb_totalblocks(void)
{
return sb.sb_nblocks;
}
uint32_t sb_totalblocks(void) { return sb.sb_nblocks; }
/*
* Return the number of freemap blocks.
* (this function probably ought to go away)
*/
uint32_t
sb_freemapblocks(void)
{
return SFS_FREEMAPBLOCKS(sb.sb_nblocks);
}
uint32_t sb_freemapblocks(void) { return SFS_FREEMAPBLOCKS(sb.sb_nblocks); }
/*
* Return the volume name.
*/
const char *
sb_volname(void)
{
return sb.sb_volname;
}
const char *sb_volname(void) { return sb.sb_volname; }