Merge pull request #394 from fangerer/fa/fixed-width-long_cstring-enc

Use fixed-width integers and clarify encoding of C strings.

.github/workflows/ci.yml

@@ -11,7 +11,7 @@ jobs:
     strategy:
       # Duplicate changes to this matrix to 'poc_tests'
       matrix:
-        os: [ubuntu-latest, macos-latest, windows-latest]
+        os: [ubuntu-latest, macos-11, windows-latest]
         python-version: ['3.9', '3.10']
         compiler: [""]
         include:
@@ -95,7 +95,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-latest, macos-latest, windows-latest]
+        os: [ubuntu-latest, macos-11, windows-latest]
         python-version: ['3.10']
         include:
           - os: ubuntu-latest
@@ -157,7 +157,7 @@ jobs:
     continue-on-error: true
     strategy:
       matrix:
-        os: [ubuntu-latest, macos-latest, windows-latest]
+        os: [ubuntu-latest, macos-11, windows-latest]
         python-version: ['3.9']
 
     steps:
@@ -217,7 +217,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-latest, macos-latest, windows-latest]
+        os: [ubuntu-latest, macos-11, windows-latest]
         python-version: ['3.10']
 
     steps:
@@ -343,6 +343,7 @@ jobs:
   cpp_check:
     name: Cppcheck static analysis
     runs-on: 'ubuntu-20.04'
+    continue-on-error: true
     steps:
       - uses: actions/checkout@v3
 

Makefile

@@ -32,6 +32,7 @@ cppcheck: cppcheck-build-dir
 		--inline-suppr \
 		--suppress=allocaCalled \
 		-I /usr/local/include \
+		-I /usr/include \
 		-I ${PYTHON_INC} \
 		-I hpy/devel/include/ \
 		-I hpy/devel/include/hpy/ \

hpy/debug/src/_debugmod.c

@@ -241,7 +241,7 @@ HPyDef_GET(DebugHandle_is_closed, "is_closed",
 static UHPy DebugHandle_is_closed_get(HPyContext *uctx, UHPy self, void *closure)
 {
     DebugHandleObject *dh = DebugHandleObject_AsStruct(uctx, self);
-    return HPyBool_FromLong(uctx, dh->handle->is_closed);
+    return HPyBool_FromBool(uctx, dh->handle->is_closed);
 }
 
 HPyDef_GET(DebugHandle_raw_data_size, "raw_data_size",
@@ -267,9 +267,9 @@ static UHPy DebugHandle_cmp_impl(HPyContext *uctx, UHPy self, UHPy o, HPy_RichCm
 
     switch(op) {
     case HPy_EQ:
-        return HPyBool_FromLong(uctx, dh_self->handle == dh_o->handle);
+        return HPyBool_FromBool(uctx, dh_self->handle == dh_o->handle);
     case HPy_NE:
-        return HPyBool_FromLong(uctx, dh_self->handle != dh_o->handle);
+        return HPyBool_FromBool(uctx, dh_self->handle != dh_o->handle);
     default:
         return HPy_Dup(uctx, uctx->h_NotImplemented);
     }