projects/aports·blob master · refs

56 lines · 2.1 KiB

1commit 62a62017514b7c56a88a0b3d9671b5778ab693e3
2Author: Andy Postnikov <[email protected]>
3Date: Mon Feb 16 03:18:45 2026 +0100
4
5 fix clang 21 warning
6
7diff --git a/extension/meminfo.c b/extension/meminfo.c
8index fb5ff4e..9beb8d1 100644
9--- a/meminfo.c
10+++ b/meminfo.c
11@@ -196,7 +196,7 @@ void meminfo_browse_zvals_from_symbol_table(php_stream *stream, char* frame_labe
12 HashPosition pos;
13
14 zend_string *key;
15- zend_long index;
16+ zend_ulong index;
17
18 zend_hash_internal_pointer_reset_ex(p_symbol_table, &pos);
19
20@@ -299,6 +299,8 @@ void meminfo_hash_dump(php_stream *stream, HashTable *ht, zend_bool is_object, H
21 case HASH_KEY_IS_LONG:
22 php_stream_printf(stream, " \"%ld\":\"%s\"", num_key, zval_id);
23 break;
24+ default:
25+ break;
26 }
27
28 zend_hash_move_forward_ex(ht, &pos);
29commit 86b7699f2681ddd71ad75a1ba260edf5d3623cf2
30Author: Andy Postnikov <[email protected]>
31Date: Mon Feb 16 03:27:58 2026 +0100
32
33 use ZEND_ULONG_FMT for compatibility with 32 and 64 bits
34
35diff --git a/extension/meminfo.c b/extension/meminfo.c
36index 9beb8d1..e6273af 100644
37--- a/meminfo.c
38+++ b/meminfo.c
39@@ -297,7 +297,7 @@ void meminfo_hash_dump(php_stream *stream, HashTable *ht, zend_bool is_object, H
40
41 break;
42 case HASH_KEY_IS_LONG:
43- php_stream_printf(stream, " \"%ld\":\"%s\"", num_key, zval_id);
44+ php_stream_printf(stream, " \"" ZEND_ULONG_FMT "\":\"%s\"", num_key, zval_id);
45 break;
46 default:
47 break;
48@@ -348,7 +348,7 @@ void meminfo_zval_dump(php_stream * stream, char * frame_label, zend_string * sy
49
50 php_stream_printf(stream, " \"%s\" : {\n", zval_identifier);
51 php_stream_printf(stream, " \"type\" : \"%s\",\n", zend_get_type_by_const(Z_TYPE_P(zv)));
52- php_stream_printf(stream, " \"size\" : \"%ld\",\n", meminfo_get_element_size(zv));
53+ php_stream_printf(stream, " \"size\" : \"" ZEND_ULONG_FMT "\",\n", meminfo_get_element_size(zv));
54
55 if (frame_label) {
56 zend_string * escaped_frame_label;