From a11371834838a021d5465f41cece03608741399a Mon Sep 17 00:00:00 2001 From: Brett McBride Date: Sun, 28 Jan 2024 08:29:36 +1100 Subject: [PATCH] clang format (#126) * clang format * update checkout action to v4 --- .github/workflows/build.yml | 6 +++--- .github/workflows/check-style.yml | 2 +- .github/workflows/publish-php-debug-images.yml | 2 +- ext/otel_observer.c | 12 ++++++------ 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c36a84f..c998bbc 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -21,7 +21,7 @@ jobs: image: ghcr.io/open-telemetry/opentelemetry-php-instrumentation/php:${{ matrix.php }}-${{ matrix.os }}-debug steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Build run: | phpize @@ -37,7 +37,7 @@ jobs: container: image: php:8.3-cli steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Package and copy run: | @@ -103,7 +103,7 @@ jobs: continue-on-error: false steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: mkdir run: mkdir binaries - name: download-artifacts diff --git a/.github/workflows/check-style.yml b/.github/workflows/check-style.yml index c79d63c..25f2fd5 100644 --- a/.github/workflows/check-style.yml +++ b/.github/workflows/check-style.yml @@ -5,7 +5,7 @@ jobs: name: Formatting Check runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Run clang-format style check uses: jidicula/clang-format-action@v4.11.0 with: diff --git a/.github/workflows/publish-php-debug-images.yml b/.github/workflows/publish-php-debug-images.yml index 6ed750e..d7c1f90 100644 --- a/.github/workflows/publish-php-debug-images.yml +++ b/.github/workflows/publish-php-debug-images.yml @@ -22,7 +22,7 @@ jobs: steps: - name: check out the repo - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Set up Docker Buildx uses: docker/setup-buildx-action@v2 diff --git a/ext/otel_observer.c b/ext/otel_observer.c index dbbe032..f370aa4 100644 --- a/ext/otel_observer.c +++ b/ext/otel_observer.c @@ -423,12 +423,12 @@ static void observer_begin(zend_execute_data *execute_data, zend_llist *hooks) { continue; } - php_error_docref( - NULL, E_NOTICE, - "OpenTelemetry: pre hook invalid argument index " - ZEND_ULONG_FMT ", class=%s function=%s", - idx, zval_get_chars(¶ms[2]), - zval_get_chars(¶ms[3])); + php_error_docref(NULL, E_NOTICE, + "OpenTelemetry: pre hook invalid " + "argument index " ZEND_ULONG_FMT + ", class=%s function=%s", + idx, zval_get_chars(¶ms[2]), + zval_get_chars(¶ms[3])); invalid_arg_warned = true; continue; }