Skip to content

Fix more compiler warnings when compiling single file with -Wall #825

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 11 commits into from Jul 11, 2013
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ext/kernel/alternative/fcall.h
Original file line number Diff line number Diff line change
Expand Up @@ -27,5 +27,5 @@
#endif

extern int phalcon_alt_call_user_method(zend_class_entry *ce, zval **object_pp, char *method_name, unsigned int method_len, zval *retval_ptr, zend_uint param_count, zval *params[], unsigned long method_key TSRMLS_DC);
int phalcon_alt_call_user_method_ex(zend_class_entry *ce, zval **object_pp, char *method_name, unsigned int method_len, zval **retval_ptr_ptr, zend_uint param_count, zval **params[], unsigned long method_key TSRMLS_DC);
int phalcon_alt_call_method(zend_fcall_info *fci, zend_class_entry *ce, unsigned long hash_key, char *method_name, unsigned int method_len, unsigned long method_key TSRMLS_DC);
/*int phalcon_alt_call_user_method_ex(zend_class_entry *ce, zval **object_pp, char *method_name, unsigned int method_len, zval **retval_ptr_ptr, zend_uint param_count, zval **params[], unsigned long method_key TSRMLS_DC);*/
int phalcon_alt_call_method(zend_fcall_info *fci, zend_class_entry *ce, unsigned long hash_key, char *method_name, unsigned int method_len, unsigned long method_key TSRMLS_DC);
2 changes: 1 addition & 1 deletion ext/kernel/exception.h
Original file line number Diff line number Diff line change
Expand Up @@ -30,4 +30,4 @@ extern void phalcon_throw_exception_zval(zend_class_entry *ce, zval *message, in
extern void phalcon_throw_exception_internal(zval *exception TSRMLS_DC);

/** Catch Exceptions */
extern void phalcon_try_execute(zval *success, zval *return_value, zval *call_object, zval *params, zval **exception TSRMLS_DC);
/* extern void phalcon_try_execute(zval *success, zval *return_value, zval *call_object, zval *params, zval **exception TSRMLS_DC); */
6 changes: 3 additions & 3 deletions ext/kernel/fcall.h
Original file line number Diff line number Diff line change
Expand Up @@ -191,13 +191,13 @@ extern int phalcon_has_constructor(const zval *object TSRMLS_DC);

/** Call functions */
int phalcon_call_user_function(HashTable *function_table, zval **object_pp, zval *function_name, zval *retval_ptr, zend_uint param_count, zval *params[] TSRMLS_DC);

/** PHP < 5.3.9 has problems with closures */
#if PHP_VERSION_ID <= 50309
int phalcon_call_user_function_ex(HashTable *function_table, zval **object_pp, zval *function_name, zval **retval_ptr_ptr, zend_uint param_count, zval **params[], int no_separation, HashTable *symbol_table TSRMLS_DC);
int phalcon_call_function(zend_fcall_info *fci, zend_fcall_info_cache *fci_cache TSRMLS_DC);
int phalcon_lookup_class_ex(const char *name, int name_length, int use_autoload, zend_class_entry ***ce TSRMLS_DC);
int phalcon_lookup_class(const char *name, int name_length, zend_class_entry ***ce TSRMLS_DC);

/** PHP < 5.3.9 has problems with closures */
#if PHP_VERSION_ID <= 50309
#define PHALCON_CALL_USER_FUNCTION_EX phalcon_call_user_function_ex
#else
#define PHALCON_CALL_USER_FUNCTION_EX call_user_function_ex
Expand Down
2 changes: 1 addition & 1 deletion ext/kernel/memory.h
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ extern int PHALCON_FASTCALL phalcon_clean_restore_stack(TSRMLS_D);

/* Virtual symbol tables */
extern void phalcon_create_symbol_table(TSRMLS_D);
extern void phalcon_restore_symbol_table(TSRMLS_D);
/*extern void phalcon_restore_symbol_table(TSRMLS_D);*/
extern void phalcon_clean_symbol_tables(TSRMLS_D);

/** Export symbols to active symbol table */
Expand Down
7 changes: 7 additions & 0 deletions ext/kernel/operators.c
Original file line number Diff line number Diff line change
Expand Up @@ -341,6 +341,13 @@ int phalcon_less_long(zval *op1, long op2 TSRMLS_DC) {
return Z_BVAL(result);
}

int phalcon_less_equal_long(zval *op1, long op2 TSRMLS_DC) {
zval result, op2_zval;
ZVAL_LONG(&op2_zval, op2);
is_smaller_or_equal_function(&result, op1, &op2_zval TSRMLS_CC);
return Z_BVAL(result);
}

/**
* Check if a zval is greater than other
*/
Expand Down