diff options
| author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-03-27 14:09:41 +0000 |
|---|---|---|
| committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-03-27 14:09:41 +0000 |
| commit | 475a33042c9020417d6d8c9f247063484f7f18f3 (patch) | |
| tree | 9de8b020148c14593695475b1212ffbc4c3b750f /main | |
| parent | c78b57e4ae614c522c89808dab4d359e84171ac6 (diff) | |
Merged revisions 184630 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
........
r184630 | russell | 2009-03-27 09:00:18 -0500 (Fri, 27 Mar 2009) | 2 lines
Change g_eid to ast_eid_default.
........
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@184632 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main')
| -rw-r--r-- | main/asterisk.c | 8 | ||||
| -rw-r--r-- | main/event.c | 2 | ||||
| -rw-r--r-- | main/pbx.c | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/main/asterisk.c b/main/asterisk.c index ba9010337..fdef5e156 100644 --- a/main/asterisk.c +++ b/main/asterisk.c @@ -182,7 +182,7 @@ long option_minmemfree; /*!< Minimum amount of free system memory - stop acce /*! @} */ -struct ast_eid g_eid; +struct ast_eid ast_eid_default; /* XXX tmpdir is a subdir of the spool directory, and no way to remap it */ char record_cache_dir[AST_CACHE_DIR_LEN] = DEFAULT_TMP_DIR; @@ -427,7 +427,7 @@ static char *handle_show_settings(struct ast_cli_entry *e, int cmd, struct ast_c return NULL; } - ast_eid_to_str(eid_str, sizeof(eid_str), &g_eid); + ast_eid_to_str(eid_str, sizeof(eid_str), &ast_eid_default); ast_cli(a->fd, "\nPBX Core settings\n"); ast_cli(a->fd, "-----------------\n"); @@ -2817,7 +2817,7 @@ static void ast_readconfig(void) ast_copy_string(cfg_paths.socket_path, DEFAULT_SOCKET, sizeof(cfg_paths.socket_path)); ast_copy_string(cfg_paths.run_dir, DEFAULT_RUN_DIR, sizeof(cfg_paths.run_dir)); - ast_set_default_eid(&g_eid); + ast_set_default_eid(&ast_eid_default); /* no asterisk.conf? no problem, use buildtime config! */ if (cfg == CONFIG_STATUS_FILEMISSING || cfg == CONFIG_STATUS_FILEUNCHANGED || cfg == CONFIG_STATUS_FILEINVALID) { @@ -2988,7 +2988,7 @@ static void ast_readconfig(void) struct ast_eid tmp_eid; if (!ast_str_to_eid(&tmp_eid, v->value)) { ast_verbose("Successfully set global EID to '%s'\n", v->value); - g_eid = tmp_eid; + ast_eid_default = tmp_eid; } else ast_verbose("Invalid Entity ID '%s' provided\n", v->value); } else if (!strcasecmp(v->name, "lightbackground")) { diff --git a/main/event.c b/main/event.c index 11f022f90..c497bd1f7 100644 --- a/main/event.c +++ b/main/event.c @@ -954,7 +954,7 @@ struct ast_event *ast_event_new(enum ast_event_type type, ...) if (!ast_event_get_ie_raw(event, AST_EVENT_IE_EID)) { /* If the event is originating on this server, add the server's * entity ID to the event. */ - ast_event_append_ie_raw(&event, AST_EVENT_IE_EID, &g_eid, sizeof(g_eid)); + ast_event_append_ie_raw(&event, AST_EVENT_IE_EID, &ast_eid_default, sizeof(ast_eid_default)); } return event; diff --git a/main/pbx.c b/main/pbx.c index bd7df1195..2a1c9393d 100644 --- a/main/pbx.c +++ b/main/pbx.c @@ -2924,7 +2924,7 @@ void pbx_retrieve_variable(struct ast_channel *c, const char *var, char **ret, c } else if (!strcmp(var, "SYSTEMNAME")) { s = ast_config_AST_SYSTEM_NAME; } else if (!strcmp(var, "ENTITYID")) { - ast_eid_to_str(workspace, workspacelen, &g_eid); + ast_eid_to_str(workspace, workspacelen, &ast_eid_default); s = workspace; } } |