shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2024-10-30 23:21:08 +03:00
Code

rename CMP_F_TYPE to F_TYPE_CMP

Browse Source
This commit is contained in:
Harald Hoyer 2013-04-18 08:06:55 +02:00
parent fc6e6d245e
commit aea275c431
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/journal/sd-journal.c
View File

@ -1248,11 +1248,11 @@ static void check_network(sd_journal *j, int fd) {
return; return;
j->on_network = j->on_network =
CMP_F_TYPE(sfs.f_type, CIFS_MAGIC_NUMBER) || F_TYPE_CMP(sfs.f_type, CIFS_MAGIC_NUMBER) ||
CMP_F_TYPE(sfs.f_type, CODA_SUPER_MAGIC) || F_TYPE_CMP(sfs.f_type, CODA_SUPER_MAGIC) ||
CMP_F_TYPE(sfs.f_type, NCP_SUPER_MAGIC) || F_TYPE_CMP(sfs.f_type, NCP_SUPER_MAGIC) ||
CMP_F_TYPE(sfs.f_type, NFS_SUPER_MAGIC) || F_TYPE_CMP(sfs.f_type, NFS_SUPER_MAGIC) ||
CMP_F_TYPE(sfs.f_type, SMB_SUPER_MAGIC); F_TYPE_CMP(sfs.f_type, SMB_SUPER_MAGIC);
} }
static int add_file(sd_journal *j, const char *prefix, const char *filename) { static int add_file(sd_journal *j, const char *prefix, const char *filename) {

2
src/readahead/readahead-collect.c
View File

@ -505,7 +505,7 @@ done:
on_ssd = fs_on_ssd(root) > 0; on_ssd = fs_on_ssd(root) > 0;
log_debug("On SSD: %s", yes_no(on_ssd)); log_debug("On SSD: %s", yes_no(on_ssd));
on_btrfs = statfs(root, &sfs) >= 0 && CMP_F_TYPE(sfs.f_type, BTRFS_SUPER_MAGIC); on_btrfs = statfs(root, &sfs) >= 0 && F_TYPE_CMP(sfs.f_type, BTRFS_SUPER_MAGIC);
log_debug("On btrfs: %s", yes_no(on_btrfs)); log_debug("On btrfs: %s", yes_no(on_btrfs));
if (asprintf(&pack_fn_new, "%s/.readahead.new", root) < 0) { if (asprintf(&pack_fn_new, "%s/.readahead.new", root) < 0) {

2
src/shared/macro.h
View File

@ -272,7 +272,7 @@ do { \
* signed int in the kernel and these negative numbers are extended to * signed int in the kernel and these negative numbers are extended to
* long, which cannot be simply compared to the magic constants anymore. * long, which cannot be simply compared to the magic constants anymore.
*/ */
#define CMP_F_TYPE(f, c) \ #define F_TYPE_CMP(f, c) \
__extension__ ({ \ __extension__ ({ \
__SWORD_TYPE _f = (f); \ __SWORD_TYPE _f = (f); \
const __SWORD_TYPE _c = (c); \ const __SWORD_TYPE _c = (c); \

4
src/shared/util.c
View File

@ -2780,8 +2780,8 @@ int rm_rf_children_dangerous(int fd, bool only_dirs, bool honour_sticky, struct
static int is_temporary_fs(struct statfs *s) { static int is_temporary_fs(struct statfs *s) {
assert(s); assert(s);
return return
CMP_F_TYPE(s->f_type, TMPFS_MAGIC) || F_TYPE_CMP(s->f_type, TMPFS_MAGIC) ||
CMP_F_TYPE(s->f_type, RAMFS_MAGIC); F_TYPE_CMP(s->f_type, RAMFS_MAGIC);
} }
int rm_rf_children(int fd, bool only_dirs, bool honour_sticky, struct stat *root_dev) { int rm_rf_children(int fd, bool only_dirs, bool honour_sticky, struct stat *root_dev) {