Skip to content

Commit 114a8ff

Browse files
committed
ext/ftp: Mark static functions as such
Removing missleading comment
1 parent 51fa97f commit 114a8ff

File tree

1 file changed

+14
-15
lines changed

1 file changed

+14
-15
lines changed

ext/ftp/ftp.c

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -692,7 +692,7 @@ int ftp_mlsd_parse_line(HashTable *ht, const char *input)
692692
return SUCCESS;
693693
}
694694

695-
int ftp_type(ftpbuf_t *ftp, ftptype_t type)
695+
static int ftp_type(ftpbuf_t *ftp, ftptype_t type)
696696
{
697697
const char *typechar;
698698

@@ -1178,8 +1178,7 @@ int ftp_site(ftpbuf_t *ftp, const char *cmd, const size_t cmd_len)
11781178
return 1;
11791179
}
11801180

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)
11831182
{
11841183
int size;
11851184
char *data;
@@ -1217,7 +1216,7 @@ int ftp_putcmd(ftpbuf_t *ftp, const char *cmd, const size_t cmd_len, const char
12171216
return 1;
12181217
}
12191218

1220-
int ftp_readline(ftpbuf_t *ftp)
1219+
static int ftp_readline(ftpbuf_t *ftp)
12211220
{
12221221
long size, rcvd;
12231222
char *data, *eol;
@@ -1267,7 +1266,7 @@ int ftp_readline(ftpbuf_t *ftp)
12671266
return 0;
12681267
}
12691268

1270-
int ftp_getresp(ftpbuf_t *ftp)
1269+
static int ftp_getresp(ftpbuf_t *ftp)
12711270
{
12721271
if (ftp == NULL) {
12731272
return 0;
@@ -1317,7 +1316,7 @@ static ssize_t my_recv_wrapper_with_restart(php_socket_t fd, void *buf, size_t s
13171316
return n;
13181317
}
13191318

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) {
13211320
#ifdef HAVE_FTP_SSL
13221321
int err;
13231322
bool retry = 0;
@@ -1400,7 +1399,7 @@ static int my_poll(php_socket_t fd, int events, int timeout) {
14001399
return n;
14011400
}
14021401

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)
14041403
{
14051404
zend_long size, sent;
14061405
int n;
@@ -1434,7 +1433,7 @@ int my_send(ftpbuf_t *ftp, php_socket_t s, void *buf, size_t len)
14341433
return len;
14351434
}
14361435

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)
14381437
{
14391438
int n, nr_bytes;
14401439
#ifdef HAVE_FTP_SSL
@@ -1510,7 +1509,7 @@ int my_recv(ftpbuf_t *ftp, php_socket_t s, void *buf, size_t len)
15101509
return (nr_bytes);
15111510
}
15121511

1513-
int data_available(ftpbuf_t *ftp, php_socket_t s)
1512+
static int data_available(ftpbuf_t *ftp, php_socket_t s)
15141513
{
15151514
int n;
15161515

@@ -1531,7 +1530,7 @@ int data_available(ftpbuf_t *ftp, php_socket_t s)
15311530
return 1;
15321531
}
15331532

1534-
int data_writeable(ftpbuf_t *ftp, php_socket_t s)
1533+
static int data_writeable(ftpbuf_t *ftp, php_socket_t s)
15351534
{
15361535
int n;
15371536

@@ -1552,7 +1551,7 @@ int data_writeable(ftpbuf_t *ftp, php_socket_t s)
15521551
return 1;
15531552
}
15541553

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)
15561555
{
15571556
int n;
15581557

@@ -1573,7 +1572,7 @@ int my_accept(ftpbuf_t *ftp, php_socket_t s, struct sockaddr *addr, socklen_t *a
15731572
return accept(s, addr, addrlen);
15741573
}
15751574

1576-
databuf_t* ftp_getdata(ftpbuf_t *ftp)
1575+
static databuf_t* ftp_getdata(ftpbuf_t *ftp)
15771576
{
15781577
int fd = -1;
15791578
databuf_t *data;
@@ -1703,7 +1702,7 @@ databuf_t* ftp_getdata(ftpbuf_t *ftp)
17031702
return NULL;
17041703
}
17051704

1706-
databuf_t* data_accept(databuf_t *data, ftpbuf_t *ftp)
1705+
static databuf_t* data_accept(databuf_t *data, ftpbuf_t *ftp)
17071706
{
17081707
php_sockaddr_storage addr;
17091708
socklen_t size;
@@ -1874,7 +1873,7 @@ static void ftp_ssl_shutdown(ftpbuf_t *ftp, php_socket_t fd, SSL *ssl_handle) {
18741873
}
18751874
#endif
18761875

1877-
void data_close(ftpbuf_t *ftp)
1876+
static void data_close(ftpbuf_t *ftp)
18781877
{
18791878
ZEND_ASSERT(ftp != NULL);
18801879
databuf_t *data = ftp->data;
@@ -1905,7 +1904,7 @@ void data_close(ftpbuf_t *ftp)
19051904
efree(data);
19061905
}
19071906

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)
19091908
{
19101909
php_stream *tmpstream = NULL;
19111910
databuf_t *data = NULL;

0 commit comments

Comments
 (0)