wellton/hhvm
1
0
Fork 0
Código Issues Pull Requests Ações Pacotes Projetos Versões Wiki Atividade

Fix up style of StaticString declarations.

Ver Código-Fonte 
At the top level of a file, "const" is the same as "static const",
and reduce the stuttering.
Esse commit está contido em:
Edwin Smith
2013-06-19 17:48:07 -07:00
commit de Sara Golemon
pai c56c17e1d1
commit 5ec269bf85
54 arquivos alterados com 467 adições e 415 exclusões
Baixar Arquivo de Patch Baixar Arquivo de Diff Expandir todos os arquivos Colapsar todos os arquivos
hphp/runtime/base/array/array_data.cpp
+3 -2
Ver Arquivo
@@ -371,8 +371,9 @@ Variant ArrayData::current() const {
return false;
}
static const StaticString s_value("value");
static const StaticString s_key("key");
const StaticString
s_value("value"),
s_key("key");
Variant ArrayData::each() {
if (size_t(m_pos) < size_t(size())) {
hphp/runtime/base/array/array_util.cpp
+1 -1
Ver Arquivo
@@ -295,7 +295,7 @@ Variant ArrayUtil::Range(double low, double high, int64_t step /* = 1 */) {
return ret;
}
static const StaticString s_default("(default)");
const StaticString s_default("(default)");
Variant ArrayUtil::FromHdf(const Hdf &hdf) {
if (hdf.firstChild().exists()) {
hphp/runtime/base/array/policy_array.cpp
+4 -2
Ver Arquivo
@@ -303,8 +303,10 @@ Variant PolicyArray::value(int32_t &pos) const {
return Variant(Store::val(toPos(pos)));
}
static const StaticString s_value("value");
static const StaticString s_key("key");
const StaticString
s_value("value"),
s_key("key");
static_assert(ArrayData::invalid_index == size_t(-1), "ehm");
Variant PolicyArray::each() {
hphp/runtime/base/execution_context.cpp
+6 -5
Ver Arquivo
@@ -356,11 +356,12 @@ int BaseExecutionContext::obGetLevel() {
return m_buffers.size() - m_protectedLevel;
}
static const StaticString s_level("level");
static const StaticString s_type("type");
static const StaticString s_name("name");
static const StaticString s_args("args");
static const StaticString s_default_output_handler("default output handler");
const StaticString
s_level("level"),
s_type("type"),
s_name("name"),
s_args("args"),
s_default_output_handler("default output handler");
Array BaseExecutionContext::obGetStatus(bool full) {
Array ret = Array::Create();
hphp/runtime/base/file/bzip2_file.cpp
+3 -2
Ver Arquivo
@@ -63,8 +63,9 @@ String BZ2File::errstr() {
return BZ2_bzerror(m_bzFile, &errnum);
}
static const StaticString s_errno("errno");
static const StaticString s_errstr("errstr");
const StaticString
s_errno("errno"),
s_errstr("errstr");
Variant BZ2File::error() {
assert(m_bzFile);
hphp/runtime/base/file/file.cpp
+11 -10
Ver Arquivo
@@ -306,16 +306,17 @@ bool File::lock(int operation, bool &wouldblock /* = false */) {
return true;
}
static const StaticString s_wrapper_type("wrapper_type");
static const StaticString s_stream_type("stream_type");
static const StaticString s_mode("mode");
static const StaticString s_unread_bytes("unread_bytes");
static const StaticString s_seekable("seekable");
static const StaticString s_uri("uri");
static const StaticString s_timed_out("timed_out");
static const StaticString s_blocked("blocked");
static const StaticString s_eof("eof");
static const StaticString s_wrapper_data("wrapper_data");
const StaticString
s_wrapper_type("wrapper_type"),
s_stream_type("stream_type"),
s_mode("mode"),
s_unread_bytes("unread_bytes"),
s_seekable("seekable"),
s_uri("uri"),
s_timed_out("timed_out"),
s_blocked("blocked"),
s_eof("eof"),
s_wrapper_data("wrapper_data");
Array File::getMetaData() {
ArrayInit ret(10);
hphp/runtime/base/file/http_stream_wrapper.cpp
+8 -7
Ver Arquivo
@@ -24,13 +24,14 @@
namespace HPHP {
///////////////////////////////////////////////////////////////////////////////
static const StaticString s_GET("GET");
static const StaticString s_method("method");
static const StaticString s_http("http");
static const StaticString s_header("header");
static const StaticString s_max_redirects("max_redirects");
static const StaticString s_timeout("timeout");
static const StaticString s_content("content");
const StaticString
s_GET("GET"),
s_method("method"),
s_http("http"),
s_header("header"),
s_max_redirects("max_redirects"),
s_timeout("timeout"),
s_content("content");
File* HttpStreamWrapper::open(CStrRef filename, CStrRef mode,
int options, CVarRef context) {
hphp/runtime/base/file/socket.cpp
+3 -2
Ver Arquivo
@@ -200,8 +200,9 @@ bool Socket::eof() {
return m_eof;
}
static const StaticString s_timed_out("timed_out");
static const StaticString s_blocked("blocked");
const StaticString
s_timed_out("timed_out"),
s_blocked("blocked");
Array Socket::getMetaData() {
Array ret = File::getMetaData();
hphp/runtime/base/file/ssl_socket.cpp
+16 -13
Ver Arquivo
@@ -42,8 +42,9 @@ int SSLSocket::GetSSLExDataIndex() {
return s_ex_data_index;
}
static const StaticString s_allow_self_signed("allow_self_signed");
static const StaticString s_verify_depth("verify_depth");
const StaticString
s_allow_self_signed("allow_self_signed"),
s_verify_depth("verify_depth");
static int verify_callback(int preverify_ok, X509_STORE_CTX *ctx) {
int ret = preverify_ok;
@@ -75,7 +76,7 @@ static int verify_callback(int preverify_ok, X509_STORE_CTX *ctx) {
return ret;
}
static const StaticString s_passphrase("passphrase");
const StaticString s_passphrase("passphrase");
static int passwd_callback(char *buf, int num, int verify, void *data) {
/* TODO: could expand this to make a callback into PHP user-space */
@@ -88,11 +89,12 @@ static int passwd_callback(char *buf, int num, int verify, void *data) {
return 0;
}
static const StaticString s_verify_peer("verify_peer");
static const StaticString s_cafile("cafile");
static const StaticString s_capath("capath");
static const StaticString s_ciphers("ciphers");
static const StaticString s_local_cert("local_cert");
const StaticString
s_verify_peer("verify_peer"),
s_cafile("cafile"),
s_capath("capath"),
s_ciphers("ciphers"),
s_local_cert("local_cert");
SSL *SSLSocket::createSSL(SSL_CTX *ctx) {
ERR_clear_error();
@@ -439,7 +441,7 @@ bool SSLSocket::setupCrypto(SSLSocket *session /* = NULL */) {
return true;
}
static const StaticString s_CN_match("CN_match");
const StaticString s_CN_match("CN_match");
bool SSLSocket::applyVerificationPolicy(X509 *peer) {
/* verification is turned off */
@@ -508,10 +510,11 @@ bool SSLSocket::applyVerificationPolicy(X509 *peer) {
return true;
}
static const StaticString s_capture_peer_cert("capture_peer_cert");
static const StaticString s_peer_certificate("peer_certificate");
static const StaticString s_capture_peer_cert_chain("capture_peer_cert_chain");
static const StaticString s_peer_certificate_chain("peer_certificate_chain");
const StaticString
s_capture_peer_cert("capture_peer_cert"),
s_peer_certificate("peer_certificate"),
s_capture_peer_cert_chain("capture_peer_cert_chain"),
s_peer_certificate_chain("peer_certificate_chain");
bool SSLSocket::enableCrypto(bool activate /* = true */) {
if (activate && !m_ssl_active) {
hphp/runtime/base/hardware_counter.cpp
+4 -3
Ver Arquivo
@@ -389,9 +389,10 @@ void HardwareCounter::ClearPerfEvents() {
s_counter->clearPerfEvents();
}
static const StaticString s_instructions("instructions");
static const StaticString s_loads("loads");
static const StaticString s_stores("stores");
const StaticString
s_instructions("instructions"),
s_loads("loads"),
s_stores("stores");
void HardwareCounter::getPerfEvents(Array& ret) {
ret.set(s_instructions, getInstructionCount());
hphp/runtime/base/ini_setting.cpp
+1 -1
Ver Arquivo
@@ -209,7 +209,7 @@ void IniSetting::Unbind(const char *name) {
s_callbacks->erase(name);
}
static const StaticString
const StaticString
s_error_reporting("error_reporting"),
s_memory_limit("memory_limit"),
s_max_execution_time("max_execution_time"),
hphp/runtime/base/program_functions.cpp
+1 -1
Ver Arquivo
@@ -124,7 +124,7 @@ time_t start_time() {
return s_startTime.startTime;
}
static const StaticString
const StaticString
s_HPHP("HPHP"),
s_HHVM("HHVM"),
s_HHVM_JIT("HHVM_JIT"),
hphp/runtime/base/server/http_protocol.cpp
+1 -1
Ver Arquivo
@@ -72,7 +72,7 @@ const VirtualHost *HttpProtocol::GetVirtualHost(Transport *transport) {
return VirtualHost::GetCurrent();
}
static const StaticString
const StaticString
s_REQUEST_START_TIME("REQUEST_START_TIME"),
s_HPHP("HPHP"),
s_HHVM("HHVM"),
hphp/runtime/base/server/rpc_request_handler.cpp
+1 -1
Ver Arquivo
@@ -175,7 +175,7 @@ void RPCRequestHandler::handleRequest(Transport *transport) {
HttpProtocol::ClearRecord(ret, tmpfile);
}
static const StaticString
const StaticString
s_output("output"),
s_return("return"),
s_HPHP_RPC("HPHP_RPC"),
hphp/runtime/base/server/server_stats.cpp
+3 -2
Ver Arquivo
@@ -954,8 +954,9 @@ void ServerStats::StartNetworkProfile() {
}
}
static const StaticString s_ct("ct");
static const StaticString s_wt("wt");
const StaticString
s_ct("ct"),
s_wt("wt");
Array ServerStats::EndNetworkProfile() {
s_profile_network = false;
hphp/runtime/base/server/source_root_info.cpp
+3 -2
Ver Arquivo
@@ -247,8 +247,9 @@ string SourceRootInfo::path() const {
}
}
static const StaticString s_SERVER("_SERVER");
static const StaticString s_PHP_ROOT("PHP_ROOT");
const StaticString
s_SERVER("_SERVER"),
s_PHP_ROOT("PHP_ROOT");
string& SourceRootInfo::initPhpRoot() {
GlobalVariables *g = get_global_variables();
hphp/runtime/base/server/xbox_server.cpp
+1 -1
Ver Arquivo
@@ -238,7 +238,7 @@ static bool isLocalHost(CStrRef host) {
return host.empty() || host == "localhost" || host == "127.0.0.1";
}
static const StaticString
const StaticString
s_code("code"),
s_response("response"),
s_error("error");
hphp/runtime/base/time/datetime.cpp
+47 -47
Ver Arquivo
@@ -104,42 +104,43 @@ SmartObject<DateTime> DateTime::Current(bool utc /* = false */) {
return NEWOBJ(DateTime)(time(0), utc);
}
static const StaticString s_year("year");
static const StaticString s_month("month");
static const StaticString s_day("day");
static const StaticString s_hour("hour");
static const StaticString s_minute("minute");
static const StaticString s_second("second");
static const StaticString s_zone("zone");
static const StaticString s_zone_type("zone_type");
static const StaticString s_fraction("fraction");
static const StaticString s_warning_count("warning_count");
static const StaticString s_warnings("warnings");
static const StaticString s_error_count("error_count");
static const StaticString s_errors("errors");
static const StaticString s_is_localtime("is_localtime");
static const StaticString s_is_dst("is_dst");
static const StaticString s_tz_abbr("tz_abbr");
static const StaticString s_tz_id("tz_id");
static const StaticString s_weekday("weekday");
static const StaticString s_relative("relative");
static const StaticString s_tm_sec("tm_sec");
static const StaticString s_tm_min("tm_min");
static const StaticString s_tm_hour("tm_hour");
static const StaticString s_tm_mday("tm_mday");
static const StaticString s_tm_mon("tm_mon");
static const StaticString s_tm_year("tm_year");
static const StaticString s_tm_wday("tm_wday");
static const StaticString s_tm_yday("tm_yday");
static const StaticString s_tm_isdst("tm_isdst");
static const StaticString s_unparsed("unparsed");
static const StaticString s_seconds("seconds");
static const StaticString s_minutes("minutes");
static const StaticString s_hours("hours");
static const StaticString s_mday("mday");
static const StaticString s_wday("wday");
static const StaticString s_mon("mon");
static const StaticString s_yday("yday");
const StaticString
s_year("year"),
s_month("month"),
s_day("day"),
s_hour("hour"),
s_minute("minute"),
s_second("second"),
s_zone("zone"),
s_zone_type("zone_type"),
s_fraction("fraction"),
s_warning_count("warning_count"),
s_warnings("warnings"),
s_error_count("error_count"),
s_errors("errors"),
s_is_localtime("is_localtime"),
s_is_dst("is_dst"),
s_tz_abbr("tz_abbr"),
s_tz_id("tz_id"),
s_weekday("weekday"),
s_relative("relative"),
s_tm_sec("tm_sec"),
s_tm_min("tm_min"),
s_tm_hour("tm_hour"),
s_tm_mday("tm_mday"),
s_tm_mon("tm_mon"),
s_tm_year("tm_year"),
s_tm_wday("tm_wday"),
s_tm_yday("tm_yday"),
s_tm_isdst("tm_isdst"),
s_unparsed("unparsed"),
s_seconds("seconds"),
s_minutes("minutes"),
s_hours("hours"),
s_mday("mday"),
s_wday("wday"),
s_mon("mon"),
s_yday("yday");
#define PHP_DATE_PARSE_DATE_SET_TIME_ELEMENT(name, elem) \
if ((int)parsed_time->elem == -99999) { \
@@ -801,17 +802,16 @@ SmartObject<DateInterval> DateTime::diff(SmartObject<DateTime> datetime2, bool a
///////////////////////////////////////////////////////////////////////////////
// sun
static const StaticString s_sunrise("sunrise");
static const StaticString s_sunset("sunset");
static const StaticString s_transit("transit");
static const StaticString s_civil_twilight_begin("civil_twilight_begin");
static const StaticString s_civil_twilight_end("civil_twilight_end");
static const StaticString s_nautical_twilight_begin("nautical_twilight_begin");
static const StaticString s_nautical_twilight_end("nautical_twilight_end");
static const StaticString
s_astronomical_twilight_begin("astronomical_twilight_begin");
static const StaticString
s_astronomical_twilight_end("astronomical_twilight_end");
const StaticString
s_sunrise("sunrise"),
s_sunset("sunset"),
s_transit("transit"),
s_civil_twilight_begin("civil_twilight_begin"),
s_civil_twilight_end("civil_twilight_end"),
s_nautical_twilight_begin("nautical_twilight_begin"),
s_nautical_twilight_end("nautical_twilight_end"),
s_astronomical_twilight_begin("astronomical_twilight_begin"),
s_astronomical_twilight_end("astronomical_twilight_end");
Array DateTime::getSunInfo(double latitude, double longitude) const {
Array ret;
hphp/runtime/base/time/timestamp.cpp
+5 -4
Ver Arquivo
@@ -33,10 +33,11 @@ double TimeStamp::CurrentSecond() {
return (double)tp.tv_sec + (double)tp.tv_usec / 1000000;
}
static const StaticString s_sec("sec");
static const StaticString s_usec("usec");
static const StaticString s_minuteswest("minuteswest");
static const StaticString s_dsttime("dsttime");
const StaticString
s_sec("sec"),
s_usec("usec"),
s_minuteswest("minuteswest"),
s_dsttime("dsttime");
Array TimeStamp::CurrentTime() {
struct timeval tp;
hphp/runtime/base/time/timezone.cpp
+12 -11
Ver Arquivo
@@ -156,17 +156,18 @@ Array TimeZone::GetNames() {
return ret;
}
static const StaticString s_dst("dst");
static const StaticString s_offset("offset");
static const StaticString s_timezone_id("timezone_id");
static const StaticString s_ts("ts");
static const StaticString s_time("time");
static const StaticString s_isdst("isdst");
static const StaticString s_abbr("abbr");
static const StaticString s_country_code("country_code");
static const StaticString s_latitude("latitude");
static const StaticString s_longitude("longitude");
static const StaticString s_comments("comments");
const StaticString
s_dst("dst"),
s_offset("offset"),
s_timezone_id("timezone_id"),
s_ts("ts"),
s_time("time"),
s_isdst("isdst"),
s_abbr("abbr"),
s_country_code("country_code"),
s_latitude("latitude"),
s_longitude("longitude"),
s_comments("comments");
Array TimeZone::GetAbbreviations() {
Array ret;
hphp/runtime/base/tv_helpers.cpp
+1 -1
Ver Arquivo
@@ -142,7 +142,7 @@ void tvCastToDoubleInPlace(TypedValue* tv) {
tv->m_type = KindOfDouble;
}
static const StaticString
const StaticString
s_1("1"),
s_Array("Array");
hphp/runtime/base/util/extended_logger.cpp
+6 -5
Ver Arquivo
@@ -120,11 +120,12 @@ void ExtendedLogger::Log(LogLevelType level, CArrRef stackTrace,
}
}
static const StaticString s_class("class");
static const StaticString s_function("function");
static const StaticString s_file("file");
static const StaticString s_type("type");
static const StaticString s_line("line");
const StaticString
s_class("class"),
s_function("function"),
s_file("file"),
s_type("type"),
s_line("line");
void ExtendedLogger::PrintStackTrace(FILE *f, CArrRef stackTrace,
bool escape /* = false */,
hphp/runtime/base/util/http_client.cpp
+7 -6
Ver Arquivo
@@ -101,12 +101,13 @@ int HttpClient::post(const char *url, const char *data, int size,
return impl(url, data, size, response, requestHeaders, responseHeaders);
}
static const StaticString s_ssl("ssl");
static const StaticString s_verify_peer("verify_peer");
static const StaticString s_capath("capath");
static const StaticString s_cafile("cafile");
static const StaticString s_local_cert("local_cert");
static const StaticString s_passphrase("passphrase");
const StaticString
s_ssl("ssl"),
s_verify_peer("verify_peer"),
s_capath("capath"),
s_cafile("cafile"),
s_local_cert("local_cert"),
s_passphrase("passphrase");
int HttpClient::impl(const char *url, const char *data, int size,
StringBuffer &response, const HeaderMap *requestHeaders,
hphp/runtime/debugger/cmd/cmd_break.cpp
+18 -17
Ver Arquivo
@@ -530,23 +530,24 @@ void CmdBreak::onClientImpl(DebuggerClient &client) {
}
}
static const StaticString s_id("id");
static const StaticString s_state("state");
static const StaticString s_is_exception("is_exception");
static const StaticString s_exception_class("exception_class");
static const StaticString s_file("file");
static const StaticString s_line1("line1");
static const StaticString s_line2("line2");
static const StaticString s_namespace("namespace");
static const StaticString s_func("func");
static const StaticString s_class("class");
static const StaticString s_url("url");
static const StaticString s_use_regex("use_regex");
static const StaticString s_clause_type("clause_type");
static const StaticString s_clause("clause");
static const StaticString s_if("if");
static const StaticString s_ampamp("ampamp");
static const StaticString s_desc("desc");
const StaticString
s_id("id"),
s_state("state"),
s_is_exception("is_exception"),
s_exception_class("exception_class"),
s_file("file"),
s_line1("line1"),
s_line2("line2"),
s_namespace("namespace"),
s_func("func"),
s_class("class"),
s_url("url"),
s_use_regex("use_regex"),
s_clause_type("clause_type"),
s_clause("clause"),
s_if("if"),
s_ampamp("ampamp"),
s_desc("desc");
// Updates the client with information about the execution of this command.
// This information is not used by the command line client, but can be accessed
hphp/runtime/debugger/cmd/cmd_config.cpp
+1 -1
Ver Arquivo
@@ -147,7 +147,7 @@ void CmdConfig::onClientImpl(DebuggerClient &client) {
listVars(client);
}
static const StaticString
const StaticString
s_BypassAccessCheck("BypassAccessCheck"),
s_LogFile("LogFile"),
s_PrintLevel("PrintLevel"),
hphp/runtime/debugger/cmd/cmd_eval.cpp
+3 -2
Ver Arquivo
@@ -55,8 +55,9 @@ void CmdEval::handleReply(DebuggerClient &client) {
client.print(m_output);
}
static const StaticString s_body("body");
static const StaticString s_value("value");
const StaticString
s_body("body"),
s_value("value");
void CmdEval::setClientOutput(DebuggerClient &client) {
client.setOutputType(DebuggerClient::OTValues);
hphp/runtime/debugger/cmd/cmd_info.cpp
+1 -1
Ver Arquivo
@@ -25,7 +25,7 @@ namespace HPHP { namespace Eval {
TRACE_SET_MOD(debugger);
static const StaticString
const StaticString
s_params("params"),
s_ref("ref"),
s_name("name"),
hphp/runtime/debugger/cmd/cmd_interrupt.cpp
+4 -3
Ver Arquivo
@@ -257,9 +257,10 @@ void CmdInterrupt::onClientImpl(DebuggerClient &client) {
}
}
static const StaticString s_format("format");
static const StaticString s_php("php");
static const StaticString s_value("value");
const StaticString
s_format("format"),
s_php("php"),
s_value("value");
void CmdInterrupt::setClientOutput(DebuggerClient &client) {
client.setOutputType(DebuggerClient::OTCodeLoc);
hphp/runtime/debugger/cmd/cmd_list.cpp
+1 -1
Ver Arquivo
@@ -155,7 +155,7 @@ bool CmdList::listFileRange(DebuggerClient &client,
return false;
}
static const StaticString
const StaticString
s_methods("methods"),
s_file("file"),
s_line1("line2"),
hphp/runtime/debugger/cmd/cmd_machine.cpp
+5 -4
Ver Arquivo
@@ -188,10 +188,11 @@ bool CmdMachine::AttachSandbox(DebuggerClient &client,
return cmdMachine->m_succeed;
}
static const StaticString s_host("host");
static const StaticString s_port("port");
static const StaticString s_auth("auth");
static const StaticString s_timeout("timeout");
const StaticString
s_host("host"),
s_port("port"),
s_auth("auth"),
s_timeout("timeout");
void CmdMachine::UpdateIntercept(DebuggerClient &client,
const std::string &host, int port) {
hphp/runtime/debugger/cmd/cmd_print.cpp
+6 -5
Ver Arquivo
@@ -341,11 +341,12 @@ void CmdPrint::onClientImpl(DebuggerClient &client) {
}
}
static const StaticString s_format("format");
static const StaticString s_php("php");
static const StaticString s_body("body");
static const StaticString s_value_serialize("value_serialize");
static const StaticString s_value("value");
const StaticString
s_format("format"),
s_php("php"),
s_body("body"),
s_value_serialize("value_serialize"),
s_value("value");
void CmdPrint::setClientOutput(DebuggerClient &client) {
client.setOutputType(DebuggerClient::OTValues);
hphp/runtime/debugger/cmd/cmd_variable.cpp
+1 -1
Ver Arquivo
@@ -146,7 +146,7 @@ void CmdVariable::setClientOutput(DebuggerClient &client) {
client.setOTValues(values);
}
static const StaticString s_GLOBALS("GLOBALS");
const StaticString s_GLOBALS("GLOBALS");
Array CmdVariable::GetGlobalVariables() {
Array ret = g_vmContext->m_globalVarEnv->getDefinedVariables();
hphp/runtime/debugger/debugger_client.cpp
+2 -2
Ver Arquivo
@@ -1209,7 +1209,7 @@ String DebuggerClient::getPrintString() {
return s;
}
static const StaticString
const StaticString
s_output_type("output_type"),
s_file("file"),
s_line("line"),
@@ -2116,7 +2116,7 @@ void DebuggerClient::moveToFrame(int index, bool display /* = true */) {
}
}
static const StaticString
const StaticString
s_args("args"),
s_namespace("namespace"),
s_class("class"),
hphp/runtime/debugger/dummy_sandbox.cpp
+1 -1
Ver Arquivo
@@ -91,7 +91,7 @@ struct CLISession : private boost::noncopyable {
}
static const StaticString s__SERVER("_SERVER");
const StaticString s__SERVER("_SERVER");
void DummySandbox::run() {
TRACE(2, "DummySandbox::run\n");
hphp/runtime/ext/ext_apache.cpp
+6 -5
Ver Arquivo
@@ -81,11 +81,12 @@ bool f_virtual(CStrRef filename) {
throw NotSupportedException(__func__, "apache is not in use");
}
static const StaticString s_restart_time("restart_time");
static const StaticString s_max_clients("max_clients");
static const StaticString s_active_clients("active_clients");
static const StaticString s_queued_requests("queued_requests");
static const StaticString s_child_status("child_status");
const StaticString
s_restart_time("restart_time"),
s_max_clients("max_clients"),
s_active_clients("active_clients"),
s_queued_requests("queued_requests"),
s_child_status("child_status");
Variant f_apache_get_config() {
int workers = 0, queued = 0;
hphp/runtime/ext/ext_apc.cpp
+10 -9
Ver Arquivo
@@ -225,7 +225,7 @@ Variant f_apc_exists(CVarRef key, int64_t cache_id /* = 0 */) {
return s_apc_store[cache_id].exists(key.toString());
}
static const StaticString s_start_time("start_time");
const StaticString s_start_time("start_time");
Variant f_apc_cache_info(int64_t cache_id /* = 0 */, bool limited /* = false */) {
return CREATE_MAP1(s_start_time, start_time());
@@ -955,14 +955,15 @@ static double my_time() {
return t;
}
static const StaticString s_total("total");
static const StaticString s_current("current");
static const StaticString s_filename("filename");
static const StaticString s_name("name");
static const StaticString s_done("done");
static const StaticString s_temp_filename("temp_filename");
static const StaticString s_cancel_upload("cancel_upload");
static const StaticString s_rate("rate");
const StaticString
s_total("total"),
s_current("current"),
s_filename("filename"),
s_name("name"),
s_done("done"),
s_temp_filename("temp_filename"),
s_cancel_upload("cancel_upload"),
s_rate("rate");
#define RFC1867_TRACKING_KEY_MAXLEN 63
#define RFC1867_NAME_MAXLEN 63
hphp/runtime/ext/ext_curl.cpp
+42 -38
Ver Arquivo
@@ -764,15 +764,16 @@ Variant f_curl_copy_handle(CObjRef ch) {
return NEWOBJ(CurlResource)(curl);
}
static const StaticString s_version_number("version_number");
static const StaticString s_age("age");
static const StaticString s_features("features");
static const StaticString s_ssl_version_number("ssl_version_number");
static const StaticString s_version("version");
static const StaticString s_host("host");
static const StaticString s_ssl_version("ssl_version");
static const StaticString s_libz_version("libz_version");
static const StaticString s_protocols("protocols");
const StaticString
s_version_number("version_number"),
s_age("age"),
s_features("features"),
s_ssl_version_number("ssl_version_number"),
s_version("version"),
s_host("host"),
s_ssl_version("ssl_version"),
s_libz_version("libz_version"),
s_protocols("protocols");
Variant f_curl_version(int uversion /* = k_CURLVERSION_NOW */) {
curl_version_info_data *d = curl_version_info((CURLversion)uversion);
@@ -825,28 +826,29 @@ Variant f_curl_exec(CObjRef ch) {
return curl->execute();
}
static const StaticString s_url("url");
static const StaticString s_content_type("content_type");
static const StaticString s_http_code("http_code");
static const StaticString s_header_size("header_size");
static const StaticString s_request_size("request_size");
static const StaticString s_filetime("filetime");
static const StaticString s_ssl_verify_result("ssl_verify_result");
static const StaticString s_redirect_count("redirect_count");
static const StaticString s_local_port("local_port");
static const StaticString s_total_time("total_time");
static const StaticString s_namelookup_time("namelookup_time");
static const StaticString s_connect_time("connect_time");
static const StaticString s_pretransfer_time("pretransfer_time");
static const StaticString s_size_upload("size_upload");
static const StaticString s_size_download("size_download");
static const StaticString s_speed_download("speed_download");
static const StaticString s_speed_upload("speed_upload");
static const StaticString s_download_content_length("download_content_length");
static const StaticString s_upload_content_length("upload_content_length");
static const StaticString s_starttransfer_time("starttransfer_time");
static const StaticString s_redirect_time("redirect_time");
static const StaticString s_request_header("request_header");
const StaticString
s_url("url"),
s_content_type("content_type"),
s_http_code("http_code"),
s_header_size("header_size"),
s_request_size("request_size"),
s_filetime("filetime"),
s_ssl_verify_result("ssl_verify_result"),
s_redirect_count("redirect_count"),
s_local_port("local_port"),
s_total_time("total_time"),
s_namelookup_time("namelookup_time"),
s_connect_time("connect_time"),
s_pretransfer_time("pretransfer_time"),
s_size_upload("size_upload"),
s_size_download("size_download"),
s_speed_download("speed_download"),
s_speed_upload("speed_upload"),
s_download_content_length("download_content_length"),
s_upload_content_length("upload_content_length"),
s_starttransfer_time("starttransfer_time"),
s_redirect_time("redirect_time"),
s_request_header("request_header");
Variant f_curl_getinfo(CObjRef ch, int opt /* = 0 */) {
CHECK_RESOURCE(curl);
@@ -1241,11 +1243,12 @@ Variant f_fb_curl_multi_fdset(CObjRef mh,
return r;
}
static const StaticString s_msg("msg");
static const StaticString s_result("result");
static const StaticString s_handle("handle");
static const StaticString s_headers("headers");
static const StaticString s_requests("requests");
const StaticString
s_msg("msg"),
s_result("result"),
s_handle("handle"),
s_headers("headers"),
s_requests("requests");
Variant f_curl_multi_info_read(CObjRef mh,
VRefParam msgs_in_queue /* = null */) {
@@ -1352,8 +1355,9 @@ static LibEventHttpClientPtr prepare_client
return client;
}
static const StaticString s_code("code");
static const StaticString s_response("response");
const StaticString
s_code("code"),
s_response("response");
static Array prepare_response(LibEventHttpClientPtr client) {
int len = 0;
hphp/runtime/ext/ext_datetime.cpp
+14 -12
Ver Arquivo
@@ -89,10 +89,11 @@ String c_DateTime::t_format(CStrRef format) {
return m_dt->toString(format, false);
}
static const StaticString s_warning_count("warning_count");
static const StaticString s_warnings("warnings");
static const StaticString s_error_count("error_count");
static const StaticString s_errors("errors");
const StaticString
s_warning_count("warning_count"),
s_warnings("warnings"),
s_error_count("error_count"),
s_errors("errors");
Array c_DateTime::ti_getlasterrors() {
Array errors = DateTime::getLastErrors();
@@ -231,14 +232,15 @@ void c_DateInterval::t___construct(CStrRef interval_spec) {
}
}
static const StaticString s_y("y");
static const StaticString s_m("m");
static const StaticString s_d("d");
static const StaticString s_h("h");
static const StaticString s_i("i");
static const StaticString s_s("s");
static const StaticString s_invert("invert");
static const StaticString s_days("days");
const StaticString
s_y("y"),
s_m("m"),
s_d("d"),
s_h("h"),
s_i("i"),
s_s("s"),
s_invert("invert"),
s_days("days");
Variant c_DateInterval::t___get(Variant member) {
if (member.isString()) {
hphp/runtime/ext/ext_debugger.cpp
+12 -11
Ver Arquivo
@@ -353,17 +353,18 @@ Variant c_DebuggerClientCmdUser::t_xend(CObjRef cmd) {
return ret->getUserCommand();
}
static const StaticString s_file("file");
static const StaticString s_line("line");
static const StaticString s_namespace("namespace");
static const StaticString s_class("class");
static const StaticString s_function("function");
static const StaticString s_text("text");
static const StaticString s_user("user");
static const StaticString s_configFName("configFName");
static const StaticString s_host("host");
static const StaticString s_port("port");
static const StaticString s_sandbox("sandbox");
const StaticString
s_file("file"),
s_line("line"),
s_namespace("namespace"),
s_class("class"),
s_function("function"),
s_text("text"),
s_user("user"),
s_configFName("configFName"),
s_host("host"),
s_port("port"),
s_sandbox("sandbox");
Variant c_DebuggerClientCmdUser::t_getcurrentlocation() {
TRACE(5, "c_DebuggerClientCmdUser::t_getcurrentlocation\n");
hphp/runtime/ext/ext_domdocument.cpp
+13 -13
Ver Arquivo
@@ -1154,19 +1154,19 @@ static void removeOrphan(XmlNodeSet &orphans, xmlNodePtr node) {
}
}
static const StaticString s_domdocument("domdocument");
static const StaticString s_domdocumenttype("domdocumenttype");
static const StaticString s_domelement("domelement");
static const StaticString s_domattr("domattr");
static const StaticString s_domtext("domtext");
static const StaticString s_domcomment("domcomment");
static const StaticString
s_domprocessinginstruction("domprocessinginstruction");
static const StaticString s_domentityreference("domentityreference");
static const StaticString s_domentity("domentity");
static const StaticString s_domcdatasection("domcdatasection");
static const StaticString s_domdocumentfragment("domdocumentfragment");
static const StaticString s_domnotation("domnotation");
const StaticString
s_domdocument("domdocument"),
s_domdocumenttype("domdocumenttype"),
s_domelement("domelement"),
s_domattr("domattr"),
s_domtext("domtext"),
s_domcomment("domcomment"),
s_domprocessinginstruction("domprocessinginstruction"),
s_domentityreference("domentityreference"),
s_domentity("domentity"),
s_domcdatasection("domcdatasection"),
s_domdocumentfragment("domdocumentfragment"),
s_domnotation("domnotation");
static String domClassname(xmlNodePtr obj) {
switch (obj->type) {
hphp/runtime/ext/ext_error.cpp
+8 -7
Ver Arquivo
@@ -58,13 +58,14 @@ void f_debug_print_backtrace(int64_t options /* = 0 */,
echo(debug_string_backtrace(true, ignore_args, limit));
}
static const StaticString s_class("class");
static const StaticString s_type("type");
static const StaticString s_function("function");
static const StaticString s_file("file");
static const StaticString s_line("line");
static const StaticString s_message("message");
static const StaticString s_args("args");
const StaticString
s_class("class"),
s_type("type"),
s_function("function"),
s_file("file"),
s_line("line"),
s_message("message"),
s_args("args");
String debug_string_backtrace(bool skip, bool ignore_args /* = false */,
int limit /* = 0 */) {
hphp/runtime/ext/ext_fb.cpp
+8 -7
Ver Arquivo
@@ -1011,7 +1011,7 @@ Variant f_fb_compact_unserialize(CVarRef thing, VRefParam success,
///////////////////////////////////////////////////////////////////////////////
static const StaticString
const StaticString
s_affected("affected"),
s_result("result"),
s_error("error"),
@@ -1047,7 +1047,7 @@ static void output_dataset(Array &ret, int affected, DBDataSet &ds,
}
}
static const StaticString
const StaticString
s_session_variable("session_variable"),
s_ip("ip"),
s_db("db"),
@@ -1582,11 +1582,12 @@ void f_fb_set_exit_callback(CVarRef function) {
g_context->setExitCallback(function);
}
static const StaticString s_flush_stats("flush_stats");
static const StaticString s_chunk_stats("chunk_stats");
static const StaticString s_total("total");
static const StaticString s_sent("sent");
static const StaticString s_time("time");
const StaticString
s_flush_stats("flush_stats"),
s_chunk_stats("chunk_stats"),
s_total("total"),
s_sent("sent"),
s_time("time");
Array f_fb_get_flush_stat() {
Transport *transport = g_context->getTransport();
hphp/runtime/ext/ext_file.cpp
+22 -19
Ver Arquivo
@@ -95,19 +95,20 @@ static bool check_error(const char *function, int line, bool ret) {
return ret;
}
static const StaticString s_dev("dev");
static const StaticString s_ino("ino");
static const StaticString s_mode("mode");
static const StaticString s_nlink("nlink");
static const StaticString s_uid("uid");
static const StaticString s_gid("gid");
static const StaticString s_rdev("rdev");
static const StaticString s_size("size");
static const StaticString s_atime("atime");
static const StaticString s_mtime("mtime");
static const StaticString s_ctime("ctime");
static const StaticString s_blksize("blksize");
static const StaticString s_blocks("blocks");
const StaticString
s_dev("dev"),
s_ino("ino"),
s_mode("mode"),
s_nlink("nlink"),
s_uid("uid"),
s_gid("gid"),
s_rdev("rdev"),
s_size("size"),
s_atime("atime"),
s_mtime("mtime"),
s_ctime("ctime"),
s_blksize("blksize"),
s_blocks("blocks");
Array stat_impl(struct stat *stat_sb) {
ArrayInit ret(26);
@@ -848,10 +849,11 @@ Variant f_realpath(CStrRef path) {
#define PHP_PATHINFO_EXTENSION 4
#define PHP_PATHINFO_FILENAME 8
static const StaticString s_dirname("dirname");
static const StaticString s_basename("basename");
static const StaticString s_extension("extension");
static const StaticString s_filename("filename");
const StaticString
s_dirname("dirname"),
s_basename("basename"),
s_extension("extension"),
s_filename("filename");
Variant f_pathinfo(CStrRef path, int opt /* = 15 */) {
ArrayInit ret(4);
@@ -1322,8 +1324,9 @@ public:
};
IMPLEMENT_STATIC_REQUEST_LOCAL(DirectoryRequestData, s_directory_data);
static const StaticString s_handle("handle");
static const StaticString s_path("path");
const StaticString
s_handle("handle"),
s_path("path");
static DIR *get_dir(CObjRef dir_handle) {
Object obj;
hphp/runtime/ext/ext_function.cpp
+5 -4
Ver Arquivo
@@ -34,8 +34,9 @@ namespace HPHP {
using HPHP::Transl::CallerFrame;
using HPHP::Transl::EagerCallerFrame;
static const StaticString s_internal("internal");
static const StaticString s_user("user");
const StaticString
s_internal("internal"),
s_user("user");
Array f_get_defined_functions() {
return CREATE_MAP2(s_internal, ClassInfo::GetSystemFunctions(),
@@ -50,7 +51,7 @@ bool f_function_exists(CStrRef function_name, bool autoload /* = true */) {
function_exists(function_name));
}
static const StaticString
const StaticString
s__invoke("__invoke"),
s_Closure__invoke("Closure::__invoke"),
s_colon2("::");
@@ -160,7 +161,7 @@ Variant f_end_user_func_async(CObjRef handle,
return uninit_null();
}
static const StaticString
const StaticString
s_func("func"),
s_args("args"),
s_exception("exception"),
hphp/runtime/ext/ext_hotprofiler.cpp
+9 -8
Ver Arquivo
@@ -519,14 +519,15 @@ enum Flag {
TrackMalloc = 0x80,
};
static const StaticString s_ct("ct");
static const StaticString s_wt("wt");
static const StaticString s_cpu("cpu");
static const StaticString s_mu("mu");
static const StaticString s_pmu("pmu");
static const StaticString s_alloc("alloc");
static const StaticString s_free("free");
static const StaticString s_compressed_trace("(compressed_trace)");
const StaticString
s_ct("ct"),
s_wt("wt"),
s_cpu("cpu"),
s_mu("mu"),
s_pmu("pmu"),
s_alloc("alloc"),
s_free("free"),
s_compressed_trace("(compressed_trace)");
/**
* Maintain profiles of a running stack.
hphp/runtime/ext/ext_iconv.cpp
+6 -5
Ver Arquivo
@@ -1254,7 +1254,7 @@ static php_iconv_err_t _php_iconv_mime_decode(StringBuffer &retval,
///////////////////////////////////////////////////////////////////////////////
static const StaticString
const StaticString
s_scheme("scheme"),
s_input_charset("input-charset"),
s_output_charset("output-charset"),
@@ -1705,10 +1705,11 @@ Variant f_iconv_mime_decode_headers(CStrRef encoded_headers,
return ret;
}
static const StaticString s_input_encoding("input_encoding");
static const StaticString s_output_encoding("output_encoding");
static const StaticString s_internal_encoding("internal_encoding");
static const StaticString s_all("all");
const StaticString
s_input_encoding("input_encoding"),
s_output_encoding("output_encoding"),
s_internal_encoding("internal_encoding"),
s_all("all");
Variant f_iconv_get_encoding(CStrRef type /* = "all" */) {
hphp/runtime/ext/ext_icu_ucnv.cpp
+3 -2
Ver Arquivo
@@ -468,8 +468,9 @@ String c_UConverter::doConvert(CStrRef str,
return destStr.setSize(dest_len);
}
static const StaticString s_from_subst("from_subst");
static const StaticString s_to_subst("to_subst");
const StaticString
s_from_subst("from_subst"),
s_to_subst("to_subst");
Variant c_UConverter::ti_transcode(CStrRef str, CStrRef toEncoding,
CStrRef fromEncoding, CArrRef options) {
hphp/runtime/ext/ext_image.cpp
+37 -35
Ver Arquivo
@@ -1574,7 +1574,7 @@ String f_image_type_to_extension(int imagetype,
}
}
static const StaticString
const StaticString
s_bits("bits"),
s_channels("channels"),
s_mime("mime"),
@@ -2930,21 +2930,21 @@ static Variant php_imagettftext_common(int mode, int extended,
}
#endif /* ENABLE_GD_TTF */
static const StaticString s_GD_Version("GD Version");
static const StaticString s_FreeType_Support("FreeType Support");
static const StaticString s_FreeType_Linkage("FreeType Linkage");
static const StaticString s_with_freetype("with freetype");
static const StaticString s_with_TTF_library("with TTF library");
static const StaticString s_with_unknown_library("with unknown library");
static const StaticString s_T1Lib_Support("T1Lib_Support");
static const StaticString s_GIF_Read_Support("GIF Read Support");
static const StaticString s_GIF_Create_Support("GIF Create Support");
static const StaticString s_JPG_Support("JPG Support");
static const StaticString s_PNG_Support("PNG Support");
static const StaticString s_WBMP_Support("WBMP Support");
static const StaticString s_XPM_Support("XPM Support");
static const StaticString s_XBM_Support("XBM Support");
static const StaticString
const StaticString
s_GD_Version("GD Version"),
s_FreeType_Support("FreeType Support"),
s_FreeType_Linkage("FreeType Linkage"),
s_with_freetype("with freetype"),
s_with_TTF_library("with TTF library"),
s_with_unknown_library("with unknown library"),
s_T1Lib_Support("T1Lib_Support"),
s_GIF_Read_Support("GIF Read Support"),
s_GIF_Create_Support("GIF Create Support"),
s_JPG_Support("JPG Support"),
s_PNG_Support("PNG Support"),
s_WBMP_Support("WBMP Support"),
s_XPM_Support("XPM Support"),
s_XBM_Support("XBM Support"),
s_JIS_mapped_Japanese_Font_Support("JIS-mapped Japanese Font Support");
Array f_gd_info() {
@@ -3752,10 +3752,11 @@ Variant f_imagecolorset(CObjRef image, int index,
}
}
static const StaticString s_red("red");
static const StaticString s_green("green");
static const StaticString s_blue("blue");
static const StaticString s_alpha("alpha");
const StaticString
s_red("red"),
s_green("green"),
s_blue("blue"),
s_alpha("alpha");
Variant f_imagecolorsforindex(CObjRef image, int index) {
gdImagePtr im = image.getTyped<Image>()->get();
@@ -4383,7 +4384,7 @@ static int php_iptc_next_marker(File *file, int spool,
return (unsigned int) c;
}
static const StaticString s_size("size");
const StaticString s_size("size");
Variant f_iptcembed(CStrRef iptcdata, CStrRef jpeg_file_name,
int spool /* = 0 */) {
@@ -5337,20 +5338,21 @@ typedef struct {
#define FOUND_WINXP (1<<SECTION_WINXP)
#define FOUND_MAKERNOTE (1<<SECTION_MAKERNOTE)
static const StaticString s_FILE("FILE");
static const StaticString s_COMPUTED("COMPUTED");
static const StaticString s_ANY_TAG("ANY_TAG");
static const StaticString s_IFD0("IFD0");
static const StaticString s_THUMBNAIL("THUMBNAIL");
static const StaticString s_COMMENT("COMMENT");
static const StaticString s_APP0("APP0");
static const StaticString s_EXIF("EXIF");
static const StaticString s_FPIX("FPIX");
static const StaticString s_GPS("GPS");
static const StaticString s_INTEROP("INTEROP");
static const StaticString s_APP12("APP12");
static const StaticString s_WINXP("WINXP");
static const StaticString s_MAKERNOTE("MAKERNOTE");
const StaticString
s_FILE("FILE"),
s_COMPUTED("COMPUTED"),
s_ANY_TAG("ANY_TAG"),
s_IFD0("IFD0"),
s_THUMBNAIL("THUMBNAIL"),
s_COMMENT("COMMENT"),
s_APP0("APP0"),
s_EXIF("EXIF"),
s_FPIX("FPIX"),
s_GPS("GPS"),
s_INTEROP("INTEROP"),
s_APP12("APP12"),
s_WINXP("WINXP"),
s_MAKERNOTE("MAKERNOTE");
static String exif_get_sectionname(int section) {
switch(section) {
hphp/runtime/ext/ext_intl.cpp
+4 -3
Ver Arquivo
@@ -736,9 +736,10 @@ enum {
#ifdef HAVE_46_API
static const StaticString s_result("result");
static const StaticString s_isTransitionalDifferent("isTransitionalDifferent");
static const StaticString s_errors("errors");
const StaticString
s_result("result"),
s_isTransitionalDifferent("isTransitionalDifferent"),
s_errors("errors");
static Variant php_intl_idn_to_46(CStrRef domain, int64_t options, IdnVariant idn_variant, VRefParam idna_info, int mode) {
int32_t converted_capacity;
hphp/runtime/ext/ext_ipc.cpp
+11 -10
Ver Arquivo
@@ -111,16 +111,17 @@ bool f_msg_remove_queue(CObjRef queue) {
return msgctl(q->id, IPC_RMID, NULL) == 0;
}
static const StaticString s_msg_perm_uid("msg_perm.uid");
static const StaticString s_msg_perm_gid("msg_perm.gid");
static const StaticString s_msg_perm_mode("msg_perm.mode");
static const StaticString s_msg_stime("msg_stime");
static const StaticString s_msg_rtime("msg_rtime");
static const StaticString s_msg_ctime("msg_ctime");
static const StaticString s_msg_qnum("msg_qnum");
static const StaticString s_msg_qbytes("msg_qbytes");
static const StaticString s_msg_lspid("msg_lspid");
static const StaticString s_msg_lrpid("msg_lrpid");
const StaticString
s_msg_perm_uid("msg_perm.uid"),
s_msg_perm_gid("msg_perm.gid"),
s_msg_perm_mode("msg_perm.mode"),
s_msg_stime("msg_stime"),
s_msg_rtime("msg_rtime"),
s_msg_ctime("msg_ctime"),
s_msg_qnum("msg_qnum"),
s_msg_qbytes("msg_qbytes"),
s_msg_lspid("msg_lspid"),
s_msg_lrpid("msg_lrpid");
bool f_msg_set_queue(CObjRef queue, CArrRef data) {
MessageQueue *q = queue.getTyped<MessageQueue>();
hphp/runtime/ext/ext_ldap.cpp
+7 -5
Ver Arquivo
@@ -487,8 +487,9 @@ static int _ldap_rebind_proc(LDAP *ldap, const char *url, ber_tag_t req,
return ret.toInt64();
}
static const StaticString s_count("count");
static const StaticString s_dn("dn");
const StaticString
s_count("count"),
s_dn("dn");
static void get_attributes(Array &ret, LDAP *ldap,
LDAPMessage *ldap_result_entry, bool to_lower) {
@@ -770,9 +771,10 @@ bool f_ldap_get_option(CObjRef link, int option, VRefParam retval) {
return true;
}
static const StaticString s_oid("oid");
static const StaticString s_value("value");
static const StaticString s_iscritical("iscritical");
const StaticString
s_oid("oid"),
s_value("value"),
s_iscritical("iscritical");
bool f_ldap_set_option(CVarRef link, int option, CVarRef newval) {
LDAP *ldap = NULL;
hphp/runtime/ext/ext_mailparse.cpp
+8 -6
Ver Arquivo
@@ -85,7 +85,7 @@ bool php_mail(CStrRef to, CStrRef subject, CStrRef message, CStrRef headers,
return (!ret);
}
static const StaticString zero(LITSTR_INIT("\0"));
const StaticString zero(LITSTR_INIT("\0"));
bool f_mail(CStrRef to, CStrRef subject, CStrRef message, CStrRef additional_headers /* = null_string */, CStrRef additional_parameters /* = null_string */) {
// replace \0 with spaces
@@ -195,9 +195,10 @@ Array f_mailparse_msg_get_structure(CObjRef mimemail) {
return mimemail.getTyped<MimePart>()->getStructure();
}
static const StaticString s_display("display");
static const StaticString s_address("address");
static const StaticString s_is_group("is_group");
const StaticString
s_display("display"),
s_address("address"),
s_is_group("is_group");
Array f_mailparse_rfc822_parse_addresses(CStrRef addresses) {
php_rfc822_tokenized_t *toks =
@@ -344,8 +345,9 @@ static size_t mailparse_do_uudecode(File *instream, File *outstream) {
return file_size;
}
static const StaticString s_filename("filename");
static const StaticString s_origfilename("origfilename");
const StaticString
s_filename("filename"),
s_origfilename("origfilename");
Variant f_mailparse_uudecode_all(CObjRef fp) {
File *instream = fp.getTyped<File>();
hphp/runtime/ext/ext_mb.cpp
+18 -17
Ver Arquivo
@@ -1618,23 +1618,24 @@ Variant f_mb_encode_numericentity(CStrRef str, CVarRef convmap,
return php_mb_numericentity_exec(str, convmap, encoding, 0);
}
static const StaticString s_internal_encoding("internal_encoding");
static const StaticString s_http_input("http_input");
static const StaticString s_http_output("http_output");
static const StaticString s_mail_charset("mail_charset");
static const StaticString s_mail_header_encoding("mail_header_encoding");
static const StaticString s_mail_body_encoding("mail_body_encoding");
static const StaticString s_illegal_chars("illegal_chars");
static const StaticString s_encoding_translation("encoding_translation");
static const StaticString s_On("On");
static const StaticString s_Off("Off");
static const StaticString s_language("language");
static const StaticString s_detect_order("detect_order");
static const StaticString s_substitute_character("substitute_character");
static const StaticString s_strict_detection("strict_detection");
static const StaticString s_none("none");
static const StaticString s_long("long");
static const StaticString s_entity("entity");
const StaticString
s_internal_encoding("internal_encoding"),
s_http_input("http_input"),
s_http_output("http_output"),
s_mail_charset("mail_charset"),
s_mail_header_encoding("mail_header_encoding"),
s_mail_body_encoding("mail_body_encoding"),
s_illegal_chars("illegal_chars"),
s_encoding_translation("encoding_translation"),
s_On("On"),
s_Off("Off"),
s_language("language"),
s_detect_order("detect_order"),
s_substitute_character("substitute_character"),
s_strict_detection("strict_detection"),
s_none("none"),
s_long("long"),
s_entity("entity");
Variant f_mb_get_info(CStrRef type /* = null_string */) {
const mbfl_language *lang = mbfl_no2language(MBSTRG(current_language));
hphp/runtime/ext/ext_memcached.cpp
+33 -31
Ver Arquivo
@@ -368,9 +368,10 @@ bool c_Memcached::getMultiImpl(CStrRef server_key, CArrRef keys,
keysCopy.size()));
}
static const StaticString s_key("key");
static const StaticString s_value("value");
static const StaticString s_cas("cas");
const StaticString
s_key("key"),
s_value("value"),
s_cas("cas");
bool c_Memcached::fetchImpl(memcached_result_st &result, Array &item) {
memcached_return status;
@@ -600,9 +601,10 @@ bool c_Memcached::t_addservers(CArrRef servers) {
namespace {
static const StaticString s_host("host");
static const StaticString s_port("port");
static const StaticString s_weight("weight");
const StaticString
s_host("host"),
s_port("port"),
s_weight("weight");
memcached_return_t doServerListCallback(const memcached_st *ptr,
memcached_server_instance_st server, void *context) {
@@ -648,31 +650,31 @@ struct StatsContext {
Array returnValue;
};
static const StaticString s_pid("pid");
static const StaticString s_uptime("uptime");
static const StaticString s_threads("threads");
static const StaticString s_time("time");
static const StaticString s_pointer_size("pointer_size");
static const StaticString s_rusage_user_seconds("rusage_user_seconds");
static const StaticString s_rusage_user_microseconds("rusage_user_microseconds");
static const StaticString s_rusage_system_seconds("rusage_system_seconds");
static const StaticString
s_rusage_system_microseconds("rusage_system_microseconds");
static const StaticString s_curr_items("curr_items");
static const StaticString s_total_items("total_items");
static const StaticString s_limit_maxbytes("limit_maxbytes");
static const StaticString s_curr_connections("curr_connections");
static const StaticString s_total_connections("total_connections");
static const StaticString s_connection_structures("connection_structures");
static const StaticString s_bytes("bytes");
static const StaticString s_cmd_get("cmd_get");
static const StaticString s_cmd_set("cmd_set");
static const StaticString s_get_hits("get_hits");
static const StaticString s_get_misses("get_misses");
static const StaticString s_evictions("evictions");
static const StaticString s_bytes_read("bytes_read");
static const StaticString s_bytes_written("bytes_written");
static const StaticString s_version("version");
const StaticString
s_pid("pid"),
s_uptime("uptime"),
s_threads("threads"),
s_time("time"),
s_pointer_size("pointer_size"),
s_rusage_user_seconds("rusage_user_seconds"),
s_rusage_user_microseconds("rusage_user_microseconds"),
s_rusage_system_seconds("rusage_system_seconds"),
s_rusage_system_microseconds("rusage_system_microseconds"),
s_curr_items("curr_items"),
s_total_items("total_items"),
s_limit_maxbytes("limit_maxbytes"),
s_curr_connections("curr_connections"),
s_total_connections("total_connections"),
s_connection_structures("connection_structures"),
s_bytes("bytes"),
s_cmd_get("cmd_get"),
s_cmd_set("cmd_set"),
s_get_hits("get_hits"),
s_get_misses("get_misses"),
s_evictions("evictions"),
s_bytes_read("bytes_read"),
s_bytes_written("bytes_written"),
s_version("version");
memcached_return_t doStatsCallback(const memcached_st *ptr,
memcached_server_instance_st server, void *inContext) {