Skip to content

Commit e39ccbb

Browse files
equal-l2equal-l2
committed
Use libc_bitflags! for BSD in fcntl.rs
1 parent e12ff77 commit e39ccbb

File tree

1 file changed

+126
-126
lines changed

1 file changed

+126
-126
lines changed

‎src/fcntl.rs

Lines changed: 126 additions & 126 deletions
Original file line numberDiff line numberDiff line change
@@ -238,9 +238,9 @@ mod consts {
238238
}
239239
);
240240

241-
bitflags!(
242-
pub struct FdFlag: c_int {
243-
const FD_CLOEXEC = 1;
241+
libc_bitflags!(
242+
pub flags FdFlag: c_int {
243+
FD_CLOEXEC
244244
}
245245
);
246246

@@ -259,31 +259,31 @@ mod consts {
259259
mod consts {
260260
use libc::{self, c_int};
261261

262-
bitflags!(
263-
pub struct OFlag: c_int {
264-
const O_ACCMODE = libc::O_ACCMODE;
265-
const O_RDONLY = libc::O_RDONLY;
266-
const O_WRONLY = libc::O_WRONLY;
267-
const O_RDWR = libc::O_RDWR;
268-
const O_CREAT = libc::O_CREAT;
269-
const O_EXCL = libc::O_EXCL;
270-
const O_NOCTTY = libc::O_NOCTTY;
271-
const O_TRUNC = libc::O_TRUNC;
272-
const O_APPEND = libc::O_APPEND;
273-
const O_NONBLOCK = libc::O_NONBLOCK;
274-
const O_DSYNC = libc::O_DSYNC;
275-
const O_DIRECTORY = libc::O_DIRECTORY;
276-
const O_NOFOLLOW = libc::O_NOFOLLOW;
277-
const O_CLOEXEC = libc::O_CLOEXEC;
278-
const O_SYNC = libc::O_SYNC;
279-
const O_NDELAY = O_NONBLOCK.bits;
280-
const O_FSYNC = libc::O_FSYNC;
262+
libc_bitflags!(
263+
pub flags OFlag: c_int {
264+
O_ACCMODE,
265+
O_RDONLY,
266+
O_WRONLY,
267+
O_RDWR,
268+
O_CREAT,
269+
O_EXCL,
270+
O_NOCTTY,
271+
O_TRUNC,
272+
O_APPEND,
273+
O_NONBLOCK,
274+
O_DSYNC,
275+
O_DIRECTORY,
276+
O_NOFOLLOW,
277+
O_CLOEXEC,
278+
O_SYNC,
279+
O_NDELAY,
280+
O_FSYNC,
281281
}
282282
);
283283

284-
bitflags!(
285-
pub struct FdFlag: c_int {
286-
const FD_CLOEXEC = 1;
284+
libc_bitflags!(
285+
pub flags FdFlag: c_int {
286+
FD_CLOEXEC
287287
}
288288
);
289289
}
@@ -292,35 +292,35 @@ mod consts {
292292
mod consts {
293293
use libc::{self, c_int};
294294

295-
bitflags!(
296-
pub struct OFlag: c_int {
297-
const O_ACCMODE = libc::O_ACCMODE;
298-
const O_RDONLY = libc::O_RDONLY;
299-
const O_WRONLY = libc::O_WRONLY;
300-
const O_RDWR = libc::O_RDWR;
301-
const O_CREAT = libc::O_CREAT;
302-
const O_EXCL = libc::O_EXCL;
303-
const O_NOCTTY = libc::O_NOCTTY;
304-
const O_TRUNC = libc::O_TRUNC;
305-
const O_APPEND = libc::O_APPEND;
306-
const O_NONBLOCK = libc::O_NONBLOCK;
307-
const O_DIRECTORY = 0x0020000;
308-
const O_NOFOLLOW = libc::O_NOFOLLOW;
309-
const O_CLOEXEC = libc::O_CLOEXEC;
310-
const O_SYNC = libc::O_SYNC;
311-
const O_NDELAY = libc::O_NDELAY;
312-
const O_FSYNC = libc::O_FSYNC;
313-
const O_SHLOCK = 0x0000080;
314-
const O_EXLOCK = 0x0000020;
315-
const O_DIRECT = 0x0010000;
316-
const O_EXEC = 0x0040000;
317-
const O_TTY_INIT = 0x0080000;
295+
libc_bitflags!(
296+
pub flags OFlag: c_int {
297+
O_ACCMODE,
298+
O_RDONLY,
299+
O_WRONLY,
300+
O_RDWR,
301+
O_CREAT,
302+
O_EXCL,
303+
O_NOCTTY,
304+
O_TRUNC,
305+
O_APPEND,
306+
O_NONBLOCK,
307+
O_DIRECTORY,
308+
O_NOFOLLOW,
309+
O_CLOEXEC,
310+
O_SYNC,
311+
O_NDELAY,
312+
O_FSYNC,
313+
O_SHLOCK,
314+
O_EXLOCK,
315+
O_DIRECT,
316+
O_EXEC,
317+
O_TTY_INIT,
318318
}
319319
);
320320

321-
bitflags!(
322-
pub struct FdFlag: c_int {
323-
const FD_CLOEXEC = 1;
321+
libc_bitflags!(
322+
pub flags FdFlag: c_int {
323+
FD_CLOEXEC
324324
}
325325
);
326326
}
@@ -329,32 +329,32 @@ mod consts {
329329
mod consts {
330330
use libc::{self, c_int};
331331

332-
bitflags!(
332+
libc_bitflags!(
333333
pub flags OFlag: c_int {
334-
const O_ACCMODE = libc::O_ACCMODE,
335-
const O_RDONLY = libc::O_RDONLY,
336-
const O_WRONLY = libc::O_WRONLY,
337-
const O_RDWR = libc::O_RDWR,
338-
const O_CREAT = libc::O_CREAT,
339-
const O_EXCL = libc::O_EXCL,
340-
const O_NOCTTY = libc::O_NOCTTY,
341-
const O_TRUNC = libc::O_TRUNC,
342-
const O_APPEND = libc::O_APPEND,
343-
const O_NONBLOCK = libc::O_NONBLOCK,
344-
const O_DIRECTORY = 0x0020000,
345-
const O_NOFOLLOW = libc::O_NOFOLLOW,
346-
const O_CLOEXEC = libc::O_CLOEXEC,
347-
const O_SYNC = libc::O_SYNC,
348-
const O_NDELAY = libc::O_NDELAY,
349-
const O_FSYNC = libc::O_FSYNC,
350-
const O_SHLOCK = 0x0000080,
351-
const O_EXLOCK = 0x0000020,
334+
O_ACCMODE,
335+
O_RDONLY,
336+
O_WRONLY,
337+
O_RDWR,
338+
O_CREAT,
339+
O_EXCL,
340+
O_NOCTTY,
341+
O_TRUNC,
342+
O_APPEND,
343+
O_NONBLOCK,
344+
O_DIRECTORY,
345+
O_NOFOLLOW,
346+
O_CLOEXEC,
347+
O_SYNC,
348+
O_NDELAY,
349+
O_FSYNC,
350+
O_SHLOCK,
351+
O_EXLOCK,
352352
}
353353
);
354354

355-
bitflags!(
355+
libc_bitflags!(
356356
pub flags FdFlag: c_int {
357-
const FD_CLOEXEC = 1
357+
FD_CLOEXEC
358358
}
359359
);
360360
}
@@ -363,39 +363,39 @@ mod consts {
363363
mod consts {
364364
use libc::c_int;
365365

366-
bitflags!(
367-
pub struct OFlag: c_int {
368-
const O_ACCMODE = 0x0000003;
369-
const O_RDONLY = 0x0000000;
370-
const O_WRONLY = 0x0000001;
371-
const O_RDWR = 0x0000002;
372-
const O_NONBLOCK = 0x0000004;
373-
const O_APPEND = 0x0000008;
374-
const O_SHLOCK = 0x0000010;
375-
const O_EXLOCK = 0x0000020;
376-
const O_ASYNC = 0x0000040;
377-
const O_SYNC = 0x0000080;
378-
const O_NOFOLLOW = 0x0000100;
379-
const O_CREAT = 0x0000200;
380-
const O_TRUNC = 0x0000400;
381-
const O_EXCL = 0x0000800;
382-
const O_NOCTTY = 0x0008000;
383-
const O_DSYNC = 0x0010000;
384-
const O_RSYNC = 0x0020000;
385-
const O_ALT_IO = 0x0040000;
386-
const O_DIRECT = 0x0080000;
387-
const O_NOSIGPIPE = 0x0100000;
388-
const O_DIRECTORY = 0x0200000;
389-
const O_CLOEXEC = 0x0400000;
390-
const O_SEARCH = 0x0800000;
391-
const O_FSYNC = O_SYNC.bits;
392-
const O_NDELAY = O_NONBLOCK.bits;
366+
libc_bitflags!(
367+
pub flags OFlag: c_int {
368+
O_ACCMODE,
369+
O_RDONLY,
370+
O_WRONLY,
371+
O_RDWR,
372+
O_NONBLOCK,
373+
O_APPEND,
374+
O_SHLOCK,
375+
O_EXLOCK,
376+
O_ASYNC,
377+
O_SYNC,
378+
O_NOFOLLOW,
379+
O_CREAT,
380+
O_TRUNC,
381+
O_EXCL,
382+
O_NOCTTY,
383+
O_DSYNC,
384+
O_RSYNC,
385+
O_ALT_IO,
386+
O_DIRECT,
387+
O_NOSIGPIPE,
388+
O_DIRECTORY,
389+
O_CLOEXEC,
390+
O_SEARCH,
391+
O_FSYNC,
392+
O_NDELAY,
393393
}
394394
);
395395

396-
bitflags!(
397-
pub struct FdFlag: c_int {
398-
const FD_CLOEXEC = 1;
396+
libc_bitflags!(
397+
pub flags FdFlag: c_int {
398+
FD_CLOEXEC
399399
}
400400
);
401401
}
@@ -404,33 +404,33 @@ mod consts {
404404
mod consts {
405405
use libc::c_int;
406406

407-
bitflags!(
408-
pub struct OFlag: c_int {
409-
const O_ACCMODE = 0x0000003;
410-
const O_RDONLY = 0x0000000;
411-
const O_WRONLY = 0x0000001;
412-
const O_RDWR = 0x0000002;
413-
const O_CREAT = 0x0000200;
414-
const O_EXCL = 0x0000800;
415-
const O_NOCTTY = 0x0008000;
416-
const O_TRUNC = 0x0000400;
417-
const O_APPEND = 0x0000008;
418-
const O_NONBLOCK = 0x0000004;
419-
const O_DIRECTORY = 0x8000000; // different from FreeBSD!
420-
const O_NOFOLLOW = 0x0000100;
421-
const O_CLOEXEC = 0x0020000; // different from FreeBSD!
422-
const O_SYNC = 0x0000080;
423-
const O_NDELAY = O_NONBLOCK.bits;
424-
const O_FSYNC = O_SYNC.bits;
425-
const O_SHLOCK = 0x0000010; // different from FreeBSD!
426-
const O_EXLOCK = 0x0000020;
427-
const O_DIRECT = 0x0010000;
407+
libc_bitflags!(
408+
pub flags OFlag: c_int {
409+
O_ACCMODE,
410+
O_RDONLY,
411+
O_WRONLY,
412+
O_RDWR,
413+
O_CREAT,
414+
O_EXCL,
415+
O_NOCTTY,
416+
O_TRUNC,
417+
O_APPEND,
418+
O_NONBLOCK,
419+
O_DIRECTORY,
420+
O_NOFOLLOW,
421+
O_CLOEXEC,
422+
O_SYNC,
423+
O_NDELAY,
424+
O_FSYNC,
425+
O_SHLOCK,
426+
O_EXLOCK,
427+
O_DIRECT,
428428
}
429429
);
430430

431-
bitflags!(
432-
pub struct FdFlag: c_int {
433-
const FD_CLOEXEC = 1;
431+
libc_bitflags!(
432+
pub flags FdFlag: c_int {
433+
FD_CLOEXEC
434434
}
435435
);
436436
}

0 commit comments

Comments
 (0)