Avoid casts as lvalues.

This commit is contained in:
kan 2004-07-28 05:59:22 +00:00
parent 8951be1606
commit bce3675a33
2 changed files with 11 additions and 4 deletions

View File

@ -63,6 +63,12 @@ union dinode {
#define DIP(dp, field) \
((sblock->fs_magic == FS_UFS1_MAGIC) ? \
(dp)->dp1.field : (dp)->dp2.field)
#define DIP_SET(dp, field, val) do {\
if (sblock->fs_magic == FS_UFS1_MAGIC) \
(dp)->dp1.field = (val); \
else \
(dp)->dp2.field = (val); \
} while (0)
#define HASDUMPEDFILE 0x1
#define HASSUBDIRS 0x2
@ -446,8 +452,8 @@ dumpino(union dinode *dp, ino_t ino)
* as a zero length file.
*/
if ((DIP(dp, di_flags) & SF_SNAPSHOT) != 0) {
DIP(dp, di_size) = 0;
DIP(dp, di_flags) &= ~SF_SNAPSHOT;
DIP_SET(dp, di_size, 0);
DIP_SET(dp, di_flags, DIP(dp, di_flags) & ~SF_SNAPSHOT);
}
if (sblock->fs_magic == FS_UFS1_MAGIC) {
spcl.c_mode = dp->dp1.di_mode;

View File

@ -274,9 +274,10 @@ fsirand(char *device)
inumber,
sblock->fs_magic == FS_UFS1_MAGIC ?
(quad_t)dp1->di_gen : dp2->di_gen);
else if (sblock->fs_magic == FS_UFS1_MAGIC)
dp1->di_gen = random();
else
(sblock->fs_magic == FS_UFS1_MAGIC ?
dp1->di_gen : dp2->di_gen) = random();
dp2->di_gen = random();
}
}