From e126ab9eebc6db005df31280ff8e596ba6562426 Mon Sep 17 00:00:00 2001 From: Matthew Jordan Date: Sat, 28 Mar 2015 12:56:12 +0000 Subject: 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" * channels/chan_pjsip.c: removed unused desc[] = "PJSIP Channel" * 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 * main/security_events.c: removed unused TIMESTAMP_STR_LEN * 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) ........ Merged revisions 433693 from http://svn.asterisk.org/svn/asterisk/branches/11 git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/13@433694 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- main/editline/np/strlcat.c | 8 -------- main/editline/np/strlcpy.c | 10 ---------- main/features.c | 5 ----- main/security_events.c | 1 - 4 files changed, 24 deletions(-) (limited to 'main') diff --git a/main/editline/np/strlcat.c b/main/editline/np/strlcat.c index 6c9f1e92d..d9d0e72c8 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 1f154bcf2..ecad62b49 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/main/features.c b/main/features.c index deb28ee0f..f3bf7a714 100644 --- a/main/features.c +++ b/main/features.c @@ -318,11 +318,6 @@ struct ast_bridge_thread_obj unsigned int return_to_pbx:1; }; -static const struct ast_datastore_info channel_app_data_datastore = { - .type = "Channel appdata datastore", - .destroy = ast_free_ptr, -}; - static void set_config_flags(struct ast_channel *chan, struct ast_bridge_config *config) { ast_clear_flag(config, AST_FLAGS_ALL); diff --git a/main/security_events.c b/main/security_events.c index 00a70fbec..0546bfe73 100644 --- a/main/security_events.c +++ b/main/security_events.c @@ -374,7 +374,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "asterisk/json.h" #include "asterisk/astobj2.h" -static const size_t TIMESTAMP_STR_LEN = 32; static const size_t SECURITY_EVENT_BUF_INIT_LEN = 256; /*! \brief Security Topic */ -- cgit v1.2.3