Skip to content

Commit

Permalink
Ignore _Py_write_noraise() result: cast to (void) (python#108291)
Browse files Browse the repository at this point in the history
Code using _Py_write_noraise() usually cannot report. Ignore errors
is the least surprising behavior for users.
  • Loading branch information
vstinner committed Aug 22, 2023
1 parent a541e01 commit 6541fe4
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 9 deletions.
4 changes: 2 additions & 2 deletions Modules/faulthandler.c
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
/* Allocate at maximum 100 MiB of the stack to raise the stack overflow */
#define STACK_OVERFLOW_MAX_SIZE (100 * 1024 * 1024)

#define PUTS(fd, str) _Py_write_noraise(fd, str, strlen(str))
#define PUTS(fd, str) (void)_Py_write_noraise(fd, str, strlen(str))


// clang uses __attribute__((no_sanitize("undefined")))
Expand Down Expand Up @@ -576,7 +576,7 @@ faulthandler_thread(void *unused)
/* Timeout => dump traceback */
assert(st == PY_LOCK_FAILURE);

_Py_write_noraise(thread.fd, thread.header, (int)thread.header_len);
(void)_Py_write_noraise(thread.fd, thread.header, (int)thread.header_len);

errmsg = _Py_DumpTracebackThreads(thread.fd, thread.interp, NULL);
ok = (errmsg == NULL);
Expand Down
2 changes: 1 addition & 1 deletion Python/pylifecycle.c
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
# undef BYTE
#endif

#define PUTS(fd, str) _Py_write_noraise(fd, str, (int)strlen(str))
#define PUTS(fd, str) (void)_Py_write_noraise(fd, str, (int)strlen(str))


#ifdef __cplusplus
Expand Down
10 changes: 5 additions & 5 deletions Python/traceback.c
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@

#define OFF(x) offsetof(PyTracebackObject, x)

#define PUTS(fd, str) _Py_write_noraise(fd, str, (int)strlen(str))
#define PUTS(fd, str) (void)_Py_write_noraise(fd, str, (int)strlen(str))
#define MAX_STRING_LENGTH 500
#define MAX_FRAME_DEPTH 100
#define MAX_NTHREADS 100
Expand Down Expand Up @@ -1047,7 +1047,7 @@ _Py_DumpDecimal(int fd, size_t value)
value /= 10;
} while (value);

_Py_write_noraise(fd, ptr, end - ptr);
(void)_Py_write_noraise(fd, ptr, end - ptr);
}

/* Format an integer as hexadecimal with width digits into fd file descriptor.
Expand All @@ -1072,7 +1072,7 @@ _Py_DumpHexadecimal(int fd, uintptr_t value, Py_ssize_t width)
value >>= 4;
} while ((end - ptr) < width || value);

_Py_write_noraise(fd, ptr, end - ptr);
(void)_Py_write_noraise(fd, ptr, end - ptr);
}

void
Expand Down Expand Up @@ -1125,7 +1125,7 @@ _Py_DumpASCII(int fd, PyObject *text)
}
if (!need_escape) {
// The string can be written with a single write() syscall
_Py_write_noraise(fd, str, size);
(void)_Py_write_noraise(fd, str, size);
goto done;
}
}
Expand All @@ -1135,7 +1135,7 @@ _Py_DumpASCII(int fd, PyObject *text)
if (' ' <= ch && ch <= 126) {
/* printable ASCII character */
char c = (char)ch;
_Py_write_noraise(fd, &c, 1);
(void)_Py_write_noraise(fd, &c, 1);
}
else if (ch <= 0xff) {
PUTS(fd, "\\x");
Expand Down
2 changes: 1 addition & 1 deletion Python/tracemalloc.c
Original file line number Diff line number Diff line change
Expand Up @@ -1247,7 +1247,7 @@ tracemalloc_get_traceback(unsigned int domain, uintptr_t ptr)
}


#define PUTS(fd, str) _Py_write_noraise(fd, str, (int)strlen(str))
#define PUTS(fd, str) (void)_Py_write_noraise(fd, str, (int)strlen(str))

static void
_PyMem_DumpFrame(int fd, frame_t * frame)
Expand Down

0 comments on commit 6541fe4

Please sign in to comment.