From dd0cd4763068ad31d4eb6d9a1b9f7e95e2ad4f70 Mon Sep 17 00:00:00 2001 From: Sean Bright Date: Mon, 18 May 2009 15:55:53 +0000 Subject: [PATCH] Const-ify a string, fix a log message, and use the correct signature for the load_module function. git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@195210 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- cdr/cdr_custom.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cdr/cdr_custom.c b/cdr/cdr_custom.c index 2fd98db2c7..49e5ea4bd3 100644 --- a/cdr/cdr_custom.c +++ b/cdr/cdr_custom.c @@ -53,7 +53,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") AST_THREADSTORAGE(custom_buf); -static char *name = "cdr-custom"; +static const char name[] = "cdr-custom"; struct cdr_config { AST_DECLARE_STRING_FIELDS( @@ -84,7 +84,7 @@ static int load_config(void) cfg = ast_config_load(CONFIG, config_flags); if (!cfg || cfg == CONFIG_STATUS_FILEINVALID) { - ast_log(LOG_ERROR, "Unable to load " CONFIG ". Not custom CSV CDRs.\n"); + ast_log(LOG_ERROR, "Unable to load " CONFIG ". Not logging custom CSV CDRs.\n"); return -1; } @@ -177,7 +177,7 @@ static int unload_module(void) return 0; } -static int load_module(void) +static enum ast_module_load_result load_module(void) { if (AST_RWLIST_WRLOCK(&sinks)) { ast_log(LOG_ERROR, "Unable to lock sink list. Load failed.\n");