Skip to content

Commit 410bdab

Browse files
committed
Fix compiler warnings in ext/intl
I don't really get why these didn't show up before.
1 parent d5ee081 commit 410bdab

File tree

4 files changed

+7
-7
lines changed

4 files changed

+7
-7
lines changed

ext/intl/breakiterator/breakiterator_iterators.cpp

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ extern "C" {
3232
}
3333

3434
static zend_class_entry *IntlPartsIterator_ce_ptr;
35-
static zend_object_handlers IntlPartsIterator_handlers;
3635

3736
/* BreakIterator's iterator */
3837

@@ -87,7 +86,8 @@ static const zend_object_iterator_funcs breakiterator_iterator_funcs = {
8786
NULL,
8887
_breakiterator_move_forward,
8988
_breakiterator_rewind,
90-
zoi_with_current_invalidate_current
89+
zoi_with_current_invalidate_current,
90+
NULL, /* get_gc */
9191
};
9292

9393
U_CFUNC zend_object_iterator *_breakiterator_get_iterator(
@@ -200,7 +200,8 @@ static const zend_object_iterator_funcs breakiterator_parts_it_funcs = {
200200
_breakiterator_parts_get_current_key,
201201
_breakiterator_parts_move_forward,
202202
_breakiterator_parts_rewind,
203-
zoi_with_current_invalidate_current
203+
zoi_with_current_invalidate_current,
204+
NULL, /* get_gc */
204205
};
205206

206207
void IntlIterator_from_BreakIterator_parts(zval *break_iter_zv,

ext/intl/breakiterator/breakiterator_methods.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,6 @@ static void _breakiter_no_args_ret_int32(
173173
int32_t (BreakIterator::*func)(),
174174
INTERNAL_FUNCTION_PARAMETERS)
175175
{
176-
char *msg;
177176
BREAKITER_METHOD_INIT_VARS;
178177
object = ZEND_THIS;
179178

ext/intl/breakiterator/codepointiterator_internal.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,14 +36,14 @@ using icu::UCharCharacterIterator;
3636
UOBJECT_DEFINE_RTTI_IMPLEMENTATION(CodePointBreakIterator)
3737

3838
CodePointBreakIterator::CodePointBreakIterator()
39-
: BreakIterator(), fCharIter(NULL), lastCodePoint(U_SENTINEL)
39+
: BreakIterator(), lastCodePoint(U_SENTINEL), fCharIter(NULL)
4040
{
4141
UErrorCode uec = UErrorCode();
4242
this->fText = utext_openUChars(NULL, NULL, 0, &uec);
4343
}
4444

4545
CodePointBreakIterator::CodePointBreakIterator(const PHP::CodePointBreakIterator &other)
46-
: BreakIterator(other), fText(NULL), fCharIter(NULL), lastCodePoint(U_SENTINEL)
46+
: BreakIterator(other), fText(NULL), lastCodePoint(U_SENTINEL), fCharIter(NULL)
4747
{
4848
*this = other;
4949
}

ext/intl/calendar/gregoriancalendar_methods.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ static void _php_intlgregcal_constructor_body(
4747
INTERNAL_FUNCTION_PARAMETERS, bool is_constructor)
4848
{
4949
zval *tz_object = NULL;
50-
zval args_a[6] = {0},
50+
zval args_a[6],
5151
*args = &args_a[0];
5252
char *locale = NULL;
5353
size_t locale_len;

0 commit comments

Comments
 (0)