Ignore _Py_write_noraise() result: cast to (void) (#108291) · python/cpython@6541fe4 · GitHub

python / cpython Public

• Notifications You must be signed in to change notification settings
• Fork 36.1k
• Star 77.2k

• Code
• Issues 5k+
• Pull requests 2.7k
• Actions
• Projects
• Security and quality
• Insights

Additional navigation options

Commit 6541fe4

Browse filesBrowse the repository at this point in the historyBrowse files

vstinner

authored

Ignore _Py_write_noraise() result: cast to (void) (#108291)

Code using _Py_write_noraise() usually cannot report. Ignore errors is the least surprising behavior for users.

1 parent a541e01 commit 6541fe4
Copy full SHA for 6541fe4

4 files changed

+9-9Lines changed: 9 additions & 9 deletions

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

• Modules
  • faulthandler.c
• Python
  • pylifecycle.c
  • traceback.c
  • tracemalloc.c

Expand file treeCollapse file tree

Open diff view settings

Collapse file

‎Modules/faulthandler.c‎

Copy file name to clipboardExpand all lines: Modules/faulthandler.c

+2-2Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
@@ -26,7 +26,7 @@
26	26	/* Allocate at maximum 100 MiB of the stack to raise the stack overflow */
27	27	#define STACK_OVERFLOW_MAX_SIZE (100 * 1024 * 1024)
28	28
29		- #define PUTS(fd, str) _Py_write_noraise(fd, str, strlen(str))
	29	+ #define PUTS(fd, str) (void)_Py_write_noraise(fd, str, strlen(str))
30	30
31	31
32	32	// clang uses __attribute__((no_sanitize("undefined")))
@@ -576,7 +576,7 @@ faulthandler_thread(void *unused)
576	576	/* Timeout => dump traceback */
577	577	assert(st == PY_LOCK_FAILURE);
578	578
579		- _Py_write_noraise(thread.fd, thread.header, (int)thread.header_len);
	579	+ (void)_Py_write_noraise(thread.fd, thread.header, (int)thread.header_len);
580	580
581	581	errmsg = _Py_DumpTracebackThreads(thread.fd, thread.interp, NULL);
582	582	ok = (errmsg == NULL);

Collapse file

‎Python/pylifecycle.c‎

Copy file name to clipboardExpand all lines: Python/pylifecycle.c

+1-1Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
@@ -57,7 +57,7 @@
57	57	# undef BYTE
58	58	#endif
59	59
60		- #define PUTS(fd, str) _Py_write_noraise(fd, str, (int)strlen(str))
	60	+ #define PUTS(fd, str) (void)_Py_write_noraise(fd, str, (int)strlen(str))
61	61
62	62
63	63	#ifdef __cplusplus

Collapse file

‎Python/traceback.c‎

Copy file name to clipboardExpand all lines: Python/traceback.c

+5-5Lines changed: 5 additions & 5 deletions

Original file line number	Diff line number	Diff line change
@@ -25,7 +25,7 @@
25	25
26	26	#define OFF(x) offsetof(PyTracebackObject, x)
27	27
28		- #define PUTS(fd, str) _Py_write_noraise(fd, str, (int)strlen(str))
	28	+ #define PUTS(fd, str) (void)_Py_write_noraise(fd, str, (int)strlen(str))
29	29	#define MAX_STRING_LENGTH 500
30	30	#define MAX_FRAME_DEPTH 100
31	31	#define MAX_NTHREADS 100
@@ -1047,7 +1047,7 @@ _Py_DumpDecimal(int fd, size_t value)
1047	1047	value /= 10;
1048	1048	} while (value);
1049	1049
1050		- _Py_write_noraise(fd, ptr, end - ptr);
	1050	+ (void)_Py_write_noraise(fd, ptr, end - ptr);
1051	1051	}
1052	1052
1053	1053	/* Format an integer as hexadecimal with width digits into fd file descriptor.
@@ -1072,7 +1072,7 @@ _Py_DumpHexadecimal(int fd, uintptr_t value, Py_ssize_t width)
1072	1072	value >>= 4;
1073	1073	} while ((end - ptr) < width || value);
1074	1074
1075		- _Py_write_noraise(fd, ptr, end - ptr);
	1075	+ (void)_Py_write_noraise(fd, ptr, end - ptr);
1076	1076	}
1077	1077
1078	1078	void
@@ -1125,7 +1125,7 @@ _Py_DumpASCII(int fd, PyObject *text)
1125	1125	}
1126	1126	if (!need_escape) {
1127	1127	// The string can be written with a single write() syscall
1128		- _Py_write_noraise(fd, str, size);
	1128	+ (void)_Py_write_noraise(fd, str, size);
1129	1129	goto done;
1130	1130	}
1131	1131	}
@@ -1135,7 +1135,7 @@ _Py_DumpASCII(int fd, PyObject *text)
1135	1135	if (' ' <= ch && ch <= 126) {
1136	1136	/* printable ASCII character */
1137	1137	char c = (char)ch;
1138		- _Py_write_noraise(fd, &c, 1);
	1138	+ (void)_Py_write_noraise(fd, &c, 1);
1139	1139	}
1140	1140	else if (ch <= 0xff) {
1141	1141	PUTS(fd, "\\x");

Collapse file

‎Python/tracemalloc.c‎

Copy file name to clipboardExpand all lines: Python/tracemalloc.c

+1-1Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
@@ -1247,7 +1247,7 @@ tracemalloc_get_traceback(unsigned int domain, uintptr_t ptr)
1247	1247	}
1248	1248
1249	1249
1250		- #define PUTS(fd, str) _Py_write_noraise(fd, str, (int)strlen(str))
	1250	+ #define PUTS(fd, str) (void)_Py_write_noraise(fd, str, (int)strlen(str))
1251	1251
1252	1252	static void
1253	1253	_PyMem_DumpFrame(int fd, frame_t * frame)

0 commit comments

Comments

0 (0)