make Curl_handler_*_proxy definition static

This commit is contained in:
Yang Tse 2010-01-25 23:41:02 +00:00
parent f8b16e5ccb
commit 340ab2f87f
5 changed files with 14 additions and 22 deletions

View File

@ -201,7 +201,7 @@ const struct Curl_handler Curl_handler_ftps = {
* HTTP-proxyed FTP protocol handler. * HTTP-proxyed FTP protocol handler.
*/ */
const struct Curl_handler Curl_handler_ftp_proxy = { static const struct Curl_handler Curl_handler_ftp_proxy = {
"FTP", /* scheme */ "FTP", /* scheme */
ZERO_NULL, /* setup_connection */ ZERO_NULL, /* setup_connection */
Curl_http, /* do_it */ Curl_http, /* do_it */
@ -224,7 +224,7 @@ const struct Curl_handler Curl_handler_ftp_proxy = {
* HTTP-proxyed FTPS protocol handler. * HTTP-proxyed FTPS protocol handler.
*/ */
const struct Curl_handler Curl_handler_ftps_proxy = { static const struct Curl_handler Curl_handler_ftps_proxy = {
"FTPS", /* scheme */ "FTPS", /* scheme */
ZERO_NULL, /* setup_connection */ ZERO_NULL, /* setup_connection */
Curl_http, /* do_it */ Curl_http, /* do_it */

View File

@ -1,5 +1,5 @@
#ifndef __FTP_H #ifndef HEADER_CURL_FTP_H
#define __FTP_H #define HEADER_CURL_FTP_H
/*************************************************************************** /***************************************************************************
* _ _ ____ _ * _ _ ____ _
* Project ___| | | | _ \| | * Project ___| | | | _ \| |
@ -32,14 +32,6 @@ extern const struct Curl_handler Curl_handler_ftp;
extern const struct Curl_handler Curl_handler_ftps; extern const struct Curl_handler Curl_handler_ftps;
#endif #endif
#ifndef CURL_DISABLE_HTTP
extern const struct Curl_handler Curl_handler_ftp_proxy;
# ifdef USE_SSL
extern const struct Curl_handler Curl_handler_ftps_proxy;
# endif
#endif
CURLcode Curl_ftpsendf(struct connectdata *, const char *fmt, ...); CURLcode Curl_ftpsendf(struct connectdata *, const char *fmt, ...);
CURLcode Curl_GetFTPResponse(ssize_t *nread, struct connectdata *conn, CURLcode Curl_GetFTPResponse(ssize_t *nread, struct connectdata *conn,
int *ftpcode); int *ftpcode);
@ -146,4 +138,4 @@ struct ftp_conn {
char * server_os; /* The target server operating system. */ char * server_os; /* The target server operating system. */
}; };
#endif /* __FTP_H */ #endif /* HEADER_CURL_FTP_H */

View File

@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___ * | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____| * \___|\___/|_| \_\_____|
* *
* Copyright (C) 1998 - 2009, Daniel Stenberg, <daniel@haxx.se>, et al. * Copyright (C) 1998 - 2010, Daniel Stenberg, <daniel@haxx.se>, et al.
* *
* This software is licensed as described in the file COPYING, which * This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms * you should have received as part of this distribution. The terms
@ -160,7 +160,7 @@ const struct Curl_handler Curl_handler_imaps = {
* HTTP-proxyed IMAP protocol handler. * HTTP-proxyed IMAP protocol handler.
*/ */
const struct Curl_handler Curl_handler_imap_proxy = { static const struct Curl_handler Curl_handler_imap_proxy = {
"IMAP", /* scheme */ "IMAP", /* scheme */
ZERO_NULL, /* setup_connection */ ZERO_NULL, /* setup_connection */
Curl_http, /* do_it */ Curl_http, /* do_it */
@ -183,7 +183,7 @@ const struct Curl_handler Curl_handler_imap_proxy = {
* HTTP-proxyed IMAPS protocol handler. * HTTP-proxyed IMAPS protocol handler.
*/ */
const struct Curl_handler Curl_handler_imaps_proxy = { static const struct Curl_handler Curl_handler_imaps_proxy = {
"IMAPS", /* scheme */ "IMAPS", /* scheme */
ZERO_NULL, /* setup_connection */ ZERO_NULL, /* setup_connection */
Curl_http, /* do_it */ Curl_http, /* do_it */

View File

@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___ * | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____| * \___|\___/|_| \_\_____|
* *
* Copyright (C) 1998 - 2009, Daniel Stenberg, <daniel@haxx.se>, et al. * Copyright (C) 1998 - 2010, Daniel Stenberg, <daniel@haxx.se>, et al.
* *
* This software is licensed as described in the file COPYING, which * This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms * you should have received as part of this distribution. The terms
@ -161,7 +161,7 @@ const struct Curl_handler Curl_handler_pop3s = {
* HTTP-proxyed POP3 protocol handler. * HTTP-proxyed POP3 protocol handler.
*/ */
const struct Curl_handler Curl_handler_pop3_proxy = { static const struct Curl_handler Curl_handler_pop3_proxy = {
"POP3", /* scheme */ "POP3", /* scheme */
ZERO_NULL, /* setup_connection */ ZERO_NULL, /* setup_connection */
Curl_http, /* do_it */ Curl_http, /* do_it */
@ -184,7 +184,7 @@ const struct Curl_handler Curl_handler_pop3_proxy = {
* HTTP-proxyed POP3S protocol handler. * HTTP-proxyed POP3S protocol handler.
*/ */
const struct Curl_handler Curl_handler_pop3s_proxy = { static const struct Curl_handler Curl_handler_pop3s_proxy = {
"POP3S", /* scheme */ "POP3S", /* scheme */
ZERO_NULL, /* setup_connection */ ZERO_NULL, /* setup_connection */
Curl_http, /* do_it */ Curl_http, /* do_it */

View File

@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___ * | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____| * \___|\___/|_| \_\_____|
* *
* Copyright (C) 1998 - 2009, Daniel Stenberg, <daniel@haxx.se>, et al. * Copyright (C) 1998 - 2010, Daniel Stenberg, <daniel@haxx.se>, et al.
* *
* This software is licensed as described in the file COPYING, which * This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms * you should have received as part of this distribution. The terms
@ -159,7 +159,7 @@ const struct Curl_handler Curl_handler_smtps = {
* HTTP-proxyed SMTP protocol handler. * HTTP-proxyed SMTP protocol handler.
*/ */
const struct Curl_handler Curl_handler_smtp_proxy = { static const struct Curl_handler Curl_handler_smtp_proxy = {
"SMTP", /* scheme */ "SMTP", /* scheme */
ZERO_NULL, /* setup_connection */ ZERO_NULL, /* setup_connection */
Curl_http, /* do_it */ Curl_http, /* do_it */
@ -182,7 +182,7 @@ const struct Curl_handler Curl_handler_smtp_proxy = {
* HTTP-proxyed SMTPS protocol handler. * HTTP-proxyed SMTPS protocol handler.
*/ */
const struct Curl_handler Curl_handler_smtps_proxy = { static const struct Curl_handler Curl_handler_smtps_proxy = {
"SMTPS", /* scheme */ "SMTPS", /* scheme */
ZERO_NULL, /* setup_connection */ ZERO_NULL, /* setup_connection */
Curl_http, /* do_it */ Curl_http, /* do_it */