remove invalid include-file and adjust include-file sort

pull/15373/head
thinkerou 7 years ago
parent 59a4baa6f8
commit 771c20575e
  1. 12
      src/php/ext/grpc/byte_buffer.c
  2. 15
      src/php/ext/grpc/call.c
  3. 10
      src/php/ext/grpc/call.h
  4. 16
      src/php/ext/grpc/call_credentials.c
  5. 10
      src/php/ext/grpc/call_credentials.h
  6. 13
      src/php/ext/grpc/channel.c
  7. 9
      src/php/ext/grpc/channel.h
  8. 17
      src/php/ext/grpc/channel_credentials.c
  9. 10
      src/php/ext/grpc/channel_credentials.h
  10. 2
      src/php/ext/grpc/completion_queue.c
  11. 11
      src/php/ext/grpc/php_grpc.c
  12. 18
      src/php/ext/grpc/php_grpc.h
  13. 16
      src/php/ext/grpc/server.c
  14. 9
      src/php/ext/grpc/server.h
  15. 13
      src/php/ext/grpc/server_credentials.c
  16. 2
      src/php/ext/grpc/server_credentials.h
  17. 14
      src/php/ext/grpc/timeval.c
  18. 10
      src/php/ext/grpc/timeval.h

@ -16,23 +16,11 @@
*
*/
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include <php.h>
#include <php_ini.h>
#include <ext/standard/info.h>
#include <ext/spl/spl_exceptions.h>
#include "php_grpc.h"
#include <string.h>
#include "byte_buffer.h"
#include <grpc/grpc.h>
#include <grpc/byte_buffer_reader.h>
#include <grpc/slice.h>
grpc_byte_buffer *string_to_byte_buffer(char *string, size_t length) {
grpc_slice slice = grpc_slice_from_copied_buffer(string, length);

@ -18,25 +18,12 @@
#include "call.h"
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include <php.h>
#include <php_ini.h>
#include <ext/standard/info.h>
#include <ext/spl/spl_exceptions.h>
#include "php_grpc.h"
#include "call_credentials.h"
#include <zend_exceptions.h>
#include <zend_hash.h>
#include <stdbool.h>
#include <grpc/support/alloc.h>
#include <grpc/grpc.h>
#include "call_credentials.h"
#include "completion_queue.h"
#include "timeval.h"
#include "channel.h"

@ -19,17 +19,9 @@
#ifndef NET_GRPC_PHP_GRPC_CALL_H_
#define NET_GRPC_PHP_GRPC_CALL_H_
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include <php.h>
#include <php_ini.h>
#include <ext/standard/info.h>
#include "php_grpc.h"
#include "channel.h"
#include <grpc/grpc.h>
#include "channel.h"
/* Class entry for the Call PHP class */
extern zend_class_entry *grpc_ce_call;

@ -16,28 +16,16 @@
*
*/
#include "channel_credentials.h"
#include "call_credentials.h"
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include <php.h>
#include <php_ini.h>
#include <ext/standard/info.h>
#include <ext/spl/spl_exceptions.h>
#include "php_grpc.h"
#include "call.h"
#include <zend_exceptions.h>
#include <zend_hash.h>
#include <grpc/grpc.h>
#include <grpc/grpc_security.h>
#include <grpc/support/log.h>
#include <grpc/support/string_util.h>
#include "call.h"
zend_class_entry *grpc_ce_call_credentials;
#if PHP_MAJOR_VERSION >= 7
static zend_object_handlers call_credentials_ce_handlers;

@ -19,17 +19,9 @@
#ifndef NET_GRPC_PHP_GRPC_CALL_CREDENTIALS_H_
#define NET_GRPC_PHP_GRPC_CALL_CREDENTIALS_H_
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include "php.h"
#include "php_ini.h"
#include "ext/standard/info.h"
#include "php_grpc.h"
#include "grpc/grpc.h"
#include "grpc/grpc_security.h"
#include <grpc/grpc_security.h>
/* Class entry for the CallCredentials PHP class */
extern zend_class_entry *grpc_ce_call_credentials;

@ -18,13 +18,6 @@
#include "channel.h"
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include <php.h>
#include <php_ini.h>
#include <ext/standard/info.h>
#include <ext/standard/php_var.h>
#include <ext/standard/sha1.h>
#if PHP_MAJOR_VERSION < 7
@ -33,19 +26,13 @@
#include <zend_smart_str.h>
#endif
#include <ext/spl/spl_exceptions.h>
#include "php_grpc.h"
#include <zend_exceptions.h>
#include <stdbool.h>
#include <grpc/grpc.h>
#include <grpc/grpc_security.h>
#include <grpc/support/alloc.h>
#include "completion_queue.h"
#include "channel_credentials.h"
#include "server.h"
#include "timeval.h"
zend_class_entry *grpc_ce_channel;

@ -19,17 +19,8 @@
#ifndef NET_GRPC_PHP_GRPC_CHANNEL_H_
#define NET_GRPC_PHP_GRPC_CHANNEL_H_
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include <php.h>
#include <php_ini.h>
#include <ext/standard/info.h>
#include "php_grpc.h"
#include <grpc/grpc.h>
/* Class entry for the PHP Channel class */
extern zend_class_entry *grpc_ce_channel;

@ -17,27 +17,16 @@
*/
#include "channel_credentials.h"
#include "call_credentials.h"
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include <php.h>
#include <php_ini.h>
#include <ext/standard/info.h>
#include <ext/standard/sha1.h>
#include <ext/spl/spl_exceptions.h>
#include "channel.h"
#include "php_grpc.h"
#include <zend_exceptions.h>
#include <zend_hash.h>
#include <grpc/support/alloc.h>
#include <grpc/support/string_util.h>
#include <grpc/grpc.h>
#include <grpc/grpc_security.h>
#include "call_credentials.h"
#include "channel.h"
zend_class_entry *grpc_ce_channel_credentials;
#if PHP_MAJOR_VERSION >= 7

@ -19,17 +19,9 @@
#ifndef NET_GRPC_PHP_GRPC_CHANNEL_CREDENTIALS_H_
#define NET_GRPC_PHP_GRPC_CHANNEL_CREDENTIALS_H_
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include "php.h"
#include "php_ini.h"
#include "ext/standard/info.h"
#include "php_grpc.h"
#include "grpc/grpc.h"
#include "grpc/grpc_security.h"
#include <grpc/grpc_security.h>
/* Class entry for the ChannelCredentials PHP class */
extern zend_class_entry *grpc_ce_channel_credentials;

@ -18,8 +18,6 @@
#include "completion_queue.h"
#include <php.h>
grpc_completion_queue *completion_queue;
void grpc_php_init_completion_queue(TSRMLS_D) {

@ -16,6 +16,8 @@
*
*/
#include "php_grpc.h"
#include "call.h"
#include "channel.h"
#include "server.h"
@ -25,15 +27,6 @@
#include "server_credentials.h"
#include "completion_queue.h"
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include <php.h>
#include <php_ini.h>
#include <ext/standard/info.h>
#include "php_grpc.h"
ZEND_DECLARE_MODULE_GLOBALS(grpc)
static PHP_GINIT_FUNCTION(grpc);
HashTable grpc_persistent_list;

@ -20,8 +20,21 @@
#ifndef PHP_GRPC_H
#define PHP_GRPC_H
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include <stdbool.h>
#include <php.h>
#include <php_ini.h>
#include <ext/standard/info.h>
#include <grpc/grpc.h>
#include "php7_wrapper.h"
#include "version.h"
extern zend_module_entry grpc_module_entry;
#define phpext_grpc_ptr &grpc_module_entry
@ -37,11 +50,6 @@ extern zend_module_entry grpc_module_entry;
#include "TSRM.h"
#endif
#include "php.h"
#include "php7_wrapper.h"
#include "grpc/grpc.h"
#include "version.h"
/* These are all function declarations */
/* Code that runs at module initialization */
PHP_MINIT_FUNCTION(grpc);

@ -16,29 +16,17 @@
*
*/
#include "call.h"
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include "server.h"
#include <php.h>
#include <php_ini.h>
#include <ext/standard/info.h>
#include <ext/spl/spl_exceptions.h>
#include "php_grpc.h"
#include <zend_exceptions.h>
#include <stdbool.h>
#include <grpc/grpc.h>
#include <grpc/grpc_security.h>
#include <grpc/slice.h>
#include <grpc/support/alloc.h>
#include "call.h"
#include "completion_queue.h"
#include "server.h"
#include "channel.h"
#include "server_credentials.h"
#include "timeval.h"

@ -19,17 +19,8 @@
#ifndef NET_GRPC_PHP_GRPC_SERVER_H_
#define NET_GRPC_PHP_GRPC_SERVER_H_
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include <php.h>
#include <php_ini.h>
#include <ext/standard/info.h>
#include "php_grpc.h"
#include <grpc/grpc.h>
/* Class entry for the Server PHP class */
extern zend_class_entry *grpc_ce_server;

@ -18,21 +18,8 @@
#include "server_credentials.h"
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include <php.h>
#include <php_ini.h>
#include <ext/standard/info.h>
#include <ext/spl/spl_exceptions.h>
#include "php_grpc.h"
#include <zend_exceptions.h>
#include <zend_hash.h>
#include <grpc/grpc.h>
#include <grpc/grpc_security.h>
zend_class_entry *grpc_ce_server_credentials;
#if PHP_MAJOR_VERSION >= 7

@ -26,9 +26,9 @@
#include <php.h>
#include <php_ini.h>
#include <ext/standard/info.h>
#include "php_grpc.h"
#include <grpc/grpc.h>
#include <grpc/grpc_security.h>
/* Class entry for the Server_Credentials PHP class */

@ -18,23 +18,9 @@
#include "timeval.h"
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include <php.h>
#include <php_ini.h>
#include <ext/standard/info.h>
#include <ext/spl/spl_exceptions.h>
#include "php_grpc.h"
#include <zend_exceptions.h>
#include <stdbool.h>
#include <grpc/grpc.h>
#include <grpc/support/time.h>
zend_class_entry *grpc_ce_timeval;
#if PHP_MAJOR_VERSION >= 7
static zend_object_handlers timeval_ce_handlers;

@ -19,18 +19,8 @@
#ifndef NET_GRPC_PHP_GRPC_TIMEVAL_H_
#define NET_GRPC_PHP_GRPC_TIMEVAL_H_
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include <php.h>
#include <php_ini.h>
#include <ext/standard/info.h>
#include "php_grpc.h"
#include <grpc/grpc.h>
#include <grpc/support/time.h>
/* Class entry for the Timeval PHP Class */
extern zend_class_entry *grpc_ce_timeval;

Loading…
Cancel
Save