From 695422d698e01ee984b87eb944a3aff12a871c32 Mon Sep 17 00:00:00 2001
From: Mark Spencer <markster@digium.com>
Date: Wed, 28 Jan 2004 21:32:48 +0000
Subject: [PATCH] Various minor cleanups (bug #931)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@2087 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---
apps/app_qcall.c | 2 +-
apps/app_queue.c | 5 +++--
asterisk.c | 4 ++--
formats/format_g729.c | 6 +++---
indications.c | 9 ++++++---
pbx/pbx_spool.c | 3 +--
pbx/pbx_wilcalu.c | 4 +++-
7 files changed, 19 insertions(+), 14 deletions(-)
diff --git a/apps/app_qcall.c b/apps/app_qcall.c
index 78e83eef8a..e876f0ae36 100755
--- a/apps/app_qcall.c
+++ b/apps/app_qcall.c
@@ -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);
}
diff --git a/apps/app_queue.c b/apps/app_queue.c
index e7b7ab8bd8..4844df98ad 100755
--- a/apps/app_queue.c
+++ b/apps/app_queue.c
@@ -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;
diff --git a/asterisk.c b/asterisk.c
index 43f46b4b0b..b1be8c046a 100755
--- a/asterisk.c
+++ b/asterisk.c
@@ -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++;
diff --git a/formats/format_g729.c b/formats/format_g729.c
index cc9e7f6960..746c40b8a4 100755
--- a/formats/format_g729.c
+++ b/formats/format_g729.c
@@ -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;
diff --git a/indications.c b/indications.c
index 864fd6a3d8..55e11ff8bb 100755
--- a/indications.c
+++ b/indications.c
@@ -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;
diff --git a/pbx/pbx_spool.c b/pbx/pbx_spool.c
index 638dea6406..d456810bb0 100755
--- a/pbx/pbx_spool.c
+++ b/pbx/pbx_spool.c
@@ -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;
}
diff --git a/pbx/pbx_wilcalu.c b/pbx/pbx_wilcalu.c
index aa1d4e9ae7..9fdf642be5 100755
--- a/pbx/pbx_wilcalu.c
+++ b/pbx/pbx_wilcalu.c
@@ -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);
--
GitLab