From: Michael Wallner Date: Tue, 28 Dec 2021 08:20:54 +0000 (+0100) Subject: fix warnings X-Git-Tag: v0.1.0~53 X-Git-Url: https://git.m6w6.name/?p=awesomized%2Fext-ion;a=commitdiff_plain;h=0bdc454d580febf0021b4fed5754fecfea1a7172 fix warnings --- diff --git a/ion.c b/ion.c index e8fa657..81231d6 100644 --- a/ion.c +++ b/ion.c @@ -25,7 +25,6 @@ #include "ext/date/php_date.h" #include "ext/spl/spl_exceptions.h" -#include "ext/spl/spl_iterators.h" #include "php_ion.h" #include "ion_private.h" @@ -41,7 +40,7 @@ static ZEND_METHOD(ion_Symbol_ImportLocation, __construct) Z_PARAM_LONG(location) ZEND_PARSE_PARAMETERS_END(); - obj->loc.location = location; + obj->loc.location = (SID) location; php_ion_symbol_iloc_ctor(obj); } static ZEND_METHOD(ion_Symbol, __construct) @@ -57,7 +56,7 @@ static ZEND_METHOD(ion_Symbol, __construct) Z_PARAM_OBJ_OF_CLASS_OR_NULL(obj->iloc, ce_Symbol_ImportLocation) ZEND_PARSE_PARAMETERS_END(); - obj->sym.sid = sid; + obj->sym.sid = (SID) sid; php_ion_symbol_ctor(obj); } static ZEND_METHOD(ion_Symbol, equals) @@ -457,7 +456,7 @@ static ZEND_METHOD(ion_Decimal_Context, __construct) if (o_round) { round = Z_LVAL_P(zend_enum_fetch_case_value(o_round)); } - php_ion_decimal_ctx_init(&obj->ctx, digits, emax, emin, round, clamp); + php_ion_decimal_ctx_init(&obj->ctx, digits, emax, emin, round, clamp); // NOLINT(cppcoreguidelines-narrowing-conversions) php_ion_decimal_ctx_ctor(obj, o_round); } static inline void make_decimal_ctx(INTERNAL_FUNCTION_PARAMETERS, int kind) @@ -654,23 +653,23 @@ static ZEND_METHOD(ion_Reader_Options, __construct) zend_update_property_bool(opt->std.ce, &opt->std, ZEND_STRL("returnSystemValues"), opt->opt.return_system_values = ret_sys_val); zend_update_property_long(opt->std.ce, &opt->std, ZEND_STRL("newLine"), - opt->opt.new_line_char = ch_nl); + opt->opt.new_line_char = (int) ch_nl); zend_update_property_long(opt->std.ce, &opt->std, ZEND_STRL("maxContainerDepth"), - opt->opt.max_container_depth = max_depth); + opt->opt.max_container_depth = (SIZE) max_depth); zend_update_property_long(opt->std.ce, &opt->std, ZEND_STRL("maxAnnotations"), - opt->opt.max_annotation_count = max_ann); + opt->opt.max_annotation_count = (SIZE) max_ann); zend_update_property_long(opt->std.ce, &opt->std, ZEND_STRL("maxAnnotationBuffered"), - opt->opt.max_annotation_buffered = max_ann_buf); + opt->opt.max_annotation_buffered = (SIZE) max_ann_buf); zend_update_property_long(opt->std.ce, &opt->std, ZEND_STRL("symbolThreshold"), - opt->opt.symbol_threshold = sym_thr); + opt->opt.symbol_threshold = (SIZE) sym_thr); zend_update_property_long(opt->std.ce, &opt->std, ZEND_STRL("userValueThreshold"), - opt->opt.user_value_threshold = uval_thr); + opt->opt.user_value_threshold = (SIZE) uval_thr); zend_update_property_long(opt->std.ce, &opt->std, ZEND_STRL("chunkThreshold"), - opt->opt.chunk_threshold = chunk_thr); + opt->opt.chunk_threshold = (SIZE) chunk_thr); zend_update_property_long(opt->std.ce, &opt->std, ZEND_STRL("allocationPageSize"), - opt->opt.allocation_page_size = alloc_pgsz); + opt->opt.allocation_page_size = (SIZE) alloc_pgsz); zend_update_property_long(opt->std.ce, &opt->std, ZEND_STRL("skipCharacterValidation"), - opt->opt.skip_character_validation = skip_validation); + opt->opt.skip_character_validation = (SIZE) skip_validation); } static ZEND_METHOD(ion_Reader_Reader, hasChildren) { @@ -1275,7 +1274,7 @@ static ZEND_METHOD(ion_Writer_Options, __construct) zend_update_property_bool(obj->std.ce, &obj->std, ZEND_STRL("indentTabs"), obj->opt.indent_with_tabs = tabs); zend_update_property_long(obj->std.ce, &obj->std, ZEND_STRL("indentSize"), - obj->opt.indent_size = indent); + obj->opt.indent_size = (SIZE) indent); zend_update_property_bool(obj->std.ce, &obj->std, ZEND_STRL("smallContainersInline"), obj->opt.small_containers_in_line = small_cntr_inl); zend_update_property_bool(obj->std.ce, &obj->std, ZEND_STRL("suppressSystemValues"), @@ -1283,13 +1282,13 @@ static ZEND_METHOD(ion_Writer_Options, __construct) zend_update_property_bool(obj->std.ce, &obj->std, ZEND_STRL("flushEveryValue"), obj->opt.flush_every_value = flush); zend_update_property_long(obj->std.ce, &obj->std, ZEND_STRL("maxContainerDepth"), - obj->opt.max_container_depth = max_depth); + obj->opt.max_container_depth = (SIZE) max_depth); zend_update_property_long(obj->std.ce, &obj->std, ZEND_STRL("maxAnnotations"), - obj->opt.max_annotation_count = max_ann); + obj->opt.max_annotation_count = (SIZE) max_ann); zend_update_property_long(obj->std.ce, &obj->std, ZEND_STRL("tempBufferSize"), - obj->opt.temp_buffer_size = temp); + obj->opt.temp_buffer_size = (SIZE) temp); zend_update_property_long(obj->std.ce, &obj->std, ZEND_STRL("allocationPageSize"), - obj->opt.allocation_page_size = alloc); + obj->opt.allocation_page_size = (SIZE) alloc); } static ZEND_METHOD(ion_Writer_Writer, writeNull) { @@ -1774,9 +1773,12 @@ PHP_RSHUTDOWN_FUNCTION(ion) } #define ZEND_ARG_VARIADIC_OBJ_TYPE_MASK(pass_by_ref, name, classname, type_mask, default_value) \ - { #name, ZEND_TYPE_INIT_CLASS_CONST_MASK(#classname, type_mask | _ZEND_ARG_INFO_FLAGS(pass_by_ref, 1, 0)), default_value }, + { #name, ZEND_TYPE_INIT_CLASS_CONST_MASK(#classname, ((type_mask) | _ZEND_ARG_INFO_FLAGS(pass_by_ref, 1, 0))), default_value }, #include "ion_arginfo.h" +// spl_iterators.h includes ext/pcre/php_pcre.h which might not find pcre2.h +extern PHPAPI zend_class_entry *spl_ce_RecursiveIterator; + PHP_MINIT_FUNCTION(ion) { // true globals diff --git a/ion_private.h b/ion_private.h index 50658e7..57aaa6f 100644 --- a/ion_private.h +++ b/ion_private.h @@ -358,7 +358,7 @@ static inline void php_ion_globals_unserializer_dtor(void) } while (0) #define php_ion_obj(type, obj) \ - ((php_ion_ ## type *) (obj ? ((char *)(obj) - XtOffsetOf(php_ion_ ## type, std)) : NULL)) + ((php_ion_ ## type *) ((obj) ? ((char *)(obj) - XtOffsetOf(php_ion_ ## type, std)) : NULL)) #define ION_CHECK_RETURN(r, err, ...) do { \ iERR __err = err; \ @@ -396,7 +396,7 @@ static inline void php_ion_globals_unserializer_dtor(void) static inline ION_STRING *ion_string_from_zend(ION_STRING *is, const zend_string *zs) { - is->length = zs ? zs->len : 0; + is->length = zs ? (SIZE) zs->len : 0; is->value = (BYTE *) (zs ? zs->val : NULL); return is; } @@ -639,7 +639,7 @@ typedef struct php_ion_decimal_ctx { #define php_ion_decimal_ctx_init_max(c, rounding) \ php_ion_decimal_ctx_init((c), DEC_MAX_DIGITS, DEC_MAX_EMAX, DEC_MIN_EMIN, (rounding), false) static inline void php_ion_decimal_ctx_init(decContext *ctx, - zend_long digits, zend_long emax, zend_long emin, zend_long round, zend_bool clamp) + int digits, int emax, int emin, enum rounding round, zend_bool clamp) { memset(ctx, 0, sizeof(*ctx)); ctx->digits = digits; @@ -771,7 +771,7 @@ static inline zend_long php_usec_from_ion(const decQuad *frac, decContext *ctx) return (zend_long) decQuadToUInt32(&result, ctx, DEC_ROUND_HALF_EVEN); } -static inline decQuad *ion_ts_frac_from_usec(decQuad *frac, zend_long usec, decContext *ctx) +static inline decQuad *ion_ts_frac_from_usec(decQuad *frac, int usec, decContext *ctx) { if (!ctx) { ctx = &php_ion_globals.decimal.ctx; @@ -780,7 +780,7 @@ static inline decQuad *ion_ts_frac_from_usec(decQuad *frac, zend_long usec, decC return decQuadDivide(frac, decQuadFromInt32(&us, usec), decQuadFromInt32(µsecs, 1000000), ctx); } -static inline zend_string *php_dt_format_from_precision(int precision) +static inline zend_string *php_dt_format_from_precision(uint8_t precision) { switch (precision & 0x7f) { case ION_TS_FRAC: @@ -802,7 +802,7 @@ static inline zend_string *php_dt_format_from_precision(int precision) static inline timelib_time* php_time_from_ion(const ION_TIMESTAMP *ts, decContext *ctx, zend_string **fmt) { - timelib_time *time = timelib_time_ctor(); + timelib_time *time = ecalloc(1, sizeof(*time)); int precision = ION_TS_FRAC; ion_timestamp_get_precision(ts, &precision); @@ -854,7 +854,7 @@ static inline ION_TIMESTAMP *ion_timestamp_from_php(ION_TIMESTAMP *buf, php_ion_ "Invalid precision (%d) of ion\\Timestamp", precision); } else switch ((buf->precision = precision)) { case ION_TS_FRAC: - ion_ts_frac_from_usec(&buf->fraction, ts->time->us, ctx); + ion_ts_frac_from_usec(&buf->fraction, (int) ts->time->us, ctx); /* fallthrough */ case ION_TS_SEC: buf->seconds = ts->time->s; @@ -873,7 +873,7 @@ static inline ION_TIMESTAMP *ion_timestamp_from_php(ION_TIMESTAMP *buf, php_ion_ buf->year = ts->time->y; /* fallthrough */ default: - buf->tz_offset = ts->time->z / 60; + buf->tz_offset = (short) (ts->time->z / 60); if (buf->tz_offset) { buf->precision |= 0x80; } @@ -1095,9 +1095,7 @@ static inline void php_ion_reader_ctor(php_ion_reader *obj) err = ion_reader_open_stream(&obj->reader, obj, php_ion_reader_stream_handler, opt ? &opt->opt : NULL); } else { - err = ion_reader_open_buffer(&obj->reader, - (BYTE *) obj->buffer->val, obj->buffer->len, - opt ? &opt->opt : NULL); + err = ion_reader_open_buffer(&obj->reader, (BYTE *) obj->buffer->val, (SIZE) obj->buffer->len, opt ? &opt->opt : NULL); } ION_CHECK(err); @@ -1408,11 +1406,11 @@ static inline void php_ion_serialize_struct(php_ion_serializer *ser, zend_array prop_name = k->val; prop_len = k->len; } - ion_string_assign_cstr(&is, (char *) prop_name, prop_len); + ion_string_assign_cstr(&is, (char *) prop_name, (SIZE) prop_len); } else { char *end = buf + sizeof(buf) - 1; char *ptr = zend_print_long_to_buf(end, (zend_long) h); - ion_string_assign_cstr(&is, ptr, end - ptr); + ion_string_assign_cstr(&is, ptr, (SIZE) (end - ptr)); } // WATCH OUT: field names need to be copied @@ -1547,15 +1545,16 @@ static inline bool can_call_magic_serialize(php_ion_serializer *ser, zend_class_ return ce->__serialize && ser->call_magic; } -static inline bool can_call_iface_serialize(php_ion_serializer *, zend_class_entry *ce) +static inline bool can_call_iface_serialize(php_ion_serializer *ser, zend_class_entry *ce) { - return !!ce->serialize; + (void) ser; + return !!ce->serialize; // NOLINT } static inline bool can_call_custom_serialize(php_ion_serializer *ser, zend_object *zobject, zend_function **fn) { if (ser->call_custom) { - return !!(*fn = zend_hash_find_ptr(&zobject->ce->function_table, ser->call_custom)); + return !!(*fn = zend_hash_find_ptr(&zobject->ce->function_table, ser->call_custom)); // NOLINT } return false; } @@ -1818,7 +1817,7 @@ static inline bool can_call_iface_unserialize(php_ion_unserializer *ser, zend_cl static inline bool can_call_custom_unserialize(php_ion_unserializer *ser, zend_object *zobject, zend_function **fn) { if (ser->call_custom) { - return !!(*fn = zend_hash_find_ptr(&zobject->ce->function_table, ser->call_custom)); + return !!(*fn = zend_hash_find_ptr(&zobject->ce->function_table, ser->call_custom)); // NOLINT } return false; } @@ -2104,7 +2103,7 @@ static inline void php_ion_reader_read_lob(ION_READER *reader, zval *return_valu zend_string *zstr = zend_string_alloc(0x1000, 0); again: ; SIZE read = 0; - iERR err = ion_reader_read_lob_bytes(reader, (BYTE *) zstr->val, zstr->len, &read); + iERR err = ion_reader_read_lob_bytes(reader, (BYTE *) zstr->val, (SIZE) zstr->len, &read); if (err == IERR_BUFFER_TOO_SMALL) { zstr = zend_string_extend(zstr, zstr->len << 2, 0); goto again; @@ -2174,7 +2173,7 @@ static inline void php_ion_unserialize_backref(php_ion_unserializer *ser, zval * zend_hash_next_index_insert(ser->addref, return_value); } else { zend_throw_exception_ex(spl_ce_RuntimeException, IERR_INTERNAL_ERROR, - "Could not find back reference %ld", Z_LVAL_P(return_value)); + "Could not find back reference " ZEND_LONG_FMT, Z_LVAL_P(return_value)); } } @@ -2272,7 +2271,7 @@ static inline void php_ion_unserialize_annotations(php_ion_unserializer *ser) static inline void php_ion_unserialize_zval(php_ion_unserializer *ser, zval *return_value, ION_TYPE *typ) { if (typ) { - memcpy(&ser->type, typ, sizeof(ser->type)); + memcpy(&ser->type, typ, sizeof(ser->type)); // NOLINT } else { typ = &ser->type; ION_CHECK(ion_reader_next(ser->reader, typ));