mirror of
https://github.com/asterisk/asterisk.git
synced 2025-10-20 11:43:52 +00:00
Get rid of the casts that cause warnings on OpenBSD. The compiler is errantly
detecting warnings when we redefine a structure each time it is used, even though the structure is identical. Reported by: mvanbaak, via #asterisk-dev git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@141507 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
@@ -155,7 +155,7 @@ static int parse_curlopt_key(const char *name, CURLoption *key, enum optiontype
|
|||||||
static int acf_curlopt_write(struct ast_channel *chan, const char *cmd, char *name, const char *value)
|
static int acf_curlopt_write(struct ast_channel *chan, const char *cmd, char *name, const char *value)
|
||||||
{
|
{
|
||||||
struct ast_datastore *store;
|
struct ast_datastore *store;
|
||||||
AST_LIST_HEAD(global_curl_info, curl_settings) *list;
|
struct global_curl_info *list;
|
||||||
struct curl_settings *cur, *new = NULL;
|
struct curl_settings *cur, *new = NULL;
|
||||||
CURLoption key;
|
CURLoption key;
|
||||||
enum optiontype ot;
|
enum optiontype ot;
|
||||||
@@ -181,7 +181,7 @@ static int acf_curlopt_write(struct ast_channel *chan, const char *cmd, char *na
|
|||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
/* Populate the global structure */
|
/* Populate the global structure */
|
||||||
list = (struct global_curl_info *)&global_curl_info;
|
list = &global_curl_info;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!parse_curlopt_key(name, &key, &ot)) {
|
if (!parse_curlopt_key(name, &key, &ot)) {
|
||||||
@@ -274,7 +274,7 @@ yuck:
|
|||||||
static int acf_curlopt_read(struct ast_channel *chan, const char *cmd, char *data, char *buf, size_t len)
|
static int acf_curlopt_read(struct ast_channel *chan, const char *cmd, char *data, char *buf, size_t len)
|
||||||
{
|
{
|
||||||
struct ast_datastore *store;
|
struct ast_datastore *store;
|
||||||
AST_LIST_HEAD(global_curl_info, curl_settings) *list[2] = { (struct global_curl_info *)&global_curl_info, NULL };
|
struct global_curl_info *list[2] = { &global_curl_info, NULL };
|
||||||
struct curl_settings *cur;
|
struct curl_settings *cur;
|
||||||
CURLoption key;
|
CURLoption key;
|
||||||
enum optiontype ot;
|
enum optiontype ot;
|
||||||
@@ -287,7 +287,7 @@ static int acf_curlopt_read(struct ast_channel *chan, const char *cmd, char *dat
|
|||||||
|
|
||||||
if (chan && (store = ast_channel_datastore_find(chan, &curl_info, NULL))) {
|
if (chan && (store = ast_channel_datastore_find(chan, &curl_info, NULL))) {
|
||||||
list[0] = store->data;
|
list[0] = store->data;
|
||||||
list[1] = (struct global_curl_info *)&global_curl_info;
|
list[1] = &global_curl_info;
|
||||||
}
|
}
|
||||||
|
|
||||||
for (i = 0; i < 2; i++) {
|
for (i = 0; i < 2; i++) {
|
||||||
|
Reference in New Issue
Block a user