From 7b338004bfc2934ce4d99160c47a2e1b1449e0ee Mon Sep 17 00:00:00 2001 From: Steve Murphy Date: Thu, 21 Dec 2006 19:44:20 +0000 Subject: a quick fix to app_sms.c to get rid of cursed compiler warnings so I can compile under --enable-dev-mode git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@48767 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- apps/app_chanspy.c | 4 ++-- apps/app_dictate.c | 4 ++-- apps/app_directory.c | 2 +- apps/app_festival.c | 2 +- apps/app_meetme.c | 2 +- apps/app_mixmonitor.c | 2 +- apps/app_record.c | 2 +- apps/app_sms.c | 8 ++++---- apps/app_voicemail.c | 2 +- 9 files changed, 14 insertions(+), 14 deletions(-) (limited to 'apps') diff --git a/apps/app_chanspy.c b/apps/app_chanspy.c index cf1e4759d..61d8afab5 100644 --- a/apps/app_chanspy.c +++ b/apps/app_chanspy.c @@ -617,7 +617,7 @@ static int chanspy_exec(struct ast_channel *chan, void *data) char filename[512]; snprintf(filename, sizeof(filename), "%s/%s.%d.raw", ast_config_AST_MONITOR_DIR, recbase, (int) time(NULL)); - if ((fd = open(filename, O_CREAT | O_WRONLY | O_TRUNC, 0644)) <= 0) { + if ((fd = open(filename, O_CREAT | O_WRONLY | O_TRUNC, AST_FILE_MODE)) <= 0) { ast_log(LOG_WARNING, "Cannot open '%s' for recording\n", filename); fd = 0; } @@ -701,7 +701,7 @@ static int extenspy_exec(struct ast_channel *chan, void *data) char filename[512]; snprintf(filename, sizeof(filename), "%s/%s.%d.raw", ast_config_AST_MONITOR_DIR, recbase, (int) time(NULL)); - if ((fd = open(filename, O_CREAT | O_WRONLY | O_TRUNC, 0644)) <= 0) { + if ((fd = open(filename, O_CREAT | O_WRONLY | O_TRUNC, AST_FILE_MODE)) <= 0) { ast_log(LOG_WARNING, "Cannot open '%s' for recording\n", filename); fd = 0; } diff --git a/apps/app_dictate.c b/apps/app_dictate.c index 0c46118e4..661a4a237 100644 --- a/apps/app_dictate.c +++ b/apps/app_dictate.c @@ -150,7 +150,7 @@ static int dictate_exec(struct ast_channel *chan, void *data) } snprintf(path, len, "%s/%s", base, filein); - fs = ast_writefile(path, "raw", NULL, O_CREAT|O_APPEND, 0, 0700); + fs = ast_writefile(path, "raw", NULL, O_CREAT|O_APPEND, 0, AST_FILE_MODE); mode = DMODE_PLAY; memset(&flags, 0, sizeof(flags)); ast_set_flag(&flags, DFLAG_PAUSE); @@ -307,7 +307,7 @@ static int dictate_exec(struct ast_channel *chan, void *data) } else { oflags |= O_APPEND; } - fs = ast_writefile(path, "raw", NULL, oflags, 0, 0700); + fs = ast_writefile(path, "raw", NULL, oflags, 0, AST_FILE_MODE); if (ast_test_flag(&flags, DFLAG_TRUNC)) { ast_seekstream(fs, 0, SEEK_SET); ast_clear_flag(&flags, DFLAG_TRUNC); diff --git a/apps/app_directory.c b/apps/app_directory.c index 3b1d29e11..c5f083c3c 100644 --- a/apps/app_directory.c +++ b/apps/app_directory.c @@ -142,7 +142,7 @@ static void retrieve_file(char *dir) SQLFreeHandle(SQL_HANDLE_STMT, stmt); break; } - fd = open(full_fn, O_RDWR | O_CREAT | O_TRUNC, 0770); + fd = open(full_fn, O_RDWR | O_CREAT | O_TRUNC, AST_FILE_MODE); if (fd < 0) { ast_log(LOG_WARNING, "Failed to write '%s': %s\n", full_fn, strerror(errno)); SQLFreeHandle(SQL_HANDLE_STMT, stmt); diff --git a/apps/app_festival.c b/apps/app_festival.c index 7af2e78a6..1fa935e0b 100644 --- a/apps/app_festival.c +++ b/apps/app_festival.c @@ -433,7 +433,7 @@ static int festival_exec(struct ast_channel *chan, void *vdata) snprintf(cachefile, sizeof(cachefile), "%s/%s", cachedir, MD5Hex); fdesc=open(cachefile,O_RDWR); if (fdesc==-1) { - fdesc=open(cachefile,O_CREAT|O_RDWR,0777); + fdesc=open(cachefile,O_CREAT|O_RDWR,AST_FILE_MODE); if (fdesc!=-1) { writecache=1; strln=strlen((char *)data); diff --git a/apps/app_meetme.c b/apps/app_meetme.c index 003363fc1..0a3e4a82b 100644 --- a/apps/app_meetme.c +++ b/apps/app_meetme.c @@ -2874,7 +2874,7 @@ static void *recordthread(void *args) break; } if (!s && cnf->recordingfilename && (cnf->recordingfilename != oldrecordingfilename)) { - s = ast_writefile(cnf->recordingfilename, cnf->recordingformat, NULL, flags, 0, 0644); + s = ast_writefile(cnf->recordingfilename, cnf->recordingformat, NULL, flags, 0, AST_FILE_MODE); oldrecordingfilename = cnf->recordingfilename; } diff --git a/apps/app_mixmonitor.c b/apps/app_mixmonitor.c index 1171fc89e..210e18968 100644 --- a/apps/app_mixmonitor.c +++ b/apps/app_mixmonitor.c @@ -256,7 +256,7 @@ static void launch_monitor_thread(struct ast_channel *chan, const char *filename } /* Move onto actually creating the filestream */ - mixmonitor->fs = ast_writefile(file_name, ext, NULL, oflags, 0, 0644); + mixmonitor->fs = ast_writefile(file_name, ext, NULL, oflags, 0, AST_FILE_MODE); if (!mixmonitor->fs) { ast_log(LOG_ERROR, "Cannot open %s.%s\n", file_name, ext); free(mixmonitor); diff --git a/apps/app_record.c b/apps/app_record.c index b38944aef..e06d84a46 100644 --- a/apps/app_record.c +++ b/apps/app_record.c @@ -265,7 +265,7 @@ static int record_exec(struct ast_channel *chan, void *data) flags = option_append ? O_CREAT|O_APPEND|O_WRONLY : O_CREAT|O_TRUNC|O_WRONLY; - s = ast_writefile( tmp, ext, NULL, flags , 0, 0644); + s = ast_writefile( tmp, ext, NULL, flags , 0, AST_FILE_MODE); if (!s) { ast_log(LOG_WARNING, "Could not create file %s\n", filename); diff --git a/apps/app_sms.c b/apps/app_sms.c index 0d0a0c1e1..c68d3b958 100644 --- a/apps/app_sms.c +++ b/apps/app_sms.c @@ -245,7 +245,7 @@ typedef struct sms_s { int protocol; /*!< ETSI SMS protocol to use (passed at app call) */ int oseizure; /*!< protocol 2: channel seizure bits to send */ int framenumber; /*!< protocol 2: frame number (for sending ACK0 or ACK1) */ - unsigned char udtxt[SMSLEN]; /*!< user data (message), PLAIN text */ + char udtxt[SMSLEN]; /*!< user data (message), PLAIN text */ } sms_t; /* different types of encoding */ @@ -707,7 +707,7 @@ static unsigned char packaddress (unsigned char *o, char *i) static void sms_log (sms_t * h, char status) { if (*h->oa || *h->da) { - int o = open (log_file, O_CREAT | O_APPEND | O_WRONLY, 0666); + int o = open (log_file, O_CREAT | O_APPEND | O_WRONLY, AST_FILE_MODE); if (o >= 0) { char line[1000], mrs[3] = "", *p; unsigned char n; @@ -1184,14 +1184,14 @@ static int sms_handleincoming_proto2 (sms_t * h) msgsz=20-1; if (option_verbose > 2) ast_verbose (VERBOSE_PREFIX_3 "SMS-P2 Origin#%02X=[%.*s]\n",msg,msgsz,&h->imsg[f]); - ast_copy_string (h->oa, &h->imsg[f], msgsz+1); + ast_copy_string (h->oa, (char*)(&h->imsg[f]), msgsz+1); break; case 0x18: /* Destination (from TE/phone) */ if (msgsz>=20) msgsz=20-1; if (option_verbose > 2) ast_verbose (VERBOSE_PREFIX_3 "SMS-P2 Destination#%02X=[%.*s]\n",msg,msgsz,&h->imsg[f]); - ast_copy_string (h->da, &h->imsg[f], msgsz+1); + ast_copy_string (h->da, (char*)(&h->imsg[f]), msgsz+1); break; case 0x1C: /* Notify */ if (option_verbose > 2) diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c index 61ced5661..9a02f38c1 100644 --- a/apps/app_voicemail.c +++ b/apps/app_voicemail.c @@ -1072,7 +1072,7 @@ static int retrieve_file(char *dir, int msgnum) ast_odbc_release_obj(obj); goto yuck; } - fd = open(full_fn, O_RDWR | O_CREAT | O_TRUNC, 0770); + fd = open(full_fn, O_RDWR | O_CREAT | O_TRUNC, VOICEMAIL_FILE_MODE); if (fd < 0) { ast_log(LOG_WARNING, "Failed to write '%s': %s\n", full_fn, strerror(errno)); SQLFreeHandle (SQL_HANDLE_STMT, stmt); -- cgit v1.2.3