archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-21 01:45:16 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

- moved STR2STR, BOOL2STR and PM2STR from fpm_conf.h to fpm_conf.c (Giovanni Giacobbi)

Browse source
This commit is contained in:
Jérôme Loyet 2011-07-05 01:24:10 +00:00
parent 5bd0be8a15
commit c4d83a413c
2 changed files with 6 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

9
sapi/fpm/fpm/fpm_conf.c
View file

@ -44,6 +44,12 @@
#include "fpm_log.h" #include "fpm_log.h"
#include "zlog.h" #include "zlog.h"
#define STR2STR(a) (a ? a : "undefined")
#define BOOL2STR(a) (a ? "yes" : "no")
#define PM2STR(a) (a == PM_STYLE_STATIC ? "static" : "dynamic")
#define GO(field) offsetof(struct fpm_global_config_s, field)
#define WPO(field) offsetof(struct fpm_worker_pool_config_s, field)
static int fpm_conf_load_ini_file(char *filename TSRMLS_DC); static int fpm_conf_load_ini_file(char *filename TSRMLS_DC);
static char *fpm_conf_set_integer(zval *value, void **config, intptr_t offset); static char *fpm_conf_set_integer(zval *value, void **config, intptr_t offset);
static char *fpm_conf_set_time(zval *value, void **config, intptr_t offset); static char *fpm_conf_set_time(zval *value, void **config, intptr_t offset);
@ -60,9 +66,6 @@ static char *ini_filename = NULL;
static int ini_lineno = 0; static int ini_lineno = 0;
static char *ini_include = NULL; static char *ini_include = NULL;
#define GO(field) offsetof(struct fpm_global_config_s, field)
#define WPO(field) offsetof(struct fpm_worker_pool_config_s, field)
static struct ini_value_parser_s ini_fpm_global_options[] = { static struct ini_value_parser_s ini_fpm_global_options[] = {
{ "emergency_restart_threshold", &fpm_conf_set_integer, GO(emergency_restart_threshold) }, { "emergency_restart_threshold", &fpm_conf_set_integer, GO(emergency_restart_threshold) },
{ "emergency_restart_interval", &fpm_conf_set_time, GO(emergency_restart_interval) }, { "emergency_restart_interval", &fpm_conf_set_time, GO(emergency_restart_interval) },

4
sapi/fpm/fpm/fpm_conf.h
View file

@ -10,10 +10,6 @@
#define FPM_CONF_MAX_PONG_LENGTH 64 #define FPM_CONF_MAX_PONG_LENGTH 64
#define STR2STR(a) (a ? a : "undefined")
#define BOOL2STR(a) (a ? "yes" : "no")
#define PM2STR(a) (a == PM_STYLE_STATIC ? "static" : "dynamic")
struct key_value_s; struct key_value_s;
struct key_value_s { struct key_value_s {