Index: apps/app_alarmreceiver.c
===================================================================
--- apps/app_alarmreceiver.c (revision 398635)
+++ apps/app_alarmreceiver.c (working copy)
@@ -128,7 +128,7 @@
#define ADEMCO_AUDIO_CALL_NEXT "606"
-struct {
+static struct {
char digit;
char weight;
} digits_mapping[] = { {'0', 10}, {'1', 1} , {'2', 2}, {'3', 3}, {'4', 4}, {'5', 5},
@@ -142,7 +142,7 @@
typedef struct event_node event_node_t;
-struct timeval call_start_time;
+static struct timeval call_start_time;
static const char app[] = "AlarmReceiver";
/*** DOCUMENTATION
Index: apps/app_skel.c
===================================================================
--- apps/app_skel.c (revision 398635)
+++ apps/app_skel.c (working copy)
@@ -248,7 +248,7 @@
.category = "^general$",
};
-struct aco_type *global_options[] = ACO_TYPES(&global_option);
+static struct aco_type *global_options[] = ACO_TYPES(&global_option);
/*! \brief An aco_type structure to link the "sounds" category to the skel_global_config type */
static struct aco_type sound_option = {
@@ -259,7 +259,7 @@
.category = "^sounds$",
};
-struct aco_type *sound_options[] = ACO_TYPES(&sound_option);
+static struct aco_type *sound_options[] = ACO_TYPES(&sound_option);
/*! \brief An aco_type structure to link the everything but the "general" and "sounds" categories to the skel_level type */
static struct aco_type level_option = {
@@ -272,9 +272,9 @@
.item_offset = offsetof(struct skel_config, levels),
};
-struct aco_type *level_options[] = ACO_TYPES(&level_option);
+static struct aco_type *level_options[] = ACO_TYPES(&level_option);
-struct aco_file app_skel_conf = {
+static struct aco_file app_skel_conf = {
.filename = "app_skel.conf",
.types = ACO_TYPES(&global_option, &sound_option, &level_option),
};
Index: main/bridge_after.c
===================================================================
--- main/bridge_after.c (revision 398635)
+++ main/bridge_after.c (working copy)
@@ -295,7 +295,7 @@
return 0;
}
-const char *reason_strings[] = {
+static const char *reason_strings[] = {
[AST_BRIDGE_AFTER_CB_REASON_DESTROY] = "Channel destroyed (hungup)",
[AST_BRIDGE_AFTER_CB_REASON_REPLACED] = "Callback was replaced",
[AST_BRIDGE_AFTER_CB_REASON_MASQUERADE] = "Channel masqueraded",
Index: main/bridge_basic.c
===================================================================
--- main/bridge_basic.c (revision 398635)
+++ main/bridge_basic.c (working copy)
@@ -1261,7 +1261,7 @@
*
* Used for debugging purposes
*/
-const char *stimulus_strs[] = {
+static const char *stimulus_strs[] = {
[STIMULUS_NONE] = "None",
[STIMULUS_TRANSFEREE_HANGUP] = "Transferee Hangup",
[STIMULUS_TRANSFERER_HANGUP] = "Transferer Hangup",
@@ -3140,8 +3140,8 @@
}
struct ast_bridge_methods ast_bridge_basic_v_table;
-struct ast_bridge_methods personality_normal_v_table;
-struct ast_bridge_methods personality_atxfer_v_table;
+static struct ast_bridge_methods personality_normal_v_table;
+static struct ast_bridge_methods personality_atxfer_v_table;
static void bridge_basic_change_personality(struct ast_bridge *bridge,
enum bridge_basic_personality_type type, void *user_data)
Index: main/cdr.c
===================================================================
--- main/cdr.c (revision 398635)
+++ main/cdr.c (working copy)
@@ -530,7 +530,7 @@
* * \ref bridge_state_fn_table
* * \ref finalized_state_fn_table
*/
-struct cdr_object_fn_table single_state_fn_table = {
+static struct cdr_object_fn_table single_state_fn_table = {
.name = "Single",
.init_function = single_state_init_function,
.process_party_a = base_process_party_a,
@@ -561,7 +561,7 @@
* * \ref bridge_state_fn_table
* * \ref finalized_state_fn_table
*/
-struct cdr_object_fn_table dial_state_fn_table = {
+static struct cdr_object_fn_table dial_state_fn_table = {
.name = "Dial",
.process_party_a = base_process_party_a,
.process_party_b = dial_state_process_party_b,
@@ -594,7 +594,7 @@
* * \ref bridge_state_fn_table
* * \ref finalized_state_fn_table
*/
-struct cdr_object_fn_table dialed_pending_state_fn_table = {
+static struct cdr_object_fn_table dialed_pending_state_fn_table = {
.name = "DialedPending",
.process_party_a = dialed_pending_state_process_party_a,
.process_dial_begin = dialed_pending_state_process_dial_begin,
@@ -616,7 +616,7 @@
* A \ref cdr_object from this state can go to:
* * \ref finalized_state_fn_table
*/
-struct cdr_object_fn_table bridge_state_fn_table = {
+static struct cdr_object_fn_table bridge_state_fn_table = {
.name = "Bridged",
.process_party_a = base_process_party_a,
.process_party_b = bridge_state_process_party_b,
@@ -635,7 +635,7 @@
* However, when the channel comes out, we need a new CDR - unlike the Single
* state.
*/
-struct cdr_object_fn_table parked_state_fn_table = {
+static struct cdr_object_fn_table parked_state_fn_table = {
.name = "Parked",
.process_party_a = base_process_party_a,
.process_bridge_leave = parked_state_process_bridge_leave,
@@ -651,7 +651,7 @@
* Once in the finalized state, the CDR is done. No modifications can be made
* to the CDR.
*/
-struct cdr_object_fn_table finalized_state_fn_table = {
+static struct cdr_object_fn_table finalized_state_fn_table = {
.name = "Finalized",
.init_function = finalized_state_init_function,
.process_party_a = finalized_state_process_party_a,
Index: main/cel.c
===================================================================
--- main/cel.c (revision 398635)
+++ main/cel.c (working copy)
@@ -132,7 +132,7 @@
/*! Subscription for forwarding the CEL-specific topic */
static struct stasis_subscription *cel_cel_forwarder;
-struct stasis_message_type *cel_generic_type(void);
+static struct stasis_message_type *cel_generic_type(void);
STASIS_MESSAGE_TYPE_DEFN(cel_generic_type);
/*! Container for CEL backend information */
@@ -1004,7 +1004,7 @@
* changes to ensure that hangup notifications occur after application changes.
* Linkedid checking should always come last.
*/
-cel_channel_snapshot_monitor cel_channel_monitors[] = {
+static cel_channel_snapshot_monitor cel_channel_monitors[] = {
cel_channel_app_change,
cel_channel_state_change,
cel_channel_linkedid_change,
Index: main/core_local.c
===================================================================
--- main/core_local.c (revision 398635)
+++ main/core_local.c (working copy)
@@ -162,7 +162,7 @@
/*! @} */
/*! \brief Callbacks from the unreal core when channel optimization occurs */
-struct ast_unreal_pvt_callbacks local_unreal_callbacks = {
+static struct ast_unreal_pvt_callbacks local_unreal_callbacks = {
.optimization_started = local_optimization_started_cb,
.optimization_finished = local_optimization_finished_cb,
};
Index: main/db.c
===================================================================
--- main/db.c (revision 398635)
+++ main/db.c (working copy)
@@ -116,7 +116,7 @@
static void db_sync(void);
#define DEFINE_SQL_STATEMENT(stmt,sql) static sqlite3_stmt *stmt; \
- const char stmt##_sql[] = sql;
+ static const char stmt##_sql[] = sql;
DEFINE_SQL_STATEMENT(put_stmt, "INSERT OR REPLACE INTO astdb (key, value) VALUES (?, ?)")
DEFINE_SQL_STATEMENT(get_stmt, "SELECT value FROM astdb WHERE key=?")
Index: main/devicestate.c
===================================================================
--- main/devicestate.c (revision 398635)
+++ main/devicestate.c (working copy)
@@ -192,7 +192,7 @@
/*! \brief Flag for the queue */
static ast_cond_t change_pending;
-struct stasis_subscription *devstate_message_sub;
+static struct stasis_subscription *devstate_message_sub;
static struct stasis_topic *device_state_topic_all;
static struct stasis_cache *device_state_cache;
Index: main/features_config.c
===================================================================
--- main/features_config.c (revision 398635)
+++ main/features_config.c (working copy)
@@ -614,7 +614,7 @@
.types = ACO_TYPES(&global_option, &featuremap_option, &applicationmap_option, &featuregroup_option, &parkinglot_option),
};
-AO2_GLOBAL_OBJ_STATIC(globals);
+static AO2_GLOBAL_OBJ_STATIC(globals);
static void features_config_destructor(void *obj)
{
Index: main/manager_bridges.c
===================================================================
--- main/manager_bridges.c (revision 398635)
+++ main/manager_bridges.c (working copy)
@@ -174,7 +174,7 @@
}
-bridge_snapshot_monitor bridge_monitors[] = {
+static bridge_snapshot_monitor bridge_monitors[] = {
bridge_create,
bridge_destroy,
};
Index: main/manager.c
===================================================================
--- main/manager.c (revision 398635)
+++ main/manager.c (working copy)
@@ -1288,7 +1288,7 @@
static AST_RWLIST_HEAD_STATIC(manager_hooks, manager_custom_hook);
/*! \brief A container of event documentation nodes */
-AO2_GLOBAL_OBJ_STATIC(event_docs);
+static AO2_GLOBAL_OBJ_STATIC(event_docs);
static enum add_filter_result manager_add_filter(const char *filter_pattern, struct ao2_container *whitefilters, struct ao2_container *blackfilters);
Index: main/manager_channels.c
===================================================================
--- main/manager_channels.c (revision 398635)
+++ main/manager_channels.c (working copy)
@@ -557,7 +557,7 @@
"OldAccountCode: %s\r\n", old_snapshot->accountcode);
}
-channel_snapshot_monitor channel_monitors[] = {
+static channel_snapshot_monitor channel_monitors[] = {
channel_state_change,
channel_newexten,
channel_new_callerid,
Index: main/manager_mwi.c
===================================================================
--- main/manager_mwi.c (revision 398635)
+++ main/manager_mwi.c (working copy)
@@ -33,8 +33,6 @@
#include "asterisk/stasis_message_router.h"
#include "asterisk/stasis.h"
-struct stasis_message_router *mwi_state_router;
-
/*** DOCUMENTATION
***/
Index: main/named_acl.c
===================================================================
--- main/named_acl.c (revision 398635)
+++ main/named_acl.c (working copy)
@@ -90,9 +90,9 @@
};
/* This array of aco_type structs is necessary to use aco_option_register */
-struct aco_type *named_acl_types[] = ACO_TYPES(&named_acl_type);
+static struct aco_type *named_acl_types[] = ACO_TYPES(&named_acl_type);
-struct aco_file named_acl_conf = {
+static struct aco_file named_acl_conf = {
.filename = "acl.conf",
.types = ACO_TYPES(&named_acl_type),
};
Index: main/optional_api.c
===================================================================
--- main/optional_api.c (revision 398635)
+++ main/optional_api.c (working copy)
@@ -149,7 +149,7 @@
}
/*! Array of \ref optional_api functions */
-struct {
+static struct {
/*! Variable length array of API's */
struct optional_api **list;
/*! Allocated size of the \a list array */
Index: main/sorcery.c
===================================================================
--- main/sorcery.c (revision 398635)
+++ main/sorcery.c (working copy)
@@ -176,7 +176,7 @@
};
/*! \brief Registered sorcery wizards */
-struct ao2_container *wizards;
+static struct ao2_container *wizards;
static int int_handler_fn(const void *obj, const intptr_t *args, char **buf)
{
Index: res/ari.make
===================================================================
--- res/ari.make (revision 398635)
+++ res/ari.make (working copy)
@@ -17,35 +17,27 @@
# rest-api-templates/ari.make.mustache
#
-res_ari_asterisk.so: ari/resource_asterisk.o
-
+$(if $(filter res_ari_asterisk,$(EMBEDDED_MODS)),modules.link,res_ari_asterisk.so): ari/resource_asterisk.o
ari/resource_asterisk.o: _ASTCFLAGS+=$(call MOD_ASTCFLAGS,res_ari_asterisk)
-res_ari_endpoints.so: ari/resource_endpoints.o
-
+$(if $(filter res_ari_endpoints,$(EMBEDDED_MODS)),modules.link,res_ari_endpoints.so): ari/resource_endpoints.o
ari/resource_endpoints.o: _ASTCFLAGS+=$(call MOD_ASTCFLAGS,res_ari_endpoints)
-res_ari_channels.so: ari/resource_channels.o
-
+$(if $(filter res_ari_channels,$(EMBEDDED_MODS)),modules.link,res_ari_channels.so): ari/resource_channels.o
ari/resource_channels.o: _ASTCFLAGS+=$(call MOD_ASTCFLAGS,res_ari_channels)
-res_ari_bridges.so: ari/resource_bridges.o
-
+$(if $(filter res_ari_bridges,$(EMBEDDED_MODS)),modules.link,res_ari_bridges.so): ari/resource_bridges.o
ari/resource_bridges.o: _ASTCFLAGS+=$(call MOD_ASTCFLAGS,res_ari_bridges)
-res_ari_recordings.so: ari/resource_recordings.o
-
+$(if $(filter res_ari_recordings,$(EMBEDDED_MODS)),modules.link,res_ari_recordings.so): ari/resource_recordings.o
ari/resource_recordings.o: _ASTCFLAGS+=$(call MOD_ASTCFLAGS,res_ari_recordings)
-res_ari_sounds.so: ari/resource_sounds.o
-
+$(if $(filter res_ari_sounds,$(EMBEDDED_MODS)),modules.link,res_ari_sounds.so): ari/resource_sounds.o
ari/resource_sounds.o: _ASTCFLAGS+=$(call MOD_ASTCFLAGS,res_ari_sounds)
-res_ari_playback.so: ari/resource_playback.o
-
+$(if $(filter res_ari_playback,$(EMBEDDED_MODS)),modules.link,res_ari_playback.so): ari/resource_playback.o
ari/resource_playback.o: _ASTCFLAGS+=$(call MOD_ASTCFLAGS,res_ari_playback)
-res_ari_events.so: ari/resource_events.o
-
+$(if $(filter res_ari_events,$(EMBEDDED_MODS)),modules.link,res_ari_events.so): ari/resource_events.o
ari/resource_events.o: _ASTCFLAGS+=$(call MOD_ASTCFLAGS,res_ari_events)
Index: res/Makefile
===================================================================
--- res/Makefile (revision 398635)
+++ res/Makefile (working copy)
@@ -80,13 +80,13 @@
$(if $(filter res_parking,$(EMBEDDED_MODS)),modules.link,res_parking.so): $(subst .c,.o,$(wildcard parking/*.c))
$(subst .c,.o,$(wildcard parking/*.c)): _ASTCFLAGS+=$(call MOD_ASTCFLAGS,res_parking)
-res_ari.so: ari/cli.o ari/config.o ari/ari_websockets.o
+$(if $(filter res_ari,$(EMBEDDED_MODS)),modules.link,res_ari.so): ari/cli.o ari/config.o ari/ari_websockets.o
ari/cli.o ari/config.o ari/ari_websockets.o: _ASTCFLAGS+=$(call MOD_ASTCFLAGS,res_ari)
-res_ari_model.so: ari/ari_model_validators.o
+$(if $(filter res_ari_model,$(EMBEDDED_MODS)),modules.link,res_ari_model.so): ari/ari_model_validators.o
ari/ari_model_validators.o: _ASTCFLAGS+=$(call MOD_ASTCFLAGS,res_ari_model)
-res_stasis_recording.so: stasis_recording/stored.o
+$(if $(filter res_stasis_recording,$(EMBEDDED_MODS)),modules.link,res_stasis_recording.so): stasis_recording/stored.o
stasis_recording/stored.o: _ASTCFLAGS+=$(call MOD_ASTCFLAGS,res_stasis_recording)
# Dependencies for res_ari_*.so are generated, so they're in this file
Index: res/res_config_sqlite3.c
===================================================================
--- res/res_config_sqlite3.c (revision 398635)
+++ res/res_config_sqlite3.c (working copy)
@@ -70,7 +70,7 @@
static int realtime_sqlite3_require(const char *database, const char *table, va_list ap);
static int realtime_sqlite3_unload(const char *database, const char *table);
-struct ast_config_engine sqlite3_config_engine = {
+static struct ast_config_engine sqlite3_config_engine = {
.name = "sqlite3",
.load_func = realtime_sqlite3_load,
.realtime_func = realtime_sqlite3,
@@ -105,7 +105,7 @@
unsigned int batch;
};
-struct ao2_container *databases;
+static struct ao2_container *databases;
#define DB_BUCKETS 7
AST_MUTEX_DEFINE_STATIC(config_lock);
@@ -116,8 +116,8 @@
AST_THREADSTORAGE(escape_value_buf);
static int realtime_sqlite3_execute_handle(struct realtime_sqlite3_db *db, const char *sql, int (*callback)(void*, int, char **, char **), void *arg, int sync);
-void db_start_batch(struct realtime_sqlite3_db *db);
-void db_stop_batch(struct realtime_sqlite3_db *db);
+static void db_start_batch(struct realtime_sqlite3_db *db);
+static void db_stop_batch(struct realtime_sqlite3_db *db);
static inline const char *sqlite3_escape_string_helper(struct ast_threadstorage *ts, const char *param)
{
@@ -342,7 +342,7 @@
ast_cond_signal(&db->cond);
}
-void db_start_batch(struct realtime_sqlite3_db *db)
+static void db_start_batch(struct realtime_sqlite3_db *db)
{
if (db->batch) {
ast_cond_init(&db->cond, NULL);
@@ -351,7 +351,7 @@
}
}
-void db_stop_batch(struct realtime_sqlite3_db *db)
+static void db_stop_batch(struct realtime_sqlite3_db *db)
{
if (db->batch) {
db->exiting = 1;
Index: res/res_parking.c
===================================================================
--- res/res_parking.c (revision 398635)
+++ res/res_parking.c (working copy)
@@ -244,7 +244,7 @@
.category = "^general$",
};
-struct aco_type *global_options[] = ACO_TYPES(&global_option);
+static struct aco_type *global_options[] = ACO_TYPES(&global_option);
static struct aco_type parking_lot_type = {
.type = ACO_ITEM,
@@ -256,9 +256,9 @@
.item_offset = offsetof(struct parking_config, parking_lots),
};
-struct aco_type *parking_lot_types[] = ACO_TYPES(&parking_lot_type);
+static struct aco_type *parking_lot_types[] = ACO_TYPES(&parking_lot_type);
-struct aco_file parking_lot_conf = {
+static struct aco_file parking_lot_conf = {
.filename = "res_parking.conf",
.types = ACO_TYPES(&global_option, &parking_lot_type),
};
Index: res/res_pjsip_authenticator_digest.c
===================================================================
--- res/res_pjsip_authenticator_digest.c (revision 398635)
+++ res/res_pjsip_authenticator_digest.c (working copy)
@@ -31,7 +31,7 @@
core
***/
-AO2_GLOBAL_OBJ_STATIC(entity_id);
+static AO2_GLOBAL_OBJ_STATIC(entity_id);
/*!
* \brief Determine if authentication is required
Index: res/res_pjsip.c
===================================================================
--- res/res_pjsip.c (revision 398635)
+++ res/res_pjsip.c (working copy)
@@ -22,7 +22,9 @@
/* Needed for SUBSCRIBE, NOTIFY, and PUBLISH method definitions */
#include
#include
+#include "pjsua-lib/pjsua.h"
+
#include "asterisk/res_pjsip.h"
#include "res_pjsip/include/res_pjsip_private.h"
#include "asterisk/linkedlists.h"
@@ -1388,7 +1390,6 @@
/* PJSIP doesn't know about the INFO method, so we have to define it ourselves */
const pjsip_method pjsip_info_method = {PJSIP_OTHER_METHOD, {"INFO", 4} };
-const pjsip_method pjsip_message_method = {PJSIP_OTHER_METHOD, {"MESSAGE", 7} };
static struct {
const char *method;
@@ -1727,9 +1728,9 @@
return pjsip_media_type_cmp(content_type, &compare, 0) ? 0 : -1;
}
-pj_caching_pool caching_pool;
-pj_pool_t *memory_pool;
-pj_thread_t *monitor_thread;
+static pj_caching_pool caching_pool;
+static pj_pool_t *memory_pool;
+static pj_thread_t *monitor_thread;
static int monitor_continue;
static void *monitor_thread_exec(void *endpt)
Index: res/res_pjsip_exten_state.c
===================================================================
--- res/res_pjsip_exten_state.c (revision 398635)
+++ res/res_pjsip_exten_state.c (working copy)
@@ -41,7 +41,7 @@
#define BODY_SIZE 1024
#define EVENT_TYPE_SIZE 50
-AST_RWLIST_HEAD_STATIC(providers, ast_sip_exten_state_provider);
+static AST_RWLIST_HEAD_STATIC(providers, ast_sip_exten_state_provider);
/*!
* \internal
Index: res/res_pjsip_messaging.c
===================================================================
--- res/res_pjsip_messaging.c (revision 398635)
+++ res/res_pjsip_messaging.c (working copy)
@@ -33,8 +33,6 @@
#include "asterisk/res_pjsip.h"
#include "asterisk/res_pjsip_session.h"
-const pjsip_method pjsip_message_method = {PJSIP_OTHER_METHOD, {"MESSAGE", 7} };
-
#define MAX_HDR_SIZE 512
#define MAX_BODY_SIZE 1024
#define MAX_EXTEN_SIZE 256
Index: res/res_pjsip_mwi.c
===================================================================
--- res/res_pjsip_mwi.c (revision 398635)
+++ res/res_pjsip_mwi.c (working copy)
@@ -45,7 +45,7 @@
***/
struct mwi_subscription;
-AO2_GLOBAL_OBJ_STATIC(unsolicited_mwi);
+static AO2_GLOBAL_OBJ_STATIC(unsolicited_mwi);
#define STASIS_BUCKETS 13
#define MWI_BUCKETS 53
Index: res/res_pjsip_notify.c
===================================================================
--- res/res_pjsip_notify.c (revision 398635)
+++ res/res_pjsip_notify.c (working copy)
@@ -193,7 +193,7 @@
.types = ACO_TYPES(¬ify_option),
};
-AO2_GLOBAL_OBJ_STATIC(globals);
+static AO2_GLOBAL_OBJ_STATIC(globals);
CONFIG_INFO_STANDARD(notify_cfg, globals, notify_cfg_alloc,
.files = ACO_FILES(&module_conf)
Index: res/res_pjsip/pjsip_options.c
===================================================================
--- res/res_pjsip/pjsip_options.c (revision 398635)
+++ res/res_pjsip/pjsip_options.c (working copy)
@@ -442,7 +442,7 @@
}
}
-struct ast_sorcery_observer contact_observer = {
+static struct ast_sorcery_observer contact_observer = {
.created = contact_created,
.deleted = contact_deleted
};
Index: res/res_pjsip_pubsub.c
===================================================================
--- res/res_pjsip_pubsub.c (revision 398635)
+++ res/res_pjsip_pubsub.c (working copy)
@@ -436,7 +436,7 @@
ao2_callback(publication->datastores, OBJ_KEY | OBJ_UNLINK | OBJ_NODATA, NULL, (void *) name);
}
-AST_RWLIST_HEAD_STATIC(publish_handlers, ast_sip_publish_handler);
+static AST_RWLIST_HEAD_STATIC(publish_handlers, ast_sip_publish_handler);
static int publication_hash_fn(const void *obj, const int flags)
{
@@ -498,7 +498,7 @@
AST_RWLIST_TRAVERSE_SAFE_END;
}
-AST_RWLIST_HEAD_STATIC(subscription_handlers, ast_sip_subscription_handler);
+static AST_RWLIST_HEAD_STATIC(subscription_handlers, ast_sip_subscription_handler);
static void sub_add_handler(struct ast_sip_subscription_handler *handler)
{
Index: res/res_pjsip_session.c
===================================================================
--- res/res_pjsip_session.c (revision 398635)
+++ res/res_pjsip_session.c (working copy)
@@ -471,7 +471,7 @@
return -1;
}
-AST_RWLIST_HEAD_STATIC(session_supplements, ast_sip_session_supplement);
+static AST_RWLIST_HEAD_STATIC(session_supplements, ast_sip_session_supplement);
int ast_sip_session_register_supplement(struct ast_sip_session_supplement *supplement)
{
Index: res/res_stasis.c
===================================================================
--- res/res_stasis.c (revision 398635)
+++ res/res_stasis.c (working copy)
@@ -95,13 +95,13 @@
/*!
* \brief Stasis application container.
*/
-struct ao2_container *apps_registry;
+static struct ao2_container *apps_registry;
-struct ao2_container *app_controls;
+static struct ao2_container *app_controls;
-struct ao2_container *app_bridges;
+static struct ao2_container *app_bridges;
-struct ao2_container *app_bridges_moh;
+static struct ao2_container *app_bridges_moh;
/*! AO2 hash function for \ref app */
static int app_hash(const void *obj, const int flags)
Index: res/res_stasis_playback.c
===================================================================
--- res/res_stasis_playback.c (revision 398635)
+++ res/res_stasis_playback.c (working copy)
@@ -548,7 +548,7 @@
* \brief A sparse array detailing how commands should be handled in the
* various playback states. Unset entries imply invalid operations.
*/
-playback_opreation_cb operations[STASIS_PLAYBACK_STATE_MAX][STASIS_PLAYBACK_MEDIA_OP_MAX] = {
+static playback_opreation_cb operations[STASIS_PLAYBACK_STATE_MAX][STASIS_PLAYBACK_MEDIA_OP_MAX] = {
[STASIS_PLAYBACK_STATE_QUEUED][STASIS_PLAYBACK_STOP] = playback_cancel,
[STASIS_PLAYBACK_STATE_QUEUED][STASIS_PLAYBACK_RESTART] = playback_noop,
Index: res/res_stasis_recording.c
===================================================================
--- res/res_stasis_recording.c (revision 398635)
+++ res/res_stasis_recording.c (working copy)
@@ -483,7 +483,7 @@
AST_CONTROL_RECORD_MUTE);
}
-recording_operation_cb operations[STASIS_APP_RECORDING_STATE_MAX][STASIS_APP_RECORDING_OPER_MAX] = {
+static recording_operation_cb operations[STASIS_APP_RECORDING_STATE_MAX][STASIS_APP_RECORDING_OPER_MAX] = {
[STASIS_APP_RECORDING_STATE_QUEUED][STASIS_APP_RECORDING_CANCEL] = recording_disregard,
[STASIS_APP_RECORDING_STATE_QUEUED][STASIS_APP_RECORDING_STOP] = recording_disregard,
[STASIS_APP_RECORDING_STATE_RECORDING][STASIS_APP_RECORDING_CANCEL] = recording_cancel,
Index: res/res_xmpp.c
===================================================================
--- res/res_xmpp.c (revision 398635)
+++ res/res_xmpp.c (working copy)
@@ -783,7 +783,7 @@
.category = "^general$",
};
-struct aco_type *global_options[] = ACO_TYPES(&global_option);
+static struct aco_type *global_options[] = ACO_TYPES(&global_option);
static struct aco_type client_option = {
.type = ACO_ITEM,
@@ -796,9 +796,9 @@
.item_offset = offsetof(struct xmpp_config, clients),
};
-struct aco_type *client_options[] = ACO_TYPES(&client_option);
+static struct aco_type *client_options[] = ACO_TYPES(&client_option);
-struct aco_file res_xmpp_conf = {
+static struct aco_file res_xmpp_conf = {
.filename = "xmpp.conf",
.alias = "jabber.conf",
.types = ACO_TYPES(&global_option, &client_option),
Index: rest-api-templates/ari.make.mustache
===================================================================
--- rest-api-templates/ari.make.mustache (revision 398635)
+++ rest-api-templates/ari.make.mustache (working copy)
@@ -19,8 +19,7 @@
#
{{#apis}}
-res_ari_{{name}}.so: ari/resource_{{name}}.o
-
+$(if $(filter res_ari_{{name}},$(EMBEDDED_MODS)),modules.link,res_ari_{{name}}.so): ari/resource_{{name}}.o
ari/resource_{{name}}.o: _ASTCFLAGS+=$(call MOD_ASTCFLAGS,res_ari_{{name}})
{{/apis}}