diff options
Diffstat (limited to 'funcs')
-rw-r--r-- | funcs/func_cdr.c | 4 | ||||
-rw-r--r-- | funcs/func_channel.c | 2 | ||||
-rw-r--r-- | funcs/func_curl.c | 4 | ||||
-rw-r--r-- | funcs/func_cut.c | 4 | ||||
-rw-r--r-- | funcs/func_enum.c | 4 | ||||
-rw-r--r-- | funcs/func_lock.c | 2 | ||||
-rw-r--r-- | funcs/func_odbc.c | 8 | ||||
-rw-r--r-- | funcs/func_realtime.c | 10 | ||||
-rw-r--r-- | funcs/func_vmcount.c | 2 |
9 files changed, 20 insertions, 20 deletions
diff --git a/funcs/func_cdr.c b/funcs/func_cdr.c index 6c80e4f93..2e55d7a0b 100644 --- a/funcs/func_cdr.c +++ b/funcs/func_cdr.c @@ -163,12 +163,12 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") </function> ***/ -enum { +enum cdr_option_flags { OPT_RECURSIVE = (1 << 0), OPT_UNPARSED = (1 << 1), OPT_LAST = (1 << 2), OPT_SKIPLOCKED = (1 << 3), -} cdr_option_flags; +}; AST_APP_OPTIONS(cdr_func_options, { AST_APP_OPTION('l', OPT_LAST), diff --git a/funcs/func_channel.c b/funcs/func_channel.c index b4aa23dd8..5d81ad980 100644 --- a/funcs/func_channel.c +++ b/funcs/func_channel.c @@ -227,7 +227,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") ast_channel_unlock(chan); \ } while (0) -char *transfercapability_table[0x20] = { +static const char * const transfercapability_table[0x20] = { "SPEECH", "UNK", "UNK", "UNK", "UNK", "UNK", "UNK", "UNK", "DIGITAL", "RESTRICTED_DIGITAL", "UNK", "UNK", "UNK", "UNK", "UNK", "UNK", "3K1AUDIO", "DIGITAL_W_TONES", "UNK", "UNK", "UNK", "UNK", "UNK", "UNK", diff --git a/funcs/func_curl.c b/funcs/func_curl.c index 482502558..96af9b468 100644 --- a/funcs/func_curl.c +++ b/funcs/func_curl.c @@ -569,7 +569,7 @@ static int acf_curl2_exec(struct ast_channel *chan, const char *cmd, char *info, return acf_curl_helper(chan, cmd, info, NULL, buf, len); } -struct ast_custom_function acf_curl = { +static struct ast_custom_function acf_curl = { .name = "CURL", .synopsis = "Retrieves the contents of a URL", .syntax = "CURL(url[,post-data])", @@ -580,7 +580,7 @@ struct ast_custom_function acf_curl = { .read2 = acf_curl2_exec, }; -struct ast_custom_function acf_curlopt = { +static struct ast_custom_function acf_curlopt = { .name = "CURLOPT", .synopsis = "Set options for use with the CURL() function", .syntax = "CURLOPT(<option>)", diff --git a/funcs/func_cut.c b/funcs/func_cut.c index 9c7c530f4..bd88fc2e9 100644 --- a/funcs/func_cut.c +++ b/funcs/func_cut.c @@ -305,12 +305,12 @@ static int acf_cut_exec2(struct ast_channel *chan, const char *cmd, char *data, return ret; } -struct ast_custom_function acf_sort = { +static struct ast_custom_function acf_sort = { .name = "SORT", .read = acf_sort_exec, }; -struct ast_custom_function acf_cut = { +static struct ast_custom_function acf_cut = { .name = "CUT", .read = acf_cut_exec, .read2 = acf_cut_exec2, diff --git a/funcs/func_enum.c b/funcs/func_enum.c index 525c935f6..698962135 100644 --- a/funcs/func_enum.c +++ b/funcs/func_enum.c @@ -216,7 +216,7 @@ static int function_enum(struct ast_channel *chan, const char *cmd, char *data, return 0; } -unsigned int enum_datastore_id; +static unsigned int enum_datastore_id; struct enum_result_datastore { struct enum_context *context; @@ -243,7 +243,7 @@ static void erds_destroy_cb(void *data) erds_destroy(erds); } -const struct ast_datastore_info enum_result_datastore_info = { +static const struct ast_datastore_info enum_result_datastore_info = { .type = "ENUMQUERY", .destroy = erds_destroy_cb, }; diff --git a/funcs/func_lock.c b/funcs/func_lock.c index de8377a9c..1d2f8940e 100644 --- a/funcs/func_lock.c +++ b/funcs/func_lock.c @@ -84,7 +84,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") -AST_LIST_HEAD_STATIC(locklist, lock_frame); +static AST_LIST_HEAD_STATIC(locklist, lock_frame); static void lock_free(void *data); static int unloading = 0; diff --git a/funcs/func_odbc.c b/funcs/func_odbc.c index 85fdd09b4..8bb744f62 100644 --- a/funcs/func_odbc.c +++ b/funcs/func_odbc.c @@ -99,10 +99,10 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") static char *config = "func_odbc.conf"; -enum { +enum odbc_option_flags { OPT_ESCAPECOMMAS = (1 << 0), OPT_MULTIROW = (1 << 1), -} odbc_option_flags; +}; struct acf_odbc_query { AST_RWLIST_ENTRY(acf_odbc_query) list; @@ -118,7 +118,7 @@ struct acf_odbc_query { static void odbc_datastore_free(void *data); -struct ast_datastore_info odbc_info = { +static struct ast_datastore_info odbc_info = { .type = "FUNC_ODBC", .destroy = odbc_datastore_free, }; @@ -135,7 +135,7 @@ struct odbc_datastore { char names[0]; }; -AST_RWLIST_HEAD_STATIC(queries, acf_odbc_query); +static AST_RWLIST_HEAD_STATIC(queries, acf_odbc_query); static int resultcount = 0; diff --git a/funcs/func_realtime.c b/funcs/func_realtime.c index 065864511..b451f72ca 100644 --- a/funcs/func_realtime.c +++ b/funcs/func_realtime.c @@ -410,29 +410,29 @@ static int function_realtime_readdestroy(struct ast_channel *chan, const char *c return 0; } -struct ast_custom_function realtime_function = { +static struct ast_custom_function realtime_function = { .name = "REALTIME", .read = function_realtime_read, .write = function_realtime_write, }; -struct ast_custom_function realtimefield_function = { +static struct ast_custom_function realtimefield_function = { .name = "REALTIME_FIELD", .read = realtimefield_read, .write = function_realtime_write, }; -struct ast_custom_function realtimehash_function = { +static struct ast_custom_function realtimehash_function = { .name = "REALTIME_HASH", .read = realtimefield_read, }; -struct ast_custom_function realtime_store_function = { +static struct ast_custom_function realtime_store_function = { .name = "REALTIME_STORE", .write = function_realtime_store, }; -struct ast_custom_function realtime_destroy_function = { +static struct ast_custom_function realtime_destroy_function = { .name = "REALTIME_DESTROY", .read = function_realtime_readdestroy, }; diff --git a/funcs/func_vmcount.c b/funcs/func_vmcount.c index 550070891..f409e75ce 100644 --- a/funcs/func_vmcount.c +++ b/funcs/func_vmcount.c @@ -94,7 +94,7 @@ static int acf_vmcount_exec(struct ast_channel *chan, const char *cmd, char *arg return 0; } -struct ast_custom_function acf_vmcount = { +static struct ast_custom_function acf_vmcount = { .name = "VMCOUNT", .read = acf_vmcount_exec, .read_max = 12, |