diff options
Diffstat (limited to 'zend/ini.cpp')
| -rw-r--r-- | zend/ini.cpp | 67 |
1 files changed, 33 insertions, 34 deletions
diff --git a/zend/ini.cpp b/zend/ini.cpp index 0c04d6a..25f081a 100644 --- a/zend/ini.cpp +++ b/zend/ini.cpp @@ -12,42 +12,41 @@ */ namespace Php { - /** - * Filling ini_entries - * @param zend_ini_entry *ini_entry, int module_number - * @param int module_number - */ - void Ini::fill(zend_ini_entry *ini_entry, int module_number) +/** + * Filling ini_entries + * @param zend_ini_entry *ini_entry, int module_number + * @param int module_number + */ +void Ini::fill(zend_ini_entry *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; + #ifdef ZTS + ini_entry->mh_arg2 = (void *) &phpcpp_globals_id; + #else + 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->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; - #ifdef ZTS - ini_entry->mh_arg2 = (void *) &phpcpp_globals_id; - #else - 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_value.c_str()); - ini_entry->orig_value_length = this->_orig_value.size(); - } - ini_entry->orig_modifiable = 0; - ini_entry->modified = 0; - ini_entry->displayer = nullptr; + 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; +} /** * End of namespace |