Fix typo on INFINITY (#51)

rizinorg · Feb 24, 2024 · 0f966e3 · 0f966e3
1 parent ae4b7b8
commit 0f966e3
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 22 deletions.
diff --git a/.ci-scripts/ci-build-linux.sh b/.ci-scripts/ci-build-linux.sh
@@ -17,7 +17,7 @@ wget -O "rizin.tar.xz" "https://github.com/rizinorg/rizin/releases/download/$CI_
 tar xf "rizin.tar.xz"
 cd "rizin-$CI_RZ_VERSION"
 
-meson --buildtype=release -Denable_tests=false build
+meson setup --buildtype=release -Denable_tests=false build
 sudo ninja -C build install
 
 # cleanup
@@ -28,8 +28,8 @@ rm -rf "rizin-*"
 cd "$CI_JSDEC"
 
 # build jsdec and install in the rizin dir.
-meson --buildtype=release -Dstandalone=false build
-sudo ninja -v -C build install
+meson setup --buildtype=release -Dstandalone=false build
+sudo ninja -C build install
 
 # check if it was installed correctly and try to run it.
 HAS_JSDEC=$(rizin -Qc "Lc" | grep jsdec)
@@ -43,5 +43,6 @@ OUTPUT=$(rizin -Qc 'af ; pdd' /bin/ls)
 CHECK=$(echo -e "$OUTPUT" | grep "jsdec pseudo code output")
 echo -e "$OUTPUT"
 if [ -z "$CHECK" ]; then
+	echo "rizin failed to exec jsdec."
 	exit 1
 fi
diff --git a/.github/workflows/build-plugin.yml b/.github/workflows/build-plugin.yml
@@ -17,7 +17,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout commit
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Install dependencies
         run: sudo apt -y install meson ninja-build
       - name: Build & run the plugin
@@ -33,8 +33,8 @@ jobs:
           - "windows-static"
           - "windows-shared64"
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-python@v4
+      - uses: actions/checkout@v4
+      - uses: actions/setup-python@v5
         with:
           python-version: 3.9.x
       - name: Preparing msvc toolchain

diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
@@ -24,18 +24,18 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@v2
+        uses: github/codeql-action/init@v3
         with:
           languages: ${{ matrix.language }}
           queries: +security-and-quality
 
       - name: Autobuild
-        uses: github/codeql-action/autobuild@v2
+        uses: github/codeql-action/autobuild@v3
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@v2
+        uses: github/codeql-action/analyze@v3
         with:
           category: "/language:${{ matrix.language }}"
diff --git a/.github/workflows/continuous-tests.yml b/.github/workflows/continuous-tests.yml
@@ -11,8 +11,8 @@ jobs:
     name: eslint
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-node@v3
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
         with:
           node-version: "16"
       - name: eslint
@@ -22,15 +22,15 @@ jobs:
     name: tests
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: tests
         run: chmod +x .ci-scripts/ci-tests.sh && .ci-scripts/ci-tests.sh "${{ github.ref_name }}"
 
   licenses:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Reuse Compliance Check
         uses: fsfe/reuse-action@v2
         with:

diff --git a/c/jsdec-plugin.c b/c/jsdec-plugin.c
@@ -77,20 +77,15 @@ static JSValue js_analysis_bytes(JSContext *ctx, RzCore *core, RzAnalysisBytes *
 
 static JSValue js_analysis_opcodes(JSContext *ctx, RzCore *core) {
 	RzAnalysisBytes *ab;
-	void **it;
 	JSValue ops = JS_NewArray(ctx);
 	st64 op_idx = 0;
 
 	RzIterator *iter = rz_core_analysis_bytes(core, core->offset, core->block, core->blocksize, 0);
 	if (!iter) {
 		return ops;
 	}
-	rz_iterator_foreach (iter, it) {
-		if (!it || !*it) {
-			continue;
-		}
-		ab = *it;
-		if (!ab->op || !strcmp(ab->opcode, "nop")) {
+	rz_iterator_foreach (iter, ab) {
+		if (!ab || !ab->op || !strcmp(ab->opcode, "nop")) {
 			continue;
 		}
 		JSValue op = js_analysis_bytes(ctx, core, ab);

diff --git a/subprojects/packagefiles/libquickjs/quickjs.h b/subprojects/packagefiles/libquickjs/quickjs.h
@@ -75,7 +75,7 @@ typedef struct JSRefCountHeader {
 } JSRefCountHeader;
 
 
-#ifndef INFINITE
+#ifndef INFINITY
 #include <float.h>
 #define INFINITY (DBL_MAX + DBL_MAX)
 #endif