@@ -692,7 +692,7 @@ int ftp_mlsd_parse_line(HashTable *ht, const char *input)
692
692
return SUCCESS ;
693
693
}
694
694
695
- int ftp_type (ftpbuf_t * ftp , ftptype_t type )
695
+ static int ftp_type (ftpbuf_t * ftp , ftptype_t type )
696
696
{
697
697
const char * typechar ;
698
698
@@ -1178,8 +1178,7 @@ int ftp_site(ftpbuf_t *ftp, const char *cmd, const size_t cmd_len)
1178
1178
return 1 ;
1179
1179
}
1180
1180
1181
- /* static functions */
1182
- int ftp_putcmd (ftpbuf_t * ftp , const char * cmd , const size_t cmd_len , const char * args , const size_t args_len )
1181
+ static int ftp_putcmd (ftpbuf_t * ftp , const char * cmd , const size_t cmd_len , const char * args , const size_t args_len )
1183
1182
{
1184
1183
int size ;
1185
1184
char * data ;
@@ -1217,7 +1216,7 @@ int ftp_putcmd(ftpbuf_t *ftp, const char *cmd, const size_t cmd_len, const char
1217
1216
return 1 ;
1218
1217
}
1219
1218
1220
- int ftp_readline (ftpbuf_t * ftp )
1219
+ static int ftp_readline (ftpbuf_t * ftp )
1221
1220
{
1222
1221
long size , rcvd ;
1223
1222
char * data , * eol ;
@@ -1267,7 +1266,7 @@ int ftp_readline(ftpbuf_t *ftp)
1267
1266
return 0 ;
1268
1267
}
1269
1268
1270
- int ftp_getresp (ftpbuf_t * ftp )
1269
+ static int ftp_getresp (ftpbuf_t * ftp )
1271
1270
{
1272
1271
if (ftp == NULL ) {
1273
1272
return 0 ;
@@ -1317,7 +1316,7 @@ static ssize_t my_recv_wrapper_with_restart(php_socket_t fd, void *buf, size_t s
1317
1316
return n ;
1318
1317
}
1319
1318
1320
- int single_send (ftpbuf_t * ftp , php_socket_t s , void * buf , size_t size ) {
1319
+ static int single_send (ftpbuf_t * ftp , php_socket_t s , void * buf , size_t size ) {
1321
1320
#ifdef HAVE_FTP_SSL
1322
1321
int err ;
1323
1322
bool retry = 0 ;
@@ -1400,7 +1399,7 @@ static int my_poll(php_socket_t fd, int events, int timeout) {
1400
1399
return n ;
1401
1400
}
1402
1401
1403
- int my_send (ftpbuf_t * ftp , php_socket_t s , void * buf , size_t len )
1402
+ static int my_send (ftpbuf_t * ftp , php_socket_t s , void * buf , size_t len )
1404
1403
{
1405
1404
zend_long size , sent ;
1406
1405
int n ;
@@ -1434,7 +1433,7 @@ int my_send(ftpbuf_t *ftp, php_socket_t s, void *buf, size_t len)
1434
1433
return len ;
1435
1434
}
1436
1435
1437
- int my_recv (ftpbuf_t * ftp , php_socket_t s , void * buf , size_t len )
1436
+ static int my_recv (ftpbuf_t * ftp , php_socket_t s , void * buf , size_t len )
1438
1437
{
1439
1438
int n , nr_bytes ;
1440
1439
#ifdef HAVE_FTP_SSL
@@ -1510,7 +1509,7 @@ int my_recv(ftpbuf_t *ftp, php_socket_t s, void *buf, size_t len)
1510
1509
return (nr_bytes );
1511
1510
}
1512
1511
1513
- int data_available (ftpbuf_t * ftp , php_socket_t s )
1512
+ static int data_available (ftpbuf_t * ftp , php_socket_t s )
1514
1513
{
1515
1514
int n ;
1516
1515
@@ -1531,7 +1530,7 @@ int data_available(ftpbuf_t *ftp, php_socket_t s)
1531
1530
return 1 ;
1532
1531
}
1533
1532
1534
- int data_writeable (ftpbuf_t * ftp , php_socket_t s )
1533
+ static int data_writeable (ftpbuf_t * ftp , php_socket_t s )
1535
1534
{
1536
1535
int n ;
1537
1536
@@ -1552,7 +1551,7 @@ int data_writeable(ftpbuf_t *ftp, php_socket_t s)
1552
1551
return 1 ;
1553
1552
}
1554
1553
1555
- int my_accept (ftpbuf_t * ftp , php_socket_t s , struct sockaddr * addr , socklen_t * addrlen )
1554
+ static int my_accept (ftpbuf_t * ftp , php_socket_t s , struct sockaddr * addr , socklen_t * addrlen )
1556
1555
{
1557
1556
int n ;
1558
1557
@@ -1573,7 +1572,7 @@ int my_accept(ftpbuf_t *ftp, php_socket_t s, struct sockaddr *addr, socklen_t *a
1573
1572
return accept (s , addr , addrlen );
1574
1573
}
1575
1574
1576
- databuf_t * ftp_getdata (ftpbuf_t * ftp )
1575
+ static databuf_t * ftp_getdata (ftpbuf_t * ftp )
1577
1576
{
1578
1577
int fd = -1 ;
1579
1578
databuf_t * data ;
@@ -1703,7 +1702,7 @@ databuf_t* ftp_getdata(ftpbuf_t *ftp)
1703
1702
return NULL ;
1704
1703
}
1705
1704
1706
- databuf_t * data_accept (databuf_t * data , ftpbuf_t * ftp )
1705
+ static databuf_t * data_accept (databuf_t * data , ftpbuf_t * ftp )
1707
1706
{
1708
1707
php_sockaddr_storage addr ;
1709
1708
socklen_t size ;
@@ -1874,7 +1873,7 @@ static void ftp_ssl_shutdown(ftpbuf_t *ftp, php_socket_t fd, SSL *ssl_handle) {
1874
1873
}
1875
1874
#endif
1876
1875
1877
- void data_close (ftpbuf_t * ftp )
1876
+ static void data_close (ftpbuf_t * ftp )
1878
1877
{
1879
1878
ZEND_ASSERT (ftp != NULL );
1880
1879
databuf_t * data = ftp -> data ;
@@ -1905,7 +1904,7 @@ void data_close(ftpbuf_t *ftp)
1905
1904
efree (data );
1906
1905
}
1907
1906
1908
- char * * ftp_genlist (ftpbuf_t * ftp , const char * cmd , const size_t cmd_len , const char * path , const size_t path_len )
1907
+ static char * * ftp_genlist (ftpbuf_t * ftp , const char * cmd , const size_t cmd_len , const char * path , const size_t path_len )
1909
1908
{
1910
1909
php_stream * tmpstream = NULL ;
1911
1910
databuf_t * data = NULL ;
0 commit comments