jyapayne/swig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix redundant NULL check in php typemaps

Browse source 
Fix for clang compile error as the address of an array will never be NULL.
This commit is contained in:
William S Fulton 2016-10-15 17:52:35 +01:00
commit 08a98437d0
1 changed files with 12 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

18
Lib/php/globalvar.i
View file

@ -4,8 +4,7 @@
* Global variables - add the variable to PHP * Global variables - add the variable to PHP
* ----------------------------------------------------------------------------- */ * ----------------------------------------------------------------------------- */
%typemap(varinit) char *, %typemap(varinit) char *
char []
{ {
zval *z_var; zval *z_var;
MAKE_STD_ZVAL(z_var); MAKE_STD_ZVAL(z_var);
@ -20,6 +19,16 @@
zend_hash_add(&EG(symbol_table), (char*)"$1", sizeof("$1"), (void *)&z_var, sizeof(zval *), NULL); zend_hash_add(&EG(symbol_table), (char*)"$1", sizeof("$1"), (void *)&z_var, sizeof(zval *), NULL);
} }
%typemap(varinit) char []
{
zval *z_var;
MAKE_STD_ZVAL(z_var);
z_var->type = IS_STRING;
z_var->value.str.val = estrdup($1);
z_var->value.str.len = strlen($1);
zend_hash_add(&EG(symbol_table), (char*)"$1", sizeof("$1"), (void *)&z_var, sizeof(zval *), NULL);
}
%typemap(varinit) int, %typemap(varinit) int,
unsigned int, unsigned int,
unsigned short, unsigned short,
@ -95,10 +104,7 @@
zval *z_var; zval *z_var;
MAKE_STD_ZVAL(z_var); MAKE_STD_ZVAL(z_var);
z_var->type = IS_STRING; z_var->type = IS_STRING;
if ($1) { ZVAL_STRINGL(z_var,(char*)$1, $1_dim0, 1);
/* varinit char [ANY] */
ZVAL_STRINGL(z_var,(char*)$1, $1_dim0, 1);
}
zend_hash_add(&EG(symbol_table), (char*)"$1", sizeof("$1"), (void*)&z_var, sizeof(zval *), NULL); zend_hash_add(&EG(symbol_table), (char*)"$1", sizeof("$1"), (void*)&z_var, sizeof(zval *), NULL);
} }