fat Tue, 05 Jul 2011 01:24:10 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=312922
Log:
- moved STR2STR, BOOL2STR and PM2STR from fpm_conf.h to fpm_conf.c (Giovanni
Giacobbi)
Changed paths:
U php/php-src/branches/PHP_5_3/sapi/fpm/fpm/fpm_conf.c
U php/php-src/branches/PHP_5_3/sapi/fpm/fpm/fpm_conf.h
U php/php-src/branches/PHP_5_4/sapi/fpm/fpm/fpm_conf.c
U php/php-src/branches/PHP_5_4/sapi/fpm/fpm/fpm_conf.h
U php/php-src/trunk/sapi/fpm/fpm/fpm_conf.c
U php/php-src/trunk/sapi/fpm/fpm/fpm_conf.h
Modified: php/php-src/branches/PHP_5_3/sapi/fpm/fpm/fpm_conf.c
===================================================================
--- php/php-src/branches/PHP_5_3/sapi/fpm/fpm/fpm_conf.c 2011-07-05
00:52:26 UTC (rev 312921)
+++ php/php-src/branches/PHP_5_3/sapi/fpm/fpm/fpm_conf.c 2011-07-05
01:24:10 UTC (rev 312922)
@@ -44,6 +44,12 @@
#include "fpm_log.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 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);
@@ -60,9 +66,6 @@
static int ini_lineno = 0;
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[] = {
{ "emergency_restart_threshold", &fpm_conf_set_integer,
GO(emergency_restart_threshold) },
{ "emergency_restart_interval", &fpm_conf_set_time,
GO(emergency_restart_interval) },
Modified: php/php-src/branches/PHP_5_3/sapi/fpm/fpm/fpm_conf.h
===================================================================
--- php/php-src/branches/PHP_5_3/sapi/fpm/fpm/fpm_conf.h 2011-07-05
00:52:26 UTC (rev 312921)
+++ php/php-src/branches/PHP_5_3/sapi/fpm/fpm/fpm_conf.h 2011-07-05
01:24:10 UTC (rev 312922)
@@ -10,10 +10,6 @@
#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 {
Modified: php/php-src/branches/PHP_5_4/sapi/fpm/fpm/fpm_conf.c
===================================================================
--- php/php-src/branches/PHP_5_4/sapi/fpm/fpm/fpm_conf.c 2011-07-05
00:52:26 UTC (rev 312921)
+++ php/php-src/branches/PHP_5_4/sapi/fpm/fpm/fpm_conf.c 2011-07-05
01:24:10 UTC (rev 312922)
@@ -44,6 +44,12 @@
#include "fpm_log.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 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);
@@ -60,9 +66,6 @@
static int ini_lineno = 0;
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[] = {
{ "emergency_restart_threshold", &fpm_conf_set_integer,
GO(emergency_restart_threshold) },
{ "emergency_restart_interval", &fpm_conf_set_time,
GO(emergency_restart_interval) },
Modified: php/php-src/branches/PHP_5_4/sapi/fpm/fpm/fpm_conf.h
===================================================================
--- php/php-src/branches/PHP_5_4/sapi/fpm/fpm/fpm_conf.h 2011-07-05
00:52:26 UTC (rev 312921)
+++ php/php-src/branches/PHP_5_4/sapi/fpm/fpm/fpm_conf.h 2011-07-05
01:24:10 UTC (rev 312922)
@@ -10,10 +10,6 @@
#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 {
Modified: php/php-src/trunk/sapi/fpm/fpm/fpm_conf.c
===================================================================
--- php/php-src/trunk/sapi/fpm/fpm/fpm_conf.c 2011-07-05 00:52:26 UTC (rev
312921)
+++ php/php-src/trunk/sapi/fpm/fpm/fpm_conf.c 2011-07-05 01:24:10 UTC (rev
312922)
@@ -44,6 +44,12 @@
#include "fpm_log.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 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);
@@ -60,9 +66,6 @@
static int ini_lineno = 0;
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[] = {
{ "emergency_restart_threshold", &fpm_conf_set_integer,
GO(emergency_restart_threshold) },
{ "emergency_restart_interval", &fpm_conf_set_time,
GO(emergency_restart_interval) },
Modified: php/php-src/trunk/sapi/fpm/fpm/fpm_conf.h
===================================================================
--- php/php-src/trunk/sapi/fpm/fpm/fpm_conf.h 2011-07-05 00:52:26 UTC (rev
312921)
+++ php/php-src/trunk/sapi/fpm/fpm/fpm_conf.h 2011-07-05 01:24:10 UTC (rev
312922)
@@ -10,10 +10,6 @@
#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 {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
