clang compiler warnings: Fix a variety of "unused" warnings
authorMatthew Jordan <mjordan@digium.com>
Sat, 28 Mar 2015 12:56:43 +0000 (12:56 +0000)
committerMatthew Jordan <mjordan@digium.com>
Sat, 28 Mar 2015 12:56:43 +0000 (12:56 +0000)
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
........

Merged revisions 433694 from http://svn.asterisk.org/svn/asterisk/branches/13

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@433695 65c4cc65-6c06-0410-ace0-fbb531ad65f3

apps/app_queue.c
cel/cel_sqlite3_custom.c
channels/chan_pjsip.c
codecs/gsm/src/gsm_create.c
funcs/func_env.c
main/editline/np/strlcat.c
main/editline/np/strlcpy.c
main/features.c
main/security_events.c
utils/conf2ael.c
utils/extconf.c

index 0f3d9f7..9397e64 100644 (file)
@@ -10471,15 +10471,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"),
index 2ea78d0..afa99f7 100644 (file)
@@ -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];
index 8d9193f..c5eb4e5 100644 (file)
@@ -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;
index a59aa2f..f952a7d 100644 (file)
@@ -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
index 26bd09c..3c260a2 100644 (file)
@@ -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;
index 6c9f1e9..d9d0e72 100644 (file)
  */
 
 #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>
 
index 1f154bc..ecad62b 100644 (file)
  */
 
 #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>
 
index ac599c7..df464d5 100644 (file)
@@ -317,11 +317,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);
index 00a70fb..0546bfe 100644 (file)
@@ -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 */
index d0f4c6e..5d36f42 100644 (file)
@@ -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
index 62c8604..0ab969d 100644 (file)
@@ -3012,19 +3012,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