X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fjournal%2Fsd-journal.c;h=bc9e41e0471518a37ef5603896659cb06ef6a029;hp=88777cbcb967a481219c6ee43c12f9ff044c478d;hb=aea275c43194b6ac519ef907b62c5c995050fde0;hpb=c4073a27c555aeceac87a3b02a83141cde641a1e diff --git a/src/journal/sd-journal.c b/src/journal/sd-journal.c index 88777cbcb..bc9e41e04 100644 --- a/src/journal/sd-journal.c +++ b/src/journal/sd-journal.c @@ -1248,11 +1248,11 @@ static void check_network(sd_journal *j, int fd) { return; j->on_network = - (unsigned __SWORD_TYPE) sfs.f_type == CIFS_MAGIC_NUMBER || - (unsigned __SWORD_TYPE) sfs.f_type == CODA_SUPER_MAGIC || - (unsigned __SWORD_TYPE) sfs.f_type == NCP_SUPER_MAGIC || - (unsigned __SWORD_TYPE) sfs.f_type == NFS_SUPER_MAGIC || - (unsigned __SWORD_TYPE) sfs.f_type == SMB_SUPER_MAGIC; + F_TYPE_CMP(sfs.f_type, CIFS_MAGIC_NUMBER) || + F_TYPE_CMP(sfs.f_type, CODA_SUPER_MAGIC) || + F_TYPE_CMP(sfs.f_type, NCP_SUPER_MAGIC) || + F_TYPE_CMP(sfs.f_type, NFS_SUPER_MAGIC) || + F_TYPE_CMP(sfs.f_type, SMB_SUPER_MAGIC); } static int add_file(sd_journal *j, const char *prefix, const char *filename) {