@@ -79,21 +79,21 @@ get_thread_state_by_cls(PyTypeObject *cls)
7979static int
8080set_native_thread_name (const char * name )
8181{
82+ int rc ;
8283#ifdef __APPLE__
83- return pthread_setname_np (name );
84+ rc = pthread_setname_np (name );
8485#elif defined(__NetBSD__ )
8586 pthread_t thread = pthread_self ();
86- return pthread_setname_np (thread , "%s" , (void * )name );
87+ rc = pthread_setname_np (thread , "%s" , (void * )name );
8788#elif defined(HAVE_PTHREAD_SETNAME_NP )
8889 pthread_t thread = pthread_self ();
89- return pthread_setname_np (thread , name );
90+ rc = pthread_setname_np (thread , name );
9091#elif defined(HAVE_PTHREAD_SET_NAME_NP )
9192 pthread_t thread = pthread_self ();
9293 pthread_set_name_np (thread , name );
93- return 0 ; /* pthread_set_name_np() returns void */
94- #else
95- return 0 ;
94+ rc = 0 ; /* pthread_set_name_np() returns void */
9695#endif
96+ return rc ;
9797}
9898
9999// Helper to encode and truncate thread name
@@ -111,11 +111,8 @@ encode_thread_name(PyObject *name_obj, const char *encoding)
111111#ifdef _PYTHREAD_NAME_MAXLEN
112112 if (PyBytes_GET_SIZE (name_encoded ) > _PYTHREAD_NAME_MAXLEN ) {
113113 PyObject * truncated = PyBytes_FromStringAndSize (PyBytes_AS_STRING (name_encoded ), _PYTHREAD_NAME_MAXLEN );
114- if (truncated == NULL ) {
115- Py_DECREF (name_encoded );
116- return NULL ;
117- }
118- Py_SETREF (name_encoded , truncated );
114+ Py_DECREF (name_encoded );
115+ return truncated
119116 }
120117#endif
121118 return name_encoded ;
0 commit comments