diff options
Diffstat (limited to 'zend/ini.cpp')
| -rw-r--r-- | zend/ini.cpp | 35 |
1 files changed, 10 insertions, 25 deletions
diff --git a/zend/ini.cpp b/zend/ini.cpp index 889e388..849f6c4 100644 --- a/zend/ini.cpp +++ b/zend/ini.cpp @@ -17,35 +17,20 @@ namespace Php { * @param zend_ini_entry *ini_entry, int module_number * @param int module_number */ -void Ini::fill(zend_ini_entry *ini_entry, int module_number) +void Ini::fill(zend_ini_entry_def *ini_entry, int module_number) { - ini_entry->module_number = module_number; - ini_entry->modifiable = static_cast<int>(this->_place); - ini_entry->name = const_cast<char*>(this->_name.c_str()); - ini_entry->name_length = this->_name.size()+1; - ini_entry->on_modify = OnUpdateString; - ini_entry->mh_arg1 = nullptr; + ini_entry->modifiable = static_cast<int>(_place); + ini_entry->name = _name.data(); + ini_entry->on_modify = OnUpdateString; + ini_entry->mh_arg1 = nullptr; #ifdef ZTS - ini_entry->mh_arg2 = (void *) &phpcpp_globals_id; + ini_entry->mh_arg2 = (void *) &phpcpp_globals_id; #else - ini_entry->mh_arg2 = (void *) &phpcpp_globals; + ini_entry->mh_arg2 = (void *) &phpcpp_globals; #endif - ini_entry->mh_arg3 = nullptr; - ini_entry->value = const_cast<char*>(this->_value.c_str()); - ini_entry->value_length = this->_value.size(); - if( this->_orig_empty) - { - ini_entry->orig_value = nullptr; - ini_entry->orig_value_length = 0; - } - else - { - ini_entry->orig_value = const_cast<char*>(this->_orig.c_str()); - ini_entry->orig_value_length = this->_orig.size(); - } - ini_entry->orig_modifiable = 0; - ini_entry->modified = 0; - ini_entry->displayer = nullptr; + ini_entry->mh_arg3 = nullptr; + ini_entry->value = _value.data(); + ini_entry->displayer = nullptr; } |