Simplify posixmodule.c macros

Remove now redundant MEMBER parameter.

Author: vstinner

Doc/library/os.rst

@@ -3497,6 +3497,9 @@ features:
       Number of 512-byte blocks allocated for file.
       This may be smaller than :attr:`stx_size`/512 when the file has holes.
 
+      Equal to ``None`` if :data:`STATX_BLOCKS` is missing from
+      :attr:`~statx_result.stx_mask`.
+
    .. attribute:: stx_btime
 
       Time of file creation expressed in seconds.
@@ -3572,9 +3575,15 @@ features:
 
       Group identifier of the file owner.
 
+      Equal to ``None`` if :data:`STATX_GID` is missing from
+      :attr:`~statx_result.stx_mask`.
+
    .. attribute:: stx_ino
 
-      The inode number.
+      Inode number.
+
+      Equal to ``None`` if :data:`STATX_INO` is missing from
+      :attr:`~statx_result.stx_mask`.
 
    .. attribute:: stx_mnt_id
 
@@ -3609,6 +3618,9 @@ features:
 
       Number of hard links.
 
+      Equal to ``None`` if :data:`STATX_NLINK` is missing from
+      :attr:`~statx_result.stx_mask`.
+
    .. attribute:: stx_rdev
 
       Type of device if an inode device.
@@ -3627,6 +3639,9 @@ features:
       The size of a symbolic link is the length of the pathname it contains,
       without a terminating null byte.
 
+      Equal to ``None`` if :data:`STATX_SIZE` is missing from
+      :attr:`~statx_result.stx_mask`.
+
    .. attribute:: stx_subvol
 
       Subvolume identifier.
@@ -3641,6 +3656,9 @@ features:
 
       User identifier of the file owner.
 
+      Equal to ``None`` if :data:`STATX_UID` is missing from
+      :attr:`~statx_result.stx_mask`.
+
    .. seealso:: The :manpage:`statx(2)` man page.
 
    .. availability:: Linux >= 4.11 with glibc >= 2.28.

Modules/posixmodule.c

@@ -3349,63 +3349,58 @@ static PyMemberDef pystatx_result_members[] = {
 #undef M
 
 
-#define STATX_GET_UINT(ATTR, MEMBER, MASK) \
+#define STATX_GET_UINT(ATTR, MASK) \
     static PyObject* \
     pystatx_result_get_##ATTR(PyObject *op, void *Py_UNUSED(context)) \
     { \
         Py_statx_result *self = Py_statx_result_CAST(op); \
         if (!(self->stx.stx_mask & MASK)) { \
             Py_RETURN_NONE; \
         } \
-        unsigned long value = self->stx.MEMBER; \
+        unsigned long value = self->stx.ATTR; \
         return PyLong_FromUnsignedLong(value); \
     }
 
-STATX_GET_UINT(stx_uid, stx_uid, STATX_UID)
-STATX_GET_UINT(stx_gid, stx_gid, STATX_GID)
-STATX_GET_UINT(stx_nlink, stx_nlink, STATX_NLINK)
+STATX_GET_UINT(stx_uid, STATX_UID)
+STATX_GET_UINT(stx_gid, STATX_GID)
+STATX_GET_UINT(stx_nlink, STATX_NLINK)
 #ifdef HAVE_STRUCT_STATX_STX_DIO_MEM_ALIGN
-STATX_GET_UINT(stx_dio_mem_align, stx_dio_mem_align, STATX_DIOALIGN)
-STATX_GET_UINT(stx_dio_offset_align, stx_dio_offset_align, STATX_DIOALIGN)
+STATX_GET_UINT(stx_dio_mem_align, STATX_DIOALIGN)
+STATX_GET_UINT(stx_dio_offset_align, STATX_DIOALIGN)
 #endif
 #ifdef HAVE_STRUCT_STATX_STX_DIO_READ_OFFSET_ALIGN
-STATX_GET_UINT(stx_dio_read_offset_align, stx_dio_read_offset_align,
-               STATX_DIO_READ_ALIGN)
+STATX_GET_UINT(stx_dio_read_offset_align, STATX_DIO_READ_ALIGN)
 #endif
 #ifdef HAVE_STRUCT_STATX_STX_ATOMIC_WRITE_UNIT_MIN
-STATX_GET_UINT(stx_atomic_write_unit_min, stx_atomic_write_unit_min,
-               STATX_WRITE_ATOMIC)
-STATX_GET_UINT(stx_atomic_write_unit_max, stx_atomic_write_unit_max,
-               STATX_WRITE_ATOMIC)
-STATX_GET_UINT(stx_atomic_write_segments_max, stx_atomic_write_segments_max,
-               STATX_WRITE_ATOMIC)
+STATX_GET_UINT(stx_atomic_write_unit_min, STATX_WRITE_ATOMIC)
+STATX_GET_UINT(stx_atomic_write_unit_max, STATX_WRITE_ATOMIC)
+STATX_GET_UINT(stx_atomic_write_segments_max, STATX_WRITE_ATOMIC)
 #endif
 #ifdef HAVE_STRUCT_STATX_STX_ATOMIC_WRITE_UNIT_MAX_OPT
-STATX_GET_UINT(stx_atomic_write_unit_max_opt, stx_atomic_write_unit_max_opt,
-               STATX_WRITE_ATOMIC)
+STATX_GET_UINT(stx_atomic_write_unit_max_opt, STATX_WRITE_ATOMIC)
 #endif
 
 
-#define STATX_GET_ULONGLONG(ATTR, MEMBER, MASK) \
+#define STATX_GET_ULONGLONG(ATTR, MASK) \
     static PyObject* \
     pystatx_result_get_##ATTR(PyObject *op, void *Py_UNUSED(context)) \
     { \
         Py_statx_result *self = Py_statx_result_CAST(op); \
         if (!(self->stx.stx_mask & MASK)) { \
             Py_RETURN_NONE; \
         } \
-        unsigned long long value = self->stx.MEMBER; \
+        unsigned long long value = self->stx.ATTR; \
         return PyLong_FromUnsignedLongLong(value); \
     }
 
-STATX_GET_ULONGLONG(stx_blocks, stx_blocks, STATX_BLOCKS)
-STATX_GET_ULONGLONG(stx_ino, stx_ino, STATX_INO)
-STATX_GET_ULONGLONG(stx_size, stx_size, STATX_SIZE)
+STATX_GET_ULONGLONG(stx_blocks, STATX_BLOCKS)
+STATX_GET_ULONGLONG(stx_ino, STATX_INO)
+STATX_GET_ULONGLONG(stx_size, STATX_SIZE)
 #ifdef HAVE_STRUCT_STATX_STX_MNT_ID
-STATX_GET_ULONGLONG(stx_mnt_id, stx_mnt_id, STATX_MNT_ID)
+STATX_GET_ULONGLONG(stx_mnt_id, STATX_MNT_ID)
 #endif
 #ifdef HAVE_STRUCT_STATX_STX_SUBVOL
-STATX_GET_ULONGLONG(stx_subvol, stx_subvol, STATX_SUBVOL)
+STATX_GET_ULONGLONG(stx_subvol, STATX_SUBVOL)
 #endif