Deleted Added
full compact
inode.c (100935) inode.c (101037)
1/*
2 * Copyright (c) 1980, 1986, 1993
3 * The Regents of the University of California. All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 22 unchanged lines hidden (view full) ---

31 * SUCH DAMAGE.
32 */
33
34#ifndef lint
35#if 0
36static const char sccsid[] = "@(#)inode.c 8.8 (Berkeley) 4/28/95";
37#endif
38static const char rcsid[] =
1/*
2 * Copyright (c) 1980, 1986, 1993
3 * The Regents of the University of California. All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 22 unchanged lines hidden (view full) ---

31 * SUCH DAMAGE.
32 */
33
34#ifndef lint
35#if 0
36static const char sccsid[] = "@(#)inode.c 8.8 (Berkeley) 4/28/95";
37#endif
38static const char rcsid[] =
39 "$FreeBSD: head/sbin/fsck_ffs/inode.c 100935 2002-07-30 13:01:25Z phk $";
39 "$FreeBSD: head/sbin/fsck_ffs/inode.c 101037 2002-07-31 12:01:14Z mux $";
40#endif /* not lint */
41
42#include <sys/param.h>
43#include <sys/stdint.h>
44#include <sys/time.h>
45#include <sys/sysctl.h>
46
47#include <ufs/ufs/dinode.h>

--- 509 unchanged lines hidden (view full) ---

557 printf(" OWNER=");
558 if ((pw = getpwuid((int)DIP(dp, di_uid))) != 0)
559 printf("%s ", pw->pw_name);
560 else
561 printf("%u ", (unsigned)DIP(dp, di_uid));
562 printf("MODE=%o\n", DIP(dp, di_mode));
563 if (preen)
564 printf("%s: ", cdevname);
40#endif /* not lint */
41
42#include <sys/param.h>
43#include <sys/stdint.h>
44#include <sys/time.h>
45#include <sys/sysctl.h>
46
47#include <ufs/ufs/dinode.h>

--- 509 unchanged lines hidden (view full) ---

557 printf(" OWNER=");
558 if ((pw = getpwuid((int)DIP(dp, di_uid))) != 0)
559 printf("%s ", pw->pw_name);
560 else
561 printf("%u ", (unsigned)DIP(dp, di_uid));
562 printf("MODE=%o\n", DIP(dp, di_mode));
563 if (preen)
564 printf("%s: ", cdevname);
565 printf("SIZE=%qu ", DIP(dp, di_size));
565 printf("SIZE=%ju ", (uintmax_t)DIP(dp, di_size));
566 t = DIP(dp, di_mtime);
567 p = ctime(&t);
568 printf("MTIME=%12.12s %4.4s ", &p[4], &p[20]);
569}
570
571void
572blkerror(ino_t ino, const char *type, ufs2_daddr_t blk)
573{
574
566 t = DIP(dp, di_mtime);
567 p = ctime(&t);
568 printf("MTIME=%12.12s %4.4s ", &p[4], &p[20]);
569}
570
571void
572blkerror(ino_t ino, const char *type, ufs2_daddr_t blk)
573{
574
575 pfatal("%lld %s I=%lu", (intmax_t)blk, type, (u_long)ino);
575 pfatal("%jd %s I=%ju", (intmax_t)blk, type, (uintmax_t)ino);
576 printf("\n");
577 switch (inoinfo(ino)->ino_state) {
578
579 case FSTATE:
580 inoinfo(ino)->ino_state = FCLEAR;
581 return;
582
583 case DSTATE:

--- 93 unchanged lines hidden ---
576 printf("\n");
577 switch (inoinfo(ino)->ino_state) {
578
579 case FSTATE:
580 inoinfo(ino)->ino_state = FCLEAR;
581 return;
582
583 case DSTATE:

--- 93 unchanged lines hidden ---