dect
/
asterisk
Archived
13
0
Fork 0
Code Releases Activity

Various minor cleanups (bug #931) 

git-svn-id: http://svn.digium.com/svn/asterisk/trunk@2087 f38db490-d61c-443f-a65b-d21fe96a405b
This commit is contained in:
markster 2004-01-28 21:32:48 +00:00
parent 960b12736d
commit 9cb49092c8
7 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/app_qcall.c
View File

@ -338,7 +338,7 @@ time_t t;
strcpy(channel->exten,extstr);
strcpy(channel->context,context);
channel->priority = 1;
printf("Caller ID is %s\n", channel->callerid);
if(debug) printf("Caller ID is %s\n", channel->callerid);
ast_pbx_run(channel);
pthread_exit(NULL);
}

5
apps/app_queue.c
View File

@ -1131,8 +1131,9 @@ static int queue_exec(struct ast_channel *chan, void *data)
}
}
}
printf("queue: %s, options: %s, url: %s, announce: %s\n",
queuename, options, url, announceoverride);
if (option_debug)
ast_log(LOG_DEBUG, "queue: %s, options: %s, url: %s, announce: %s\n",
queuename, options, url, announceoverride);
/* Setup our queue entry */
memset(&qe, 0, sizeof(qe));
qe.chan = chan;

4
asterisk.c
View File

@ -1232,7 +1232,7 @@ static void ast_readconfig(void) {
int main(int argc, char *argv[])
{
char c;
int c;
char filename[80] = "";
char hostname[256];
char tmp[80];
@ -1269,7 +1269,7 @@ int main(int argc, char *argv[])
}
*/
/* Check for options */
while((c=getopt(argc, argv, "hfdvqprgcinx:C:")) != EOF) {
while((c=getopt(argc, argv, "hfdvqprgcinx:C:")) != -1) {
switch(c) {
case 'd':
option_debug++;

6
formats/format_g729.c
View File

@ -150,12 +150,12 @@ static int g729_write(struct ast_filestream *fs, struct ast_frame *f)
ast_log(LOG_WARNING, "Asked to write non-G729 frame (%d)!\n", f->subclass);
return -1;
}
if (f->datalen % 20) {
ast_log(LOG_WARNING, "Invalid data length, %d, should be multiple of 20\n", f->datalen);
if (f->datalen % 10) {
ast_log(LOG_WARNING, "Invalid data length, %d, should be multiple of 10\n", f->datalen);
return -1;
}
if ((res = write(fs->fd, f->data, f->datalen)) != f->datalen) {
ast_log(LOG_WARNING, "Bad write (%d/20): %s\n", res, strerror(errno));
ast_log(LOG_WARNING, "Bad write (%d/10): %s\n", res, strerror(errno));
return -1;
}
return 0;

9
indications.c
View File

@ -235,7 +235,8 @@ int ast_set_indication_country(const char *country)
if (country) {
struct tone_zone *z = ast_get_indication_zone(country);
if (z) {
ast_verbose(VERBOSE_PREFIX_3 "Setting default indication country to '%s'\n",country);
if (option_verbose > 2)
ast_verbose(VERBOSE_PREFIX_3 "Setting default indication country to '%s'\n",country);
current_tonezone = z;
return 0;
}
@ -359,7 +360,8 @@ int ast_register_indication_country(struct tone_zone *zone)
tone_zones = zone;
ast_mutex_unlock(&tzlock);
ast_verbose(VERBOSE_PREFIX_3 "Registered indication country '%s'\n",zone->country);
if (option_verbose > 2)
ast_verbose(VERBOSE_PREFIX_3 "Registered indication country '%s'\n",zone->country);
return 0;
}
@ -390,7 +392,8 @@ int ast_unregister_indication_country(const char *country)
ast_log(LOG_NOTICE,"Removed default indication country '%s'\n",tz->country);
current_tonezone = NULL;
}
ast_verbose(VERBOSE_PREFIX_3 "Unregistered indication country '%s'\n",tz->country);
if (option_verbose > 2)
ast_verbose(VERBOSE_PREFIX_3 "Unregistered indication country '%s'\n",tz->country);
free_zone(tz);
tz = tmp;
res = 0;

3
pbx/pbx_spool.c
View File

@ -339,8 +339,7 @@ int load_module(void)
pthread_t thread;
pthread_attr_t attr;
snprintf((char *)qdir,sizeof(qdir)-1,"%s/%s",(char *)ast_config_AST_SPOOL_DIR,"outgoing");
printf("%s\n",qdir);
if (mkdir(qdir, 0700) && (errno != EEXIST)) {
if (mkdir(qdir, 0700) && (errno != EEXIST)) {
ast_log(LOG_WARNING, "Unable to create queue directory %s -- outgoing spool disabled\n", qdir);
return 0;
}

4
pbx/pbx_wilcalu.c
View File

@ -24,6 +24,7 @@
#include <asterisk/pbx.h>
#include <asterisk/module.h>
#include <asterisk/translate.h>
#include <asterisk/options.h>
#include <unistd.h>
#include <string.h>
#include <stdlib.h>
@ -62,7 +63,8 @@ static void *autodial(void *ignore)
int flags = fcntl(fd, F_GETFL);
fd_set fds;
fcntl(fd, F_SETFL, flags & ~O_NONBLOCK);
ast_log(LOG_DEBUG, "Entered Wil-Calu fd=%d\n",fd);
if (option_debug)
ast_log(LOG_DEBUG, "Entered Wil-Calu fd=%d\n",fd);
if(fd<0) {
ast_log(LOG_WARNING, "Autodial: Unable to open file\n");
pthread_exit(NULL);