[svn-commits] tilghman: trunk r346655 - in /trunk: channels/ main/
SVN commits to the Digium repositories
svn-commits at lists.digium.com
Wed Nov 30 17:38:39 CST 2011
Author: tilghman
Date: Wed Nov 30 17:38:34 2011
New Revision: 346655
URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=346655
Log:
Remove the few places where we try to ast_verbose() without a newline.
Modified:
trunk/channels/chan_sip.c
trunk/channels/chan_unistim.c
trunk/main/config.c
trunk/main/loader.c
trunk/main/tcptls.c
Modified: trunk/channels/chan_sip.c
URL: http://svnview.digium.com/svn/asterisk/trunk/channels/chan_sip.c?view=diff&rev=346655&r1=346654&r2=346655
==============================================================================
--- trunk/channels/chan_sip.c (original)
+++ trunk/channels/chan_sip.c Wed Nov 30 17:38:34 2011
@@ -7372,16 +7372,23 @@
case 4:
f = ast_rtp_instance_read(p->trtp, 0); /* RTP Text */
if (sipdebug_text) {
+ struct ast_str *out = ast_str_create(f->datalen * 4 + 6);
int i;
unsigned char* arr = f->data.ptr;
- for (i=0; i < f->datalen; i++) {
- ast_verbose("%c", (arr[i] > ' ' && arr[i] < '}') ? arr[i] : '.');
- }
- ast_verbose(" -> ");
- for (i=0; i < f->datalen; i++) {
- ast_verbose("%02X ", arr[i]);
- }
- ast_verbose("\n");
+ do {
+ if (!out) {
+ break;
+ }
+ for (i = 0; i < f->datalen; i++) {
+ ast_str_append(&out, 0, "%c", (arr[i] > ' ' && arr[i] < '}') ? arr[i] : '.');
+ }
+ ast_str_append(&out, 0, " -> ");
+ for (i = 0; i < f->datalen; i++) {
+ ast_str_append(&out, 0, "%02X ", arr[i]);
+ }
+ ast_verb(0, "%s\n", ast_str_buffer(out));
+ ast_free(out);
+ } while (0);
}
break;
case 5:
Modified: trunk/channels/chan_unistim.c
URL: http://svnview.digium.com/svn/asterisk/trunk/channels/chan_unistim.c?view=diff&rev=346655&r1=346654&r2=346655
==============================================================================
--- trunk/channels/chan_unistim.c (original)
+++ trunk/channels/chan_unistim.c Wed Nov 30 17:38:34 2011
@@ -1558,14 +1558,14 @@
int tmp, i = 0;
char addrmac[19];
int res = 0;
- if (unistimdebug)
- ast_verb(0, "Mac Address received : ");
for (tmp = 15; tmp < 15 + SIZE_HEADER; tmp++) {
sprintf(&addrmac[i], "%.2x", (unsigned char) buf[tmp]);
i += 2;
}
- if (unistimdebug)
- ast_verb(0, "%s\n", addrmac);
+ if (unistimdebug) {
+ ast_verb(0, "Mac Address received : %s\n", addrmac);
+ }
+
strcpy(pte->macaddr, addrmac);
res = unistim_register(pte);
if (!res) {
Modified: trunk/main/config.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/config.c?view=diff&rev=346655&r1=346654&r2=346655
==============================================================================
--- trunk/main/config.c (original)
+++ trunk/main/config.c Wed Nov 30 17:38:34 2011
@@ -1503,18 +1503,16 @@
if (cfmtime)
cfmtime->mtime = statbuf.st_mtime;
- ast_verb(2, "Parsing '%s': ", fn);
- fflush(stdout);
if (!(f = fopen(fn, "r"))) {
ast_debug(1, "No file to parse: %s\n", fn);
- ast_verb(2, "Not found (%s)\n", strerror(errno));
+ ast_verb(2, "Parsing '%s': Not found (%s)\n", fn, strerror(errno));
continue;
}
count++;
/* If we get to this point, then we're loading regardless */
ast_clear_flag(&flags, CONFIG_FLAG_FILEUNCHANGED);
ast_debug(1, "Parsing %s\n", fn);
- ast_verb(2, "Found\n");
+ ast_verb(2, "Parsing '%s': Found\n", fn);
while (!feof(f)) {
lineno++;
if (fgets(buf, sizeof(buf), f)) {
@@ -1839,7 +1837,7 @@
fclose(f); /* this should zero out the file */
} else {
ast_debug(1, "Unable to open for writing: %s\n", fn);
- ast_verb(2, "Unable to write %s (%s)", fn, strerror(errno));
+ ast_verb(2, "Unable to write %s (%s)\n", fn, strerror(errno));
}
if (fi) {
ao2_ref(fi, -1);
@@ -1856,7 +1854,7 @@
(f = fopen(fn, "w"))
#endif
) {
- ast_verb(2, "Saving '%s': ", fn);
+ ast_verb(2, "Saving '%s'\n", fn);
gen_header(f, configfile, fn, generator);
cat = cfg->root;
fclose(f);
@@ -1873,7 +1871,7 @@
f = fopen(fn, "a");
if (!f) {
ast_debug(1, "Unable to open for writing: %s\n", fn);
- ast_verb(2, "Unable to write %s (%s)", fn, strerror(errno));
+ ast_verb(2, "Unable to write %s (%s)\n", fn, strerror(errno));
if (fi) {
ao2_ref(fi, -1);
}
@@ -1964,7 +1962,7 @@
f = fopen(fn, "a");
if (!f) {
ast_debug(1, "Unable to open for writing: %s\n", fn);
- ast_verb(2, "Unable to write %s (%s)", fn, strerror(errno));
+ ast_verb(2, "Unable to write %s (%s)\n", fn, strerror(errno));
if (fi) {
ao2_ref(fi, -1);
}
@@ -2013,11 +2011,12 @@
}
cat = cat->next;
}
- if (!option_debug)
- ast_verb(2, "Saved\n");
+ if (!option_debug) {
+ ast_verb(2, "Saving '%s': saved\n", fn);
+ }
} else {
ast_debug(1, "Unable to open for writing: %s\n", fn);
- ast_verb(2, "Unable to write (%s)", strerror(errno));
+ ast_verb(2, "Unable to write '%s' (%s)\n", fn, strerror(errno));
if (fi) {
ao2_ref(fi, -1);
}
@@ -2034,7 +2033,7 @@
f = fopen(fn, "a");
if (!f) {
ast_debug(1, "Unable to open for writing: %s\n", fn);
- ast_verb(2, "Unable to write %s (%s)", fn, strerror(errno));
+ ast_verb(2, "Unable to write %s (%s)\n", fn, strerror(errno));
if (fi) {
ao2_ref(fi, -1);
}
Modified: trunk/main/loader.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/loader.c?view=diff&rev=346655&r1=346654&r2=346655
==============================================================================
--- trunk/main/loader.c (original)
+++ trunk/main/loader.c Wed Nov 30 17:38:34 2011
@@ -797,8 +797,11 @@
case AST_MODULE_LOAD_SUCCESS:
if (!ast_fully_booted) {
ast_verb(1, "%s => (%s)\n", mod->resource, term_color(tmp, mod->info->description, COLOR_BROWN, COLOR_BLACK, sizeof(tmp)));
- if (ast_opt_console && !option_verbose)
- ast_verbose( ".");
+ if (ast_opt_console && !option_verbose) {
+ /* This never looks good on anything but the root console, so
+ * it's best not to try to funnel it through the logger. */
+ fprintf(stdout, ".");
+ }
} else {
ast_verb(1, "Loaded %s => (%s)\n", mod->resource, mod->info->description);
}
Modified: trunk/main/tcptls.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/tcptls.c?view=diff&rev=346655&r1=346654&r2=346655
==============================================================================
--- trunk/main/tcptls.c (original)
+++ trunk/main/tcptls.c Wed Nov 30 17:38:34 2011
@@ -359,7 +359,7 @@
if (SSL_CTX_use_certificate_file(cfg->ssl_ctx, cfg->certfile, SSL_FILETYPE_PEM) == 0) {
if (!client) {
/* Clients don't need a certificate, but if its setup we can use it */
- ast_verb(0, "SSL error loading cert file. <%s>", cfg->certfile);
+ ast_verb(0, "SSL error loading cert file. <%s>\n", cfg->certfile);
sleep(2);
cfg->enabled = 0;
return 0;
@@ -368,7 +368,7 @@
if ((SSL_CTX_use_PrivateKey_file(cfg->ssl_ctx, tmpprivate, SSL_FILETYPE_PEM) == 0) || (SSL_CTX_check_private_key(cfg->ssl_ctx) == 0 )) {
if (!client) {
/* Clients don't need a private key, but if its setup we can use it */
- ast_verb(0, "SSL error loading private key file. <%s>", tmpprivate);
+ ast_verb(0, "SSL error loading private key file. <%s>\n", tmpprivate);
sleep(2);
cfg->enabled = 0;
return 0;
@@ -378,7 +378,7 @@
if (!ast_strlen_zero(cfg->cipher)) {
if (SSL_CTX_set_cipher_list(cfg->ssl_ctx, cfg->cipher) == 0 ) {
if (!client) {
- ast_verb(0, "SSL cipher error <%s>", cfg->cipher);
+ ast_verb(0, "SSL cipher error <%s>\n", cfg->cipher);
sleep(2);
cfg->enabled = 0;
return 0;
More information about the svn-commits
mailing list