From 8d1ade6b3bc43d501811b32c666f5e058a76f4b6 Mon Sep 17 00:00:00 2001 From: Mike Magruder Date: Mon, 13 May 2013 15:22:58 -0700 Subject: [PATCH] Remove dead subclass of ThriftBuffer PhpThriftBuffer is dead code. Removing it to make it clear that the debugger is in fact the only consumer of ThriftBuffer. --- hphp/runtime/base/util/php_thrift_buffer.cpp | 44 ---------------- hphp/runtime/base/util/php_thrift_buffer.h | 54 -------------------- 2 files changed, 98 deletions(-) delete mode 100644 hphp/runtime/base/util/php_thrift_buffer.cpp delete mode 100644 hphp/runtime/base/util/php_thrift_buffer.h diff --git a/hphp/runtime/base/util/php_thrift_buffer.cpp b/hphp/runtime/base/util/php_thrift_buffer.cpp deleted file mode 100644 index dc4997698..000000000 --- a/hphp/runtime/base/util/php_thrift_buffer.cpp +++ /dev/null @@ -1,44 +0,0 @@ -/* - +----------------------------------------------------------------------+ - | HipHop for PHP | - +----------------------------------------------------------------------+ - | Copyright (c) 2010- Facebook, Inc. (http://www.facebook.com) | - +----------------------------------------------------------------------+ - | This source file is subject to version 3.01 of the PHP license, | - | that is bundled with this package in the file LICENSE, and is | - | available through the world-wide-web at the following url: | - | http://www.php.net/license/3_01.txt | - | If you did not receive a copy of the PHP license and are unable to | - | obtain it through the world-wide-web, please send a note to | - | license@php.net so we can mail you a copy immediately. | - +----------------------------------------------------------------------+ -*/ - -#include "hphp/runtime/base/util/php_thrift_buffer.h" -#include "hphp/runtime/base/array/array_init.h" -#include "hphp/runtime/base/externals.h" -#include "hphp/runtime/base/type_conversions.h" -#include "hphp/runtime/base/builtin_functions.h" - -namespace HPHP { - -static StaticString s_read("read"); -static StaticString s_write("write"); - -/////////////////////////////////////////////////////////////////////////////// - -String PhpThriftBuffer::readImpl() { - return m_xin->o_invoke_few_args(s_read, 1, m_size); -} - -void PhpThriftBuffer::flushImpl(CStrRef data) { - m_xout->o_invoke_few_args(s_write, 1, data); -} - -void PhpThriftBuffer::throwError(const char *msg, int code) { - throw create_object("TProtocolException", - CREATE_VECTOR2(String(msg, CopyString), code)); -} - -/////////////////////////////////////////////////////////////////////////////// -} diff --git a/hphp/runtime/base/util/php_thrift_buffer.h b/hphp/runtime/base/util/php_thrift_buffer.h deleted file mode 100644 index 0c90b8bb5..000000000 --- a/hphp/runtime/base/util/php_thrift_buffer.h +++ /dev/null @@ -1,54 +0,0 @@ -/* - +----------------------------------------------------------------------+ - | HipHop for PHP | - +----------------------------------------------------------------------+ - | Copyright (c) 2010- Facebook, Inc. (http://www.facebook.com) | - +----------------------------------------------------------------------+ - | This source file is subject to version 3.01 of the PHP license, | - | that is bundled with this package in the file LICENSE, and is | - | available through the world-wide-web at the following url: | - | http://www.php.net/license/3_01.txt | - | If you did not receive a copy of the PHP license and are unable to | - | obtain it through the world-wide-web, please send a note to | - | license@php.net so we can mail you a copy immediately. | - +----------------------------------------------------------------------+ -*/ - -#ifndef incl_HPHP_PHP_THRIFT_BUFFER_H_ -#define incl_HPHP_PHP_THRIFT_BUFFER_H_ - -#include "hphp/runtime/base/util/thrift_buffer.h" - -namespace HPHP { -/////////////////////////////////////////////////////////////////////////////// - -/** - * Efficient thrift input/output preparation. Used by automatically generated - * separable extension code created by running thrift compiler, for example, - * - * thrift --gen hphp my_service.thrift - */ -class PhpThriftBuffer: public ThriftBuffer { -public: - PhpThriftBuffer() : ThriftBuffer(102400) {} - - // passing in input and output transport objects - void create(CObjRef xin, CObjRef xout) { - m_xin = xin; - m_xout = xout; - } - -protected: - virtual String readImpl(); - virtual void flushImpl(CStrRef data); - virtual void throwError(const char *msg, int code); - -private: - Object m_xin; - Object m_xout; -}; - -/////////////////////////////////////////////////////////////////////////////// -} - -#endif // incl_HPHP_PHP_THRIFT_BUFFER_H_