(original) (raw)

changeset: 76845:8ab37fa24e58 parent: 76843:8bfe89e9d851 user: Larry Hastings larry@hastings.org date: Tue May 08 23:52:03 2012 -0700 files: Python/getargs.c description: Issue #14746: Remove redundant paragraphs from skipitem() in Python/getargs.c. diff -r 8bfe89e9d851 -r 8ab37fa24e58 Python/getargs.c --- a/Python/getargs.c Tue May 08 21:29:06 2012 -0400 +++ b/Python/getargs.c Tue May 08 23:52:03 2012 -0700 @@ -1609,8 +1609,10 @@ switch (c) { - /* simple codes - * The individual types (second arg of va_arg) are irrelevant */ + /* + * codes that take a single data pointer as an argument + * (the type of the pointer is irrelevant) + */ case 'b': /* byte -- very short int */ case 'B': /* byte as bitfield */ @@ -1624,23 +1626,21 @@ case 'L': /* PY_LONG_LONG */ case 'K': /* PY_LONG_LONG sized bitfield */ #endif + case 'n': /* Py_ssize_t */ case 'f': /* float */ case 'd': /* double */ case 'D': /* complex double */ case 'c': /* char */ case 'C': /* unicode char */ case 'p': /* boolean predicate */ + case 'S': /* string object */ + case 'Y': /* string object */ + case 'U': /* unicode string object */ { (void) va_arg(*p_va, void *); break; } - case 'n': /* Py_ssize_t */ - { - (void) va_arg(*p_va, Py_ssize_t *); - break; - } - /* string codes */ case 'e': /* string with encoding */ @@ -1673,16 +1673,6 @@ break; } - /* object codes */ - - case 'S': /* string object */ - case 'Y': /* string object */ - case 'U': /* unicode string object */ - { - (void) va_arg(*p_va, PyObject **); - break; - } - case 'O': /* object */ { if (*format == '!') { /larry@hastings.org