Fixed gratuitous ANSIisms.
Removed trailing newline from panic messages.
This commit is contained in:
Bruce Evans
parent
ada28e77e6
commit
be98721964
@ -80,7 +80,9 @@ static void ext2_fserr __P((struct ext2_sb_info *, u_int, char *));
|
||||
* I call it in ext2_inactive, ext2_truncate, ext2_vfree and in (2)
|
||||
* the call in vfree might be redundant
|
||||
*/
|
||||
void ext2_discard_prealloc (struct inode * ip)
|
||||
void
|
||||
ext2_discard_prealloc(ip)
|
||||
struct inode * ip;
|
||||
{
|
||||
#ifdef EXT2_PREALLOCATE
|
||||
if (ip->i_prealloc_count) {
|
||||
@ -127,7 +129,7 @@ ext2_alloc(ip, lbn, bpref, size, cred, bnp)
|
||||
panic("ext2_alloc: bad size");
|
||||
}
|
||||
if (cred == NOCRED)
|
||||
panic("ext2_alloc: missing credential\n");
|
||||
panic("ext2_alloc: missing credential");
|
||||
#endif /* DIAGNOSTIC */
|
||||
if (size == fs->s_blocksize && fs->s_es->s_free_blocks_count == 0)
|
||||
goto nospace;
|
||||
@ -542,7 +544,7 @@ ext2_vfree(ap)
|
||||
pip = VTOI(ap->a_pvp);
|
||||
fs = pip->i_e2fs;
|
||||
if ((u_int)ino >= fs->s_inodes_per_group * fs->s_groups_count)
|
||||
panic("ifree: range: dev = 0x%x, ino = %d, fs = %s\n",
|
||||
panic("ifree: range: dev = 0x%x, ino = %d, fs = %s",
|
||||
pip->i_dev, ino, fs->fs_fsmnt);
|
||||
|
||||
/* ext2_debug("ext2_vfree (%d, %d) called\n", pip->i_number, ap->a_mode);
|
||||
|
||||
@ -135,8 +135,8 @@ ext2_debug("ext2_balloc called (%d, %d, %d)\n",
|
||||
printf("nsize %d(%d) > osize %d(%d) nb %d\n",
|
||||
(int)nsize, (int)size, (int)osize,
|
||||
(int)ip->i_size, (int)nb);
|
||||
panic("ext2_balloc: "
|
||||
"Something is terribly wrong\n");
|
||||
panic(
|
||||
"ext2_balloc: Something is terribly wrong");
|
||||
/*
|
||||
* please note there haven't been any changes from here on -
|
||||
* FFS seems to work.
|
||||
@ -174,7 +174,7 @@ ext2_debug("ext2_balloc called (%d, %d, %d)\n",
|
||||
return(error);
|
||||
#if DIAGNOSTIC
|
||||
if (num < 1)
|
||||
panic ("ext2_balloc: ufs_bmaparray returned indirect block\n");
|
||||
panic ("ext2_balloc: ufs_bmaparray returned indirect block");
|
||||
#endif
|
||||
/*
|
||||
* Fetch the first indirect block allocating if necessary.
|
||||
|
||||
@ -86,9 +86,9 @@ int ext2_new_block __P ((struct mount * mp, unsigned long goal,
|
||||
int * prealloc_block));
|
||||
ino_t ext2_new_inode __P ((const struct inode * dir, int mode));
|
||||
unsigned long ext2_count_free __P((struct buf *map, unsigned int numchars));
|
||||
void ext2_free_blocks (struct mount * mp, unsigned long block,
|
||||
unsigned long count);
|
||||
void ext2_free_inode (struct inode * inode);
|
||||
void ext2_free_blocks __P((struct mount * mp, unsigned long block,
|
||||
unsigned long count));
|
||||
void ext2_free_inode __P((struct inode * inode));
|
||||
void ext2_ei2di __P((struct ext2_inode *ei, struct dinode *di));
|
||||
void ext2_di2ei __P((struct dinode *di, struct ext2_inode *ei));
|
||||
void mark_buffer_dirty __P((struct buf *bh));
|
||||
|
||||
@ -740,11 +740,12 @@ ext2_dirbadentry(dp, de, entryoffsetinblock)
|
||||
error_msg = "inode out of bounds";
|
||||
*/
|
||||
|
||||
if (error_msg != NULL)
|
||||
printf( "bad directory entry: %s\n"
|
||||
"offset=%lu, inode=%lu, rec_len=%d, name_len=%d \n",
|
||||
error_msg, entryoffsetinblock,
|
||||
(unsigned long) de->inode, de->rec_len, de->name_len);
|
||||
if (error_msg != NULL) {
|
||||
printf("bad directory entry: %s\n", error_msg);
|
||||
printf("offset=%lu, inode=%lu, rec_len=%d, name_len=%d\n",
|
||||
entryoffsetinblock, (unsigned long)de->inode,
|
||||
de->rec_len, de->name_len);
|
||||
}
|
||||
return error_msg == NULL ? 0 : 1;
|
||||
}
|
||||
|
||||
|
||||
@ -80,7 +80,9 @@ static void ext2_fserr __P((struct ext2_sb_info *, u_int, char *));
|
||||
* I call it in ext2_inactive, ext2_truncate, ext2_vfree and in (2)
|
||||
* the call in vfree might be redundant
|
||||
*/
|
||||
void ext2_discard_prealloc (struct inode * ip)
|
||||
void
|
||||
ext2_discard_prealloc(ip)
|
||||
struct inode * ip;
|
||||
{
|
||||
#ifdef EXT2_PREALLOCATE
|
||||
if (ip->i_prealloc_count) {
|
||||
@ -127,7 +129,7 @@ ext2_alloc(ip, lbn, bpref, size, cred, bnp)
|
||||
panic("ext2_alloc: bad size");
|
||||
}
|
||||
if (cred == NOCRED)
|
||||
panic("ext2_alloc: missing credential\n");
|
||||
panic("ext2_alloc: missing credential");
|
||||
#endif /* DIAGNOSTIC */
|
||||
if (size == fs->s_blocksize && fs->s_es->s_free_blocks_count == 0)
|
||||
goto nospace;
|
||||
@ -542,7 +544,7 @@ ext2_vfree(ap)
|
||||
pip = VTOI(ap->a_pvp);
|
||||
fs = pip->i_e2fs;
|
||||
if ((u_int)ino >= fs->s_inodes_per_group * fs->s_groups_count)
|
||||
panic("ifree: range: dev = 0x%x, ino = %d, fs = %s\n",
|
||||
panic("ifree: range: dev = 0x%x, ino = %d, fs = %s",
|
||||
pip->i_dev, ino, fs->fs_fsmnt);
|
||||
|
||||
/* ext2_debug("ext2_vfree (%d, %d) called\n", pip->i_number, ap->a_mode);
|
||||
|
||||
@ -135,8 +135,8 @@ ext2_debug("ext2_balloc called (%d, %d, %d)\n",
|
||||
printf("nsize %d(%d) > osize %d(%d) nb %d\n",
|
||||
(int)nsize, (int)size, (int)osize,
|
||||
(int)ip->i_size, (int)nb);
|
||||
panic("ext2_balloc: "
|
||||
"Something is terribly wrong\n");
|
||||
panic(
|
||||
"ext2_balloc: Something is terribly wrong");
|
||||
/*
|
||||
* please note there haven't been any changes from here on -
|
||||
* FFS seems to work.
|
||||
@ -174,7 +174,7 @@ ext2_debug("ext2_balloc called (%d, %d, %d)\n",
|
||||
return(error);
|
||||
#if DIAGNOSTIC
|
||||
if (num < 1)
|
||||
panic ("ext2_balloc: ufs_bmaparray returned indirect block\n");
|
||||
panic ("ext2_balloc: ufs_bmaparray returned indirect block");
|
||||
#endif
|
||||
/*
|
||||
* Fetch the first indirect block allocating if necessary.
|
||||
|
||||
@ -86,9 +86,9 @@ int ext2_new_block __P ((struct mount * mp, unsigned long goal,
|
||||
int * prealloc_block));
|
||||
ino_t ext2_new_inode __P ((const struct inode * dir, int mode));
|
||||
unsigned long ext2_count_free __P((struct buf *map, unsigned int numchars));
|
||||
void ext2_free_blocks (struct mount * mp, unsigned long block,
|
||||
unsigned long count);
|
||||
void ext2_free_inode (struct inode * inode);
|
||||
void ext2_free_blocks __P((struct mount * mp, unsigned long block,
|
||||
unsigned long count));
|
||||
void ext2_free_inode __P((struct inode * inode));
|
||||
void ext2_ei2di __P((struct ext2_inode *ei, struct dinode *di));
|
||||
void ext2_di2ei __P((struct dinode *di, struct ext2_inode *ei));
|
||||
void mark_buffer_dirty __P((struct buf *bh));
|
||||
|
||||
@ -740,11 +740,12 @@ ext2_dirbadentry(dp, de, entryoffsetinblock)
|
||||
error_msg = "inode out of bounds";
|
||||
*/
|
||||
|
||||
if (error_msg != NULL)
|
||||
printf( "bad directory entry: %s\n"
|
||||
"offset=%lu, inode=%lu, rec_len=%d, name_len=%d \n",
|
||||
error_msg, entryoffsetinblock,
|
||||
(unsigned long) de->inode, de->rec_len, de->name_len);
|
||||
if (error_msg != NULL) {
|
||||
printf("bad directory entry: %s\n", error_msg);
|
||||
printf("offset=%lu, inode=%lu, rec_len=%d, name_len=%d\n",
|
||||
entryoffsetinblock, (unsigned long)de->inode,
|
||||
de->rec_len, de->name_len);
|
||||
}
|
||||
return error_msg == NULL ? 0 : 1;
|
||||
}
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user