pdxx
/
fastdfs
mirror of https://github.com/happyfish100/fastdfs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

test programs compile OK.

pull/585/head
YuQing 2022-09-14 12:46:40 +08:00
parent 522bd50522
commit 6befb09fe5
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
HISTORY
View File

@ -1,6 +1,6 @@
Version 6.09 2022-09-11 Version 6.09 2022-09-11
* use libfastcommon V1.60 and libserverframe 1.1.18 * use libfastcommon V1.60 and libserverframe 1.1.19
Version 6.08 2022-06-21 Version 6.08 2022-06-21
* use libfastcommon V1.56 * use libfastcommon V1.56

6
test/Makefile
View File

@ -2,11 +2,11 @@
COMPILE = $(CC) -g -Wall -O -D_FILE_OFFSET_BITS=64 -DDEBUG COMPILE = $(CC) -g -Wall -O -D_FILE_OFFSET_BITS=64 -DDEBUG
INC_PATH = -I/usr/local/include INC_PATH = -I/usr/local/include
LIB_PATH = -L/usr/local/lib -lfdfsclient -lfastcommon LIB_PATH = -L/usr/local/lib -lfdfsclient -lfastcommon -lserverframe
TARGET_PATH = $(TARGET_PREFIX)/bin TARGET_PATH = $(TARGET_PREFIX)/bin
SHARED_OBJS = common_func.o dfs_func.o #SHARED_OBJS = common_func.o dfs_func.o
#SHARED_OBJS = common_func.o dfs_func_pc.o SHARED_OBJS = common_func.o dfs_func_pc.o
ALL_OBJS = $(SHARED_OBJS) ALL_OBJS = $(SHARED_OBJS)

4
test/dfs_func_pc.c
View File

@ -28,7 +28,7 @@ static ConnectionInfo *getConnectedStorageServer(
if (pServer->sock < 0) if (pServer->sock < 0)
{ {
*err_no = conn_pool_connect_server(pServer, \ *err_no = conn_pool_connect_server(pServer, \
g_fdfs_connect_timeout); SF_G_CONNECT_TIMEOUT);
if (*err_no != 0) if (*err_no != 0)
{ {
return NULL; return NULL;
@ -47,7 +47,7 @@ static ConnectionInfo *getConnectedStorageServer(
memcpy(pServer, pStorageServer, sizeof(ConnectionInfo)); memcpy(pServer, pStorageServer, sizeof(ConnectionInfo));
pServer->sock = -1; pServer->sock = -1;
if ((*err_no=conn_pool_connect_server(pServer, \ if ((*err_no=conn_pool_connect_server(pServer, \
g_fdfs_connect_timeout)) != 0) SF_G_CONNECT_TIMEOUT)) != 0)
{ {
return NULL; return NULL;
} }