[svn-commits] mjordan: trunk r433695 - in /trunk: ./ apps/ cel/ channels/ codecs/gsm/src/ f...
SVN commits to the Digium repositories
svn-commits at lists.digium.com
Sat Mar 28 07:56:46 CDT 2015
Author: mjordan
Date: Sat Mar 28 07:56:43 2015
New Revision: 433695
URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=433695
Log:
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
........
Merged revisions 433694 from http://svn.asterisk.org/svn/asterisk/branches/13
Modified:
trunk/ (props changed)
trunk/apps/app_queue.c
trunk/cel/cel_sqlite3_custom.c
trunk/channels/chan_pjsip.c
trunk/codecs/gsm/src/gsm_create.c
trunk/funcs/func_env.c
trunk/main/editline/np/strlcat.c
trunk/main/editline/np/strlcpy.c
trunk/main/features.c
trunk/main/security_events.c
trunk/utils/conf2ael.c
trunk/utils/extconf.c
Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-13-merged' - no diff available.
Modified: trunk/apps/app_queue.c
URL: http://svnview.digium.com/svn/asterisk/trunk/apps/app_queue.c?view=diff&rev=433695&r1=433694&r2=433695
==============================================================================
--- trunk/apps/app_queue.c (original)
+++ trunk/apps/app_queue.c Sat Mar 28 07:56:43 2015
@@ -10471,15 +10471,6 @@
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"),
Modified: trunk/cel/cel_sqlite3_custom.c
URL: http://svnview.digium.com/svn/asterisk/trunk/cel/cel_sqlite3_custom.c?view=diff&rev=433695&r1=433694&r2=433695
==============================================================================
--- trunk/cel/cel_sqlite3_custom.c (original)
+++ trunk/cel/cel_sqlite3_custom.c Sat Mar 28 07:56:43 2015
@@ -63,7 +63,6 @@
static const char config_file[] = "cel_sqlite3_custom.conf";
-static const char name[] = "cel_sqlite3_custom";
static sqlite3 *db = NULL;
static char table[80];
Modified: trunk/channels/chan_pjsip.c
URL: http://svnview.digium.com/svn/asterisk/trunk/channels/chan_pjsip.c?view=diff&rev=433695&r1=433694&r2=433695
==============================================================================
--- trunk/channels/chan_pjsip.c (original)
+++ trunk/channels/chan_pjsip.c Sat Mar 28 07:56:43 2015
@@ -73,7 +73,6 @@
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;
Modified: trunk/codecs/gsm/src/gsm_create.c
URL: http://svnview.digium.com/svn/asterisk/trunk/codecs/gsm/src/gsm_create.c?view=diff&rev=433695&r1=433694&r2=433695
==============================================================================
--- trunk/codecs/gsm/src/gsm_create.c (original)
+++ trunk/codecs/gsm/src/gsm_create.c Sat Mar 28 07:56:43 2015
@@ -3,8 +3,6 @@
* Universitaet Berlin. See the accompanying file "COPYRIGHT" for
* details. THERE IS ABSOLUTELY NO WARRANTY FOR THIS SOFTWARE.
*/
-
-static char const ident[] = "$Header$";
#include "config.h"
Modified: trunk/funcs/func_env.c
URL: http://svnview.digium.com/svn/asterisk/trunk/funcs/func_env.c?view=diff&rev=433695&r1=433694&r2=433695
==============================================================================
--- trunk/funcs/func_env.c (original)
+++ trunk/funcs/func_env.c Sat Mar 28 07:56:43 2015
@@ -725,7 +725,7 @@
}
}
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;
Modified: trunk/main/editline/np/strlcat.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/editline/np/strlcat.c?view=diff&rev=433695&r1=433694&r2=433695
==============================================================================
--- trunk/main/editline/np/strlcat.c (original)
+++ trunk/main/editline/np/strlcat.c Sat Mar 28 07:56:43 2015
@@ -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>
Modified: trunk/main/editline/np/strlcpy.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/editline/np/strlcpy.c?view=diff&rev=433695&r1=433694&r2=433695
==============================================================================
--- trunk/main/editline/np/strlcpy.c (original)
+++ trunk/main/editline/np/strlcpy.c Sat Mar 28 07:56:43 2015
@@ -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>
Modified: trunk/main/features.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/features.c?view=diff&rev=433695&r1=433694&r2=433695
==============================================================================
--- trunk/main/features.c (original)
+++ trunk/main/features.c Sat Mar 28 07:56:43 2015
@@ -317,11 +317,6 @@
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);
Modified: trunk/main/security_events.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/security_events.c?view=diff&rev=433695&r1=433694&r2=433695
==============================================================================
--- trunk/main/security_events.c (original)
+++ trunk/main/security_events.c Sat Mar 28 07:56:43 2015
@@ -374,7 +374,6 @@
#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 */
Modified: trunk/utils/conf2ael.c
URL: http://svnview.digium.com/svn/asterisk/trunk/utils/conf2ael.c?view=diff&rev=433695&r1=433694&r2=433695
==============================================================================
--- trunk/utils/conf2ael.c (original)
+++ trunk/utils/conf2ael.c Sat Mar 28 07:56:43 2015
@@ -237,19 +237,6 @@
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
Modified: trunk/utils/extconf.c
URL: http://svnview.digium.com/svn/asterisk/trunk/utils/extconf.c?view=diff&rev=433695&r1=433694&r2=433695
==============================================================================
--- trunk/utils/extconf.c (original)
+++ trunk/utils/extconf.c Sat Mar 28 07:56:43 2015
@@ -3012,19 +3012,6 @@
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
More information about the svn-commits
mailing list