Merge pull request #239 from P403n1x87/chore/clean-up-old-code

chore: clean up support for old versions of Python
P403n1x87 · Oct 13, 2024 · 741d378 · 741d378
2 parents 7c42586 + af9ba26
commit 741d378
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 36 deletions.
diff --git a/src/py_thread.c b/src/py_thread.c
@@ -424,7 +424,7 @@ static inline int
 _py_thread__unwind_iframe_stack(py_thread_t * self, void * iframe_raddr) {
   int invalid = FALSE; 
   void * curr = iframe_raddr;
-  
+
   while (isvalid(curr)) {
     if (fail(_py_thread__push_iframe(self, &curr))) {
       log_d("Failed to retrieve iframe #%d", stack_pointer());
@@ -457,8 +457,6 @@ static inline int
 _py_thread__unwind_cframe_stack(py_thread_t * self) {
   PyCFrame cframe;
 
-  int invalid = FALSE;
-
   _py_thread__read_stack(self);
 
   stack_reset();
@@ -470,11 +468,7 @@ _py_thread__unwind_cframe_stack(py_thread_t * self) {
     FAIL;
   }
 
-  invalid = fail(_py_thread__unwind_iframe_stack(self, V_FIELD(void *, cframe, py_cframe, o_current_frame)));
-  if (invalid)
-    return invalid;
-
-  return invalid;
+  return fail(_py_thread__unwind_iframe_stack(self, V_FIELD(void *, cframe, py_cframe, o_current_frame)));
 }
 
 

diff --git a/src/python/string.h b/src/python/string.h
@@ -120,14 +120,4 @@ typedef struct {
     char ob_sval[1];
 } PyBytesObject;
 
-
-// ---- stringobject.h --------------------------------------------------------
-
-typedef struct {
-    PyObject_VAR_HEAD
-    long ob_shash;
-    int ob_sstate;
-    char ob_sval[1];
-} PyStringObject; /* From Python 2.7 */
-
 #endif
diff --git a/src/version.h b/src/version.h
@@ -140,16 +140,6 @@ typedef struct {
 } py_thread_v;
 
 
-typedef struct {
-  int version;
-} py_unicode_v;
-
-
-typedef struct {
-  int version;
-} py_bytes_v;
-
-
 typedef struct {
   ssize_t  size;
 
@@ -280,14 +270,6 @@ typedef struct {
   offsetof(s, _status)                  \
 }
 
-#define PY_UNICODE(n) {                 \
-  n                                     \
-}
-
-#define PY_BYTES(n) {                   \
-  n                                     \
-}
-
 #define PY_RUNTIME(s) {                 \
   sizeof(s),                            \
   offsetof(s, interpreters.head),       \