From aabc50c1441a4cef8b1cbd413db24e8780682546 Mon Sep 17 00:00:00 2001 From: YuQing <384681@qq.com> Date: Fri, 22 Nov 2019 09:53:58 +0800 Subject: [PATCH] add .gitignore --- .gitignore | 74 +++++++++++++++++++++++++++++++++++++++++++++++++++ src/sockopt.c | 2 +- src/sockopt.h | 2 +- 3 files changed, 76 insertions(+), 2 deletions(-) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..642d5a1 --- /dev/null +++ b/.gitignore @@ -0,0 +1,74 @@ +# Makefile.in +src/Makefile + +# Prerequisites +*.d + +# Compiled Object files +*.slo +*.lo +*.o +*.obj + +# Precompiled Headers +*.gch +*.pch + +# Compiled Dynamic libraries +*.so +*.dylib +*.dSYM +*.dll + +# Compiled Static libraries +*.lai +*.la +*.a +*.lib + +# Executables +*.out +src/_os_define.h +src/tests/test_allocator +src/tests/test_blocked_queue +src/tests/test_char_convert +src/tests/test_char_convert_loader +src/tests/test_crc32 +src/tests/test_id_generator +src/tests/test_ini_parser +src/tests/test_json_parser +src/tests/test_logger +src/tests/test_mblock +src/tests/test_multi_skiplist +src/tests/test_sched_thread +src/tests/test_skiplist +src/tests/test_skiplist_set +src/tests/test_thourands_seperator + +# other +php-fastcommon/.deps +php-fastcommon/.libs/ + +php-fastcommon/Makefile +php-fastcommon/Makefile.fragments +php-fastcommon/Makefile.global +php-fastcommon/Makefile.objects +php-fastcommon/acinclude.m4 +php-fastcommon/aclocal.m4 +php-fastcommon/autom4te.cache/ +php-fastcommon/build/ +php-fastcommon/config.guess +php-fastcommon/config.h +php-fastcommon/config.h.in +php-fastcommon/config.log +php-fastcommon/config.nice +php-fastcommon/config.status +php-fastcommon/config.sub +php-fastcommon/configure +php-fastcommon/configure.ac +php-fastcommon/install-sh +php-fastcommon/libtool +php-fastcommon/ltmain.sh +php-fastcommon/missing +php-fastcommon/mkinstalldirs +php-fastcommon/run-tests.php diff --git a/src/sockopt.c b/src/sockopt.c index 8dc5dd6..ae0eee2 100644 --- a/src/sockopt.c +++ b/src/sockopt.c @@ -1098,7 +1098,7 @@ int tcprecvfile(int sock, const char *filename, const int64_t file_bytes, \ recv_bytes = remain_bytes; } - result = recv_func(sock, buff, recv_bytes, \ + result = recv_func(sock, buff, recv_bytes, timeout, &count); if (result != 0) { diff --git a/src/sockopt.h b/src/sockopt.h index 06bfebd..291e54f 100644 --- a/src/sockopt.h +++ b/src/sockopt.h @@ -19,7 +19,7 @@ #include #include "common_define.h" -#define FAST_WRITE_BUFF_SIZE 256 * 1024 +#define FAST_WRITE_BUFF_SIZE (256 * 1024) typedef struct fast_if_config { char name[IF_NAMESIZE]; //if name