From e126ab9eebc6db005df31280ff8e596ba6562426 Mon Sep 17 00:00:00 2001
From: Matthew Jordan <mjordan@digium.com>
Date: Sat, 28 Mar 2015 12:56:12 +0000
Subject: [PATCH] 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
---
apps/app_queue.c | 9 ---------
cel/cel_sqlite3_custom.c | 1 -
channels/chan_pjsip.c | 1 -
codecs/gsm/src/gsm_create.c | 2 --
funcs/func_env.c | 2 +-
main/editline/np/strlcat.c | 8 --------
main/editline/np/strlcpy.c | 10 ----------
main/features.c | 5 -----
main/security_events.c | 1 -
utils/conf2ael.c | 13 -------------
utils/extconf.c | 13 -------------
11 files changed, 1 insertion(+), 64 deletions(-)
diff --git a/apps/app_queue.c b/apps/app_queue.c
index 668be42b29..7b4faf0c05 100644
--- a/apps/app_queue.c
+++ b/apps/app_queue.c
@@ -10346,15 +10346,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 <channel> in <queue> reason <reason>\n";
-
-static const char qum_cmd_usage[] =
-"Usage: queue unpause member <channel> in <queue> reason <reason>\n";
-
-static const char qsmp_cmd_usage[] =
-"Usage: queue set member penalty <channel> from <queue> <penalty>\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 2ea78d0862..afa99f7dce 100644
--- a/cel/cel_sqlite3_custom.c
+++ b/cel/cel_sqlite3_custom.c
@@ -63,7 +63,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/channels/chan_pjsip.c b/channels/chan_pjsip.c
index c4cdca83ab..28ddc76302 100644
--- a/channels/chan_pjsip.c
+++ b/channels/chan_pjsip.c
@@ -73,7 +73,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
AST_THREADSTORAGE(uniqueid_threadbuf);
#define UNIQUEID_BUFSIZE 256
-static const char desc[] = "PJSIP Channel";
static const char channel_type[] = "PJSIP";
static unsigned int chan_idx;
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 <sys/types.h>
#include <string.h>
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 <sys/types.h>
#include <string.h>
diff --git a/main/features.c b/main/features.c
index deb28ee0fb..f3bf7a7143 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 00a70fbec5..0546bfe738 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 */
diff --git a/utils/conf2ael.c b/utils/conf2ael.c
index d0f4c6e136..5d36f4231a 100644
--- a/utils/conf2ael.c
+++ b/utils/conf2ael.c
@@ -237,19 +237,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 051ce7978f..ed155e2573 100644
--- a/utils/extconf.c
+++ b/utils/extconf.c
@@ -3011,19 +3011,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
--
GitLab