Skip to content

Commit 0acfe44

Browse files
committed
Convert macro to inline functions in Zend INI
1 parent 0c00186 commit 0acfe44

File tree

1 file changed

+30
-11
lines changed

1 file changed

+30
-11
lines changed

Zend/zend_ini.h

Lines changed: 30 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -138,22 +138,41 @@ END_EXTERN_C()
138138
ZEND_INI_ENTRY3_EX(name, default_value, modifiable, on_modify, (void *) XtOffsetOf(struct_type, property_name), (void *) &struct_ptr, NULL, zend_ini_boolean_displayer_cb)
139139
#endif
140140

141-
#define INI_INT(name) zend_ini_long((name), strlen(name), 0)
142-
#define INI_FLT(name) zend_ini_double((name), strlen(name), 0)
143-
#define INI_STR(name) zend_ini_string_ex((name), strlen(name), 0, NULL)
144-
#define INI_BOOL(name) ((zend_bool) INI_INT(name))
145-
146-
#define INI_ORIG_INT(name) zend_ini_long((name), strlen(name), 1)
147-
#define INI_ORIG_FLT(name) zend_ini_double((name), strlen(name), 1)
148-
#define INI_ORIG_STR(name) zend_ini_string((name), strlen(name), 1)
149-
#define INI_ORIG_BOOL(name) ((zend_bool) INI_ORIG_INT(name))
141+
static inline zend_long INI_INT(const char *name) {
142+
return zend_ini_long(name, strlen(name), 0);
143+
}
144+
static inline double INI_FLT(const char *name) {
145+
return zend_ini_double(name, strlen(name), 0);
146+
}
147+
static inline char* INI_STR(const char *name) {
148+
return zend_ini_string_ex(name, strlen(name), 0, NULL);
149+
}
150+
static inline bool INI_BOOL(const char *name) {
151+
return (bool) zend_ini_long(name, strlen(name), 0);
152+
}
153+
static inline zend_long INI_ORIG_INT(const char *name) {
154+
return zend_ini_long(name, strlen(name), 1);
155+
}
156+
static inline double INI_ORIG_FLT(const char *name) {
157+
return zend_ini_double(name, strlen(name), 1);
158+
}
159+
static inline char* INI_ORIG_STR(const char *name) {
160+
return zend_ini_string(name, strlen(name), 1);
161+
}
162+
static inline bool INI_ORIG_BOOL(const char *name) {
163+
return (bool) zend_ini_long(name, strlen(name), 1);
164+
}
150165

151166
#define REGISTER_INI_ENTRIES() zend_register_ini_entries(ini_entries, module_number)
152167
#define UNREGISTER_INI_ENTRIES() zend_unregister_ini_entries(module_number)
153168
#define DISPLAY_INI_ENTRIES() display_ini_entries(zend_module)
154169

155-
#define REGISTER_INI_DISPLAYER(name, displayer) zend_ini_register_displayer((name), strlen(name), displayer)
156-
#define REGISTER_INI_BOOLEAN(name) REGISTER_INI_DISPLAYER(name, zend_ini_boolean_displayer_cb)
170+
static inline zend_result REGISTER_INI_DISPLAYER(const char *name, void (*displayer)(zend_ini_entry *ini_entry, int type)) {
171+
return zend_ini_register_displayer(name, strlen(name), displayer);
172+
}
173+
static inline zend_result REGISTER_INI_BOOLEAN(const char *name) {
174+
return zend_ini_register_displayer(name, strlen(name), zend_ini_boolean_displayer_cb);
175+
}
157176

158177
/* Standard message handlers */
159178
BEGIN_EXTERN_C()

0 commit comments

Comments
 (0)