From: Matthew Jordan Date: Sat, 28 Mar 2015 12:53:50 +0000 (+0000) Subject: clang compiler warnings: Fix a variety of "unused" warnings X-Git-Tag: 11.18.0-rc1~86 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=29e6597f0b50274ceba20bdba2291bae370d4dfc;p=thirdparty%2Fasterisk.git clang compiler warnings: Fix a variety of "unused" warnings This patch fixes the -Wunused-value -Wunused-variable -Wunused-const-variable errors caught by clang. Specifically: * apps/app_queue.c: removed unused qpm_cmd_usage[], qum_cmd_usage[], qsmp_cmd_usage[] * cel/cel_sqlite3_custom.c: removed unused name[] = "cel_sqlite3_custom" * codecs/gsm/src/gsm_create.c: removed unused ident[] = "$Header$" * funcs/func_env.c:729: Fixed ast_str_append_substr. * main/editline/np/strlcat.c: removed unused rcsid variable * main/editline/np/strlcpy.c: removed unused rcsid variable * utils/conf2ael.c: removed unused cfextension_states * utils/extconf.c: removed unused cfextension_states Review: https://reviewboard.asterisk.org/r/4526 ASTERISK-24917 Reported by: dkdegroot patches: rb4526.patch submitted by dkdegroot (License 6600) git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/11@433693 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- diff --git a/apps/app_queue.c b/apps/app_queue.c index d61a8fd19e..3e0bc8b975 100644 --- a/apps/app_queue.c +++ b/apps/app_queue.c @@ -9636,15 +9636,6 @@ static char *handle_queue_reload(struct ast_cli_entry *e, int cmd, struct ast_cl return CLI_SUCCESS; } -static const char qpm_cmd_usage[] = -"Usage: queue pause member in reason \n"; - -static const char qum_cmd_usage[] = -"Usage: queue unpause member in reason \n"; - -static const char qsmp_cmd_usage[] = -"Usage: queue set member penalty from \n"; - static struct ast_cli_entry cli_queue[] = { AST_CLI_DEFINE(queue_show, "Show status of a specified queue"), AST_CLI_DEFINE(handle_queue_rule_show, "Show the rules defined in queuerules.conf"), diff --git a/cel/cel_sqlite3_custom.c b/cel/cel_sqlite3_custom.c index ce88be6f73..2da6983b57 100644 --- a/cel/cel_sqlite3_custom.c +++ b/cel/cel_sqlite3_custom.c @@ -61,7 +61,6 @@ AST_MUTEX_DEFINE_STATIC(lock); static const char config_file[] = "cel_sqlite3_custom.conf"; -static const char name[] = "cel_sqlite3_custom"; static sqlite3 *db = NULL; static char table[80]; diff --git a/codecs/gsm/src/gsm_create.c b/codecs/gsm/src/gsm_create.c index a59aa2f2a3..f952a7dc2c 100644 --- a/codecs/gsm/src/gsm_create.c +++ b/codecs/gsm/src/gsm_create.c @@ -4,8 +4,6 @@ * details. THERE IS ABSOLUTELY NO WARRANTY FOR THIS SOFTWARE. */ -static char const ident[] = "$Header$"; - #include "config.h" #ifdef HAS_STRING_H diff --git a/funcs/func_env.c b/funcs/func_env.c index 26bd09c139..3c260a2fb3 100644 --- a/funcs/func_env.c +++ b/funcs/func_env.c @@ -725,7 +725,7 @@ static int file_read(struct ast_channel *chan, const char *cmd, char *data, stru } } ast_debug(3, "length_offset=%" PRId64 ", length_offset - i=%" PRId64 "\n", length_offset, length_offset - i); - ast_str_append_substr(buf, len, fbuf, length_offset >= 0 ? length_offset - i : flength > i + sizeof(fbuf)) ? sizeof(fbuf) : flength - i; + ast_str_append_substr(buf, len, fbuf, (length_offset >= 0) ? length_offset - i : (flength > i + sizeof(fbuf)) ? sizeof(fbuf) : flength - i); if (length_offset >= 0) { break; diff --git a/main/editline/np/strlcat.c b/main/editline/np/strlcat.c index 6c9f1e92d7..d9d0e72c8f 100644 --- a/main/editline/np/strlcat.c +++ b/main/editline/np/strlcat.c @@ -26,14 +26,6 @@ */ #include "config.h" -#if defined(LIBC_SCCS) && !defined(lint) -static char *rcsid = "$OpenBSD: strlcat.c,v 1.2 1999/06/17 16:28:58 millert Exp $"; -#endif /* LIBC_SCCS and not lint */ -#ifndef lint -static const char rcsid[] = - "$FreeBSD: src/lib/libc/string/strlcat.c,v 1.2.4.2 2001/07/09 23:30:06 obrien Exp $"; -#endif - #include #include diff --git a/main/editline/np/strlcpy.c b/main/editline/np/strlcpy.c index 1f154bcf2e..ecad62b499 100644 --- a/main/editline/np/strlcpy.c +++ b/main/editline/np/strlcpy.c @@ -28,16 +28,6 @@ */ #include "config.h" -#if defined(LIBC_SCCS) && !defined(lint) -#if 0 -static char *rcsid = "$OpenBSD: strlcpy.c,v 1.4 1999/05/01 18:56:41 millert Exp $"; -#endif -#endif /* LIBC_SCCS and not lint */ -#ifndef lint -static const char rcsid[] = - "$FreeBSD: src/lib/libc/string/strlcpy.c,v 1.2.4.1 2001/07/09 23:30:06 obrien Exp $"; -#endif - #include #include diff --git a/utils/conf2ael.c b/utils/conf2ael.c index a59d7b05dd..2c4438032d 100644 --- a/utils/conf2ael.c +++ b/utils/conf2ael.c @@ -238,19 +238,6 @@ struct store_hint { AST_LIST_HEAD(store_hints, store_hint); -static const struct cfextension_states { - int extension_state; - const char * const text; -} extension_states[] = { - { AST_EXTENSION_NOT_INUSE, "Idle" }, - { AST_EXTENSION_INUSE, "InUse" }, - { AST_EXTENSION_BUSY, "Busy" }, - { AST_EXTENSION_UNAVAILABLE, "Unavailable" }, - { AST_EXTENSION_RINGING, "Ringing" }, - { AST_EXTENSION_INUSE | AST_EXTENSION_RINGING, "InUse&Ringing" }, - { AST_EXTENSION_ONHOLD, "Hold" }, - { AST_EXTENSION_INUSE | AST_EXTENSION_ONHOLD, "InUse&Hold" } -}; #define STATUS_NO_CONTEXT 1 #define STATUS_NO_EXTENSION 2 #define STATUS_NO_PRIORITY 3 diff --git a/utils/extconf.c b/utils/extconf.c index b1cca16688..ba263cf990 100644 --- a/utils/extconf.c +++ b/utils/extconf.c @@ -3000,19 +3000,6 @@ struct store_hint { AST_LIST_HEAD(store_hints, store_hint); -static const struct cfextension_states { - int extension_state; - const char * const text; -} extension_states[] = { - { AST_EXTENSION_NOT_INUSE, "Idle" }, - { AST_EXTENSION_INUSE, "InUse" }, - { AST_EXTENSION_BUSY, "Busy" }, - { AST_EXTENSION_UNAVAILABLE, "Unavailable" }, - { AST_EXTENSION_RINGING, "Ringing" }, - { AST_EXTENSION_INUSE | AST_EXTENSION_RINGING, "InUse&Ringing" }, - { AST_EXTENSION_ONHOLD, "Hold" }, - { AST_EXTENSION_INUSE | AST_EXTENSION_ONHOLD, "InUse&Hold" } -}; #define STATUS_NO_CONTEXT 1 #define STATUS_NO_EXTENSION 2 #define STATUS_NO_PRIORITY 3