kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-04-27 20:59:50 +00:00
Code Issues Projects Releases Wiki Activity

FS-11931: [mod_http_cache] Fix regression, use SWITCH_MOD_DECLARE() in modules instead of SWITCH_DECLARE().

Browse Source
This commit is contained in:
Andrey Volk 2019-07-23 12:48:31 +04:00
parent aa6844ae00
commit bbbaf7e99e
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/mod/applications/mod_http_cache/aws.c
View File

@ -107,7 +107,7 @@ static char *aws_s3_signature(char *signature, int signature_length, const char
* @param expires seconds since the epoch * @param expires seconds since the epoch
* @return presigned_url * @return presigned_url
*/ */
SWITCH_DECLARE(char *) aws_s3_presigned_url_create(const char *verb, const char *url, const char *base_domain, const char *content_type, const char *content_md5, const char *aws_access_key_id, const char *aws_secret_access_key, const char *expires) SWITCH_MOD_DECLARE(char *) aws_s3_presigned_url_create(const char *verb, const char *url, const char *base_domain, const char *content_type, const char *content_md5, const char *aws_access_key_id, const char *aws_secret_access_key, const char *expires)
{ {
char signature[S3_SIGNATURE_LENGTH_MAX]; char signature[S3_SIGNATURE_LENGTH_MAX];
char signature_url_encoded[S3_SIGNATURE_LENGTH_MAX]; char signature_url_encoded[S3_SIGNATURE_LENGTH_MAX];
@ -162,7 +162,7 @@ static char *aws_s3_authentication_create(const char *verb, const char *url, con
return switch_mprintf("AWS %s:%s", aws_access_key_id, signature); return switch_mprintf("AWS %s:%s", aws_access_key_id, signature);
} }
SWITCH_DECLARE(switch_status_t) aws_s3_config_profile(switch_xml_t xml, http_profile_t *profile) SWITCH_MOD_DECLARE(switch_status_t) aws_s3_config_profile(switch_xml_t xml, http_profile_t *profile)
{ {
switch_status_t status = SWITCH_STATUS_SUCCESS; switch_status_t status = SWITCH_STATUS_SUCCESS;
switch_xml_t base_domain_xml = switch_xml_child(xml, "base-domain"); switch_xml_t base_domain_xml = switch_xml_child(xml, "base-domain");
@ -217,7 +217,7 @@ SWITCH_DECLARE(switch_status_t) aws_s3_config_profile(switch_xml_t xml, http_pro
* @param url * @param url
* @return updated headers * @return updated headers
*/ */
SWITCH_DECLARE(switch_curl_slist_t) *aws_s3_append_headers(http_profile_t *profile, switch_curl_slist_t *headers, SWITCH_MOD_DECLARE(switch_curl_slist_t*) aws_s3_append_headers(http_profile_t *profile, switch_curl_slist_t *headers,
const char *verb, unsigned int content_length, const char *content_type, const char *url, const unsigned int block_num, char **query_string) const char *verb, unsigned int content_length, const char *content_type, const char *url, const unsigned int block_num, char **query_string)
{ {
char date[256]; char date[256];

6
src/mod/applications/mod_http_cache/aws.h
View File

@ -36,10 +36,10 @@
/* (SHA1_LENGTH * 1.37 base64 bytes per byte * 3 url-encoded bytes per byte) */ /* (SHA1_LENGTH * 1.37 base64 bytes per byte * 3 url-encoded bytes per byte) */
#define S3_SIGNATURE_LENGTH_MAX 83 #define S3_SIGNATURE_LENGTH_MAX 83
SWITCH_DECLARE(switch_curl_slist_t) *aws_s3_append_headers(http_profile_t *profile, switch_curl_slist_t *headers, SWITCH_MOD_DECLARE(switch_curl_slist_t*) aws_s3_append_headers(http_profile_t *profile, switch_curl_slist_t *headers,
const char *verb, unsigned int content_length, const char *content_type, const char *url, const unsigned int block_num, char **query_string); const char *verb, unsigned int content_length, const char *content_type, const char *url, const unsigned int block_num, char **query_string);
SWITCH_DECLARE(switch_status_t) aws_s3_config_profile(switch_xml_t xml, http_profile_t *profile); SWITCH_MOD_DECLARE(switch_status_t) aws_s3_config_profile(switch_xml_t xml, http_profile_t *profile);
SWITCH_DECLARE(char *) aws_s3_presigned_url_create(const char *verb, const char *url, const char *base_domain, const char *content_type, const char *content_md5, const char *aws_access_key_id, const char *aws_secret_access_key, const char *expires); SWITCH_MOD_DECLARE(char *) aws_s3_presigned_url_create(const char *verb, const char *url, const char *base_domain, const char *content_type, const char *content_md5, const char *aws_access_key_id, const char *aws_secret_access_key, const char *expires);
#endif #endif

2
src/mod/applications/mod_http_cache/common.c
View File

@ -63,7 +63,7 @@ static char *my_strrstr(const char *haystack, const char *needle)
return NULL; return NULL;
} }
SWITCH_DECLARE(void) parse_url(char *url, const char *base_domain, const char *default_base_domain, char **bucket, char **object) SWITCH_MOD_DECLARE(void) parse_url(char *url, const char *base_domain, const char *default_base_domain, char **bucket, char **object)
{ {
char *bucket_start = NULL; char *bucket_start = NULL;
char *bucket_end; char *bucket_end;

2
src/mod/applications/mod_http_cache/common.h
View File

@ -23,7 +23,7 @@ struct http_profile {
typedef struct http_profile http_profile_t; typedef struct http_profile http_profile_t;
SWITCH_DECLARE(void) parse_url(char *url, const char *base_domain, const char *default_base_domain, char **bucket, char **object); SWITCH_MOD_DECLARE(void) parse_url(char *url, const char *base_domain, const char *default_base_domain, char **bucket, char **object);
#endif #endif