kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-03 03:20:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

make configuration variable const so they are not accidentally

Browse Source 
modified.
This requires casting the strings in asterisk.c when writing to
them, so we do it through a macro to do it consistently.



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@93603 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Luigi Rizzo
2007-12-18 10:24:58 +00:00
parent fd88390af7
commit 10f70a8321
8 changed files with 99 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
utils/ael_main.c
View File

@@ -82,8 +82,8 @@ struct namelist *globalvars_last;
int conts=0, extens=0, priors=0;
char last_exten[18000];
char ast_config_AST_CONFIG_DIR[PATH_MAX];
char ast_config_AST_VAR_DIR[PATH_MAX];
const char ast_config_AST_CONFIG_DIR[PATH_MAX];
const char ast_config_AST_VAR_DIR[PATH_MAX];
void ast_cli_register_multiple(void);
int ast_add_extension2(struct ast_context *con,
@@ -514,14 +514,14 @@ int main(int argc, char **argv)
}
if( use_curr_dir ) {
strcpy(ast_config_AST_CONFIG_DIR, ".");
strcpy((char *)ast_config_AST_CONFIG_DIR, ".");
localized_use_local_dir();
}
else {
strcpy(ast_config_AST_CONFIG_DIR, "/etc/asterisk");
strcpy((char *)ast_config_AST_CONFIG_DIR, "/etc/asterisk");
localized_use_conf_dir();
}
strcpy(ast_config_AST_VAR_DIR, "/var/lib/asterisk");
strcpy((char *)ast_config_AST_VAR_DIR, "/var/lib/asterisk");
if( dump_extensions ) {
dumpfile = fopen("extensions.conf.aeldump","w");

6
utils/conf2ael.c
View File

@@ -63,7 +63,7 @@ void get_start_stop(unsigned int *word, int bitsperword, int totalbits, int *sta
int all_bits_set(unsigned int *word, int bitsperword, int totalbits);
extern char *days[];
extern char *months[];
char ast_config_AST_CONFIG_DIR[PATH_MAX];
const char ast_config_AST_CONFIG_DIR[PATH_MAX];
char *config = "extensions.conf";
@@ -79,7 +79,7 @@ char ast_config_AST_SYSTEM_NAME[20] = ""; */
/*! Go no deeper than this through includes (not counting loops) */
#define AST_PBX_MAX_STACK 128
/* static AST_RWLIST_HEAD_STATIC(acf_root, ast_custom_function); */
extern char ast_config_AST_CONFIG_DIR[PATH_MAX];
//extern char ast_config_AST_CONFIG_DIR[PATH_MAX];
void ast_register_file_version(const char *file, const char *version)
{
@@ -363,7 +363,7 @@ int main(int argc, char **argv)
if (!localdir)
printf(" (You could use -d the use the extensions.conf in the current directory!)\n");
strcpy(ast_config_AST_CONFIG_DIR,"/etc/asterisk");
strcpy((char *)ast_config_AST_CONFIG_DIR,"/etc/asterisk");
printf("Loading %s/%s...\n", ast_config_AST_CONFIG_DIR, config);

2
utils/extconf.c
View File

@@ -53,7 +53,7 @@
# include <glob.h>
#endif
static char ast_config_AST_CONFIG_DIR[PATH_MAX] = {"/etc/asterisk"};
static const char ast_config_AST_CONFIG_DIR[PATH_MAX] = {"/etc/asterisk"};
#define AST_API_MODULE 1 /* gimme the inline defs! */
struct ast_channel
{