[svn-commits] seanbright: branch seanbright/resolve-shadow-warnings r136480 - in /team/sean...
SVN commits to the Digium repositories
svn-commits at lists.digium.com
Thu Aug 7 11:30:14 CDT 2008
Author: seanbright
Date: Thu Aug 7 11:30:13 2008
New Revision: 136480
URL: http://svn.digium.com/view/asterisk?view=rev&rev=136480
Log:
Merged revisions 136402,136405-136406,136408 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r136402 | seanbright | 2008-08-07 10:36:59 -0400 (Thu, 07 Aug 2008) | 1 line
Merge in a few more changes. This time the include/ directory.
................
r136405 | kpfleming | 2008-08-07 11:07:39 -0400 (Thu, 07 Aug 2008) | 9 lines
Blocked revisions 136404 via svnmerge
........
r136404 | kpfleming | 2008-08-07 10:07:12 -0500 (Thu, 07 Aug 2008) | 2 lines
remove config.cache during distclean, in case the user is using autoconf caching
........
................
r136406 | tilghman | 2008-08-07 11:10:53 -0400 (Thu, 07 Aug 2008) | 2 lines
Fix runtime symbol error
................
r136408 | seanbright | 2008-08-07 11:16:48 -0400 (Thu, 07 Aug 2008) | 6 lines
More merges from resolve-shadow warnings:
utils/
codecs/
and a change I missed from formats/
................
Modified:
team/seanbright/resolve-shadow-warnings/ (props changed)
team/seanbright/resolve-shadow-warnings/cdr/cdr_tds.c
team/seanbright/resolve-shadow-warnings/formats/msgsm.h
team/seanbright/resolve-shadow-warnings/include/asterisk/callerid.h
team/seanbright/resolve-shadow-warnings/utils/extconf.c
team/seanbright/resolve-shadow-warnings/utils/smsq.c
Propchange: team/seanbright/resolve-shadow-warnings/
------------------------------------------------------------------------------
Binary property 'branch-1.4-blocked' - no diff available.
Propchange: team/seanbright/resolve-shadow-warnings/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Thu Aug 7 11:30:13 2008
@@ -1,1 +1,1 @@
-/trunk:1-136356
+/trunk:1-136416
Modified: team/seanbright/resolve-shadow-warnings/cdr/cdr_tds.c
URL: http://svn.digium.com/view/asterisk/team/seanbright/resolve-shadow-warnings/cdr/cdr_tds.c?view=diff&rev=136480&r1=136479&r2=136480
==============================================================================
--- team/seanbright/resolve-shadow-warnings/cdr/cdr_tds.c (original)
+++ team/seanbright/resolve-shadow-warnings/cdr/cdr_tds.c Thu Aug 7 11:30:13 2008
@@ -268,7 +268,7 @@
static void get_date(char *dateField, size_t len, struct timeval when)
{
/* To make sure we have date variable if not insert null to SQL */
- if (!ast_tvzero(tv)) {
+ if (!ast_tvzero(when)) {
struct ast_tm tm;
ast_localtime(&when, &tm, NULL);
ast_strftime(dateField, len, "'" DATE_FORMAT "'", &tm);
Modified: team/seanbright/resolve-shadow-warnings/formats/msgsm.h
URL: http://svn.digium.com/view/asterisk/team/seanbright/resolve-shadow-warnings/formats/msgsm.h?view=diff&rev=136480&r1=136479&r2=136480
==============================================================================
--- team/seanbright/resolve-shadow-warnings/formats/msgsm.h (original)
+++ team/seanbright/resolve-shadow-warnings/formats/msgsm.h Thu Aug 7 11:30:13 2008
@@ -350,104 +350,104 @@
#define writeGSM_33(c1) { \
gsm_byte *__c = (c1); \
- *__c++ = ((GSM_MAGIC & 0xF) << 4) /* 1 */ \
- | ((LARc[0] >> 2) & 0xF); \
- *__c++ = ((LARc[0] & 0x3) << 6) \
- | (LARc[1] & 0x3F); \
- *__c++ = ((LARc[2] & 0x1F) << 3) \
- | ((LARc[3] >> 2) & 0x7); \
- *__c++ = ((LARc[3] & 0x3) << 6) \
+ *__c++ = ((GSM_MAGIC & 0xF) << 4) /* 1 */ \
+ | ((LARc[0] >> 2) & 0xF); \
+ *__c++ = ((LARc[0] & 0x3) << 6) \
+ | (LARc[1] & 0x3F); \
+ *__c++ = ((LARc[2] & 0x1F) << 3) \
+ | ((LARc[3] >> 2) & 0x7); \
+ *__c++ = ((LARc[3] & 0x3) << 6) \
| ((LARc[4] & 0xF) << 2) \
| ((LARc[5] >> 2) & 0x3); \
- *__c++ = ((LARc[5] & 0x3) << 6) \
+ *__c++ = ((LARc[5] & 0x3) << 6) \
| ((LARc[6] & 0x7) << 3) \
| (LARc[7] & 0x7); \
- *__c++ = ((Nc[0] & 0x7F) << 1) \
+ *__c++ = ((Nc[0] & 0x7F) << 1) \
| ((bc[0] >> 1) & 0x1); \
- *__c++ = ((bc[0] & 0x1) << 7) \
+ *__c++ = ((bc[0] & 0x1) << 7) \
| ((Mc[0] & 0x3) << 5) \
| ((xmaxc[0] >> 1) & 0x1F); \
- *__c++ = ((xmaxc[0] & 0x1) << 7) \
+ *__c++ = ((xmaxc[0] & 0x1) << 7) \
| ((xmc[0] & 0x7) << 4) \
| ((xmc[1] & 0x7) << 1) \
- | ((xmc[2] >> 2) & 0x1); \
- *__c++ = ((xmc[2] & 0x3) << 6) \
+ | ((xmc[2] >> 2) & 0x1); \
+ *__c++ = ((xmc[2] & 0x3) << 6) \
| ((xmc[3] & 0x7) << 3) \
| (xmc[4] & 0x7); \
- *__c++ = ((xmc[5] & 0x7) << 5) /* 10 */ \
+ *__c++ = ((xmc[5] & 0x7) << 5) /* 10 */ \
| ((xmc[6] & 0x7) << 2) \
| ((xmc[7] >> 1) & 0x3); \
- *__c++ = ((xmc[7] & 0x1) << 7) \
+ *__c++ = ((xmc[7] & 0x1) << 7) \
| ((xmc[8] & 0x7) << 4) \
| ((xmc[9] & 0x7) << 1) \
| ((xmc[10] >> 2) & 0x1); \
- *__c++ = ((xmc[10] & 0x3) << 6) \
+ *__c++ = ((xmc[10] & 0x3) << 6) \
| ((xmc[11] & 0x7) << 3) \
| (xmc[12] & 0x7); \
- *__c++ = ((Nc[1] & 0x7F) << 1) \
+ *__c++ = ((Nc[1] & 0x7F) << 1) \
| ((bc[1] >> 1) & 0x1); \
- *__c++ = ((bc[1] & 0x1) << 7) \
+ *__c++ = ((bc[1] & 0x1) << 7) \
| ((Mc[1] & 0x3) << 5) \
| ((xmaxc[1] >> 1) & 0x1F); \
- *__c++ = ((xmaxc[1] & 0x1) << 7) \
+ *__c++ = ((xmaxc[1] & 0x1) << 7) \
| ((xmc[13] & 0x7) << 4) \
- | ((xmc[14] & 0x7) << 1) \
+ | ((xmc[14] & 0x7) << 1) \
| ((xmc[15] >> 2) & 0x1); \
- *__c++ = ((xmc[15] & 0x3) << 6) \
+ *__c++ = ((xmc[15] & 0x3) << 6) \
| ((xmc[16] & 0x7) << 3) \
| (xmc[17] & 0x7); \
- *__c++ = ((xmc[18] & 0x7) << 5) \
+ *__c++ = ((xmc[18] & 0x7) << 5) \
| ((xmc[19] & 0x7) << 2) \
| ((xmc[20] >> 1) & 0x3); \
- *__c++ = ((xmc[20] & 0x1) << 7) \
+ *__c++ = ((xmc[20] & 0x1) << 7) \
| ((xmc[21] & 0x7) << 4) \
| ((xmc[22] & 0x7) << 1) \
- | ((xmc[23] >> 2) & 0x1); \
- *__c++ = ((xmc[23] & 0x3) << 6) \
+ | ((xmc[23] >> 2) & 0x1); \
+ *__c++ = ((xmc[23] & 0x3) << 6) \
| ((xmc[24] & 0x7) << 3) \
- | (xmc[25] & 0x7); \
- *__c++ = ((Nc[2] & 0x7F) << 1) /* 20 */ \
+ | (xmc[25] & 0x7); \
+ *__c++ = ((Nc[2] & 0x7F) << 1) /* 20 */ \
| ((bc[2] >> 1) & 0x1); \
- *__c++ = ((bc[2] & 0x1) << 7) \
+ *__c++ = ((bc[2] & 0x1) << 7) \
| ((Mc[2] & 0x3) << 5) \
| ((xmaxc[2] >> 1) & 0x1F); \
- *__c++ = ((xmaxc[2] & 0x1) << 7) \
+ *__c++ = ((xmaxc[2] & 0x1) << 7) \
| ((xmc[26] & 0x7) << 4) \
| ((xmc[27] & 0x7) << 1) \
| ((xmc[28] >> 2) & 0x1); \
- *__c++ = ((xmc[28] & 0x3) << 6) \
+ *__c++ = ((xmc[28] & 0x3) << 6) \
| ((xmc[29] & 0x7) << 3) \
| (xmc[30] & 0x7); \
- *__c++ = ((xmc[31] & 0x7) << 5) \
+ *__c++ = ((xmc[31] & 0x7) << 5) \
| ((xmc[32] & 0x7) << 2) \
| ((xmc[33] >> 1) & 0x3); \
- *__c++ = ((xmc[33] & 0x1) << 7) \
+ *__c++ = ((xmc[33] & 0x1) << 7) \
| ((xmc[34] & 0x7) << 4) \
| ((xmc[35] & 0x7) << 1) \
| ((xmc[36] >> 2) & 0x1); \
- *__c++ = ((xmc[36] & 0x3) << 6) \
- | ((xmc[37] & 0x7) << 3) \
+ *__c++ = ((xmc[36] & 0x3) << 6) \
+ | ((xmc[37] & 0x7) << 3) \
| (xmc[38] & 0x7); \
- *__c++ = ((Nc[3] & 0x7F) << 1) \
+ *__c++ = ((Nc[3] & 0x7F) << 1) \
| ((bc[3] >> 1) & 0x1); \
- *__c++ = ((bc[3] & 0x1) << 7) \
+ *__c++ = ((bc[3] & 0x1) << 7) \
| ((Mc[3] & 0x3) << 5) \
| ((xmaxc[3] >> 1) & 0x1F); \
- *__c++ = ((xmaxc[3] & 0x1) << 7) \
+ *__c++ = ((xmaxc[3] & 0x1) << 7) \
| ((xmc[39] & 0x7) << 4) \
| ((xmc[40] & 0x7) << 1) \
| ((xmc[41] >> 2) & 0x1); \
- *__c++ = ((xmc[41] & 0x3) << 6) /* 30 */ \
+ *__c++ = ((xmc[41] & 0x3) << 6) /* 30 */ \
| ((xmc[42] & 0x7) << 3) \
| (xmc[43] & 0x7); \
- *__c++ = ((xmc[44] & 0x7) << 5) \
+ *__c++ = ((xmc[44] & 0x7) << 5) \
| ((xmc[45] & 0x7) << 2) \
| ((xmc[46] >> 1) & 0x3); \
- *__c++ = ((xmc[46] & 0x1) << 7) \
+ *__c++ = ((xmc[46] & 0x1) << 7) \
| ((xmc[47] & 0x7) << 4) \
| ((xmc[48] & 0x7) << 1) \
| ((xmc[49] >> 2) & 0x1); \
- *__c++ = ((xmc[49] & 0x3) << 6) \
+ *__c++ = ((xmc[49] & 0x3) << 6) \
| ((xmc[50] & 0x7) << 3) \
| (xmc[51] & 0x7); \
}
Modified: team/seanbright/resolve-shadow-warnings/include/asterisk/callerid.h
URL: http://svn.digium.com/view/asterisk/team/seanbright/resolve-shadow-warnings/include/asterisk/callerid.h?view=diff&rev=136480&r1=136479&r2=136480
==============================================================================
--- team/seanbright/resolve-shadow-warnings/include/asterisk/callerid.h (original)
+++ team/seanbright/resolve-shadow-warnings/include/asterisk/callerid.h Thu Aug 7 11:30:13 2008
@@ -255,14 +255,14 @@
} while(0)
#define PUT_AUDIO_SAMPLE(y) do { \
- int __idx = (short)(rint(8192.0 * (y))); \
- *(buf++) = AST_LIN2X(__idx); \
+ int __sample_idx = (short)(rint(8192.0 * (y))); \
+ *(buf++) = AST_LIN2X(__sample_idx); \
bytes++; \
} while(0)
#define PUT_CLID_MARKMS do { \
int __clid_x; \
- for (__clid_x=0;__clid_x<8;x++) \
+ for (__clid_x=0;__clid_x<8;__clid_x++) \
PUT_AUDIO_SAMPLE(callerid_getcarrier(&cr, &ci, 1)); \
} while(0)
Modified: team/seanbright/resolve-shadow-warnings/utils/extconf.c
URL: http://svn.digium.com/view/asterisk/team/seanbright/resolve-shadow-warnings/utils/extconf.c?view=diff&rev=136480&r1=136479&r2=136480
==============================================================================
--- team/seanbright/resolve-shadow-warnings/utils/extconf.c (original)
+++ team/seanbright/resolve-shadow-warnings/utils/extconf.c Thu Aug 7 11:30:13 2008
@@ -5249,16 +5249,16 @@
static struct ast_context *__ast_context_create(struct ast_context **extcontexts, const char *name, const char *registrar, int existsokay)
{
- struct ast_context *tmp, **global_local_contexts;
+ struct ast_context *tmp, **loc_contexts;
int length = sizeof(struct ast_context) + strlen(name) + 1;
if (!extcontexts) {
ast_wrlock_contexts();
- global_local_contexts = &contexts;
+ loc_contexts = &contexts;
} else
- global_local_contexts = extcontexts;
-
- for (tmp = *global_local_contexts; tmp; tmp = tmp->next) {
+ loc_contexts = extcontexts;
+
+ for (tmp = *loc_contexts; tmp; tmp = tmp->next) {
if (!strcasecmp(tmp->name, name)) {
if (!existsokay) {
ast_log(LOG_WARNING, "Tried to register context '%s', already in use\n", name);
@@ -5275,10 +5275,10 @@
strcpy(tmp->name, name);
tmp->root = NULL;
tmp->registrar = registrar;
- tmp->next = *global_local_contexts;
+ tmp->next = *loc_contexts;
tmp->includes = NULL;
tmp->ignorepats = NULL;
- *global_local_contexts = tmp;
+ *loc_contexts = tmp;
if (option_debug)
ast_log(LOG_DEBUG, "Registered context '%s'\n", tmp->name);
if (option_verbose > 2)
@@ -6108,7 +6108,7 @@
void localized_context_destroy(struct ast_context *con, const char *registrar)
{
ast_wrlock_contexts();
- __ast_context_destroy(con,global_registrar);
+ __ast_context_destroy(con,registrar);
ast_unlock_contexts();
}
Modified: team/seanbright/resolve-shadow-warnings/utils/smsq.c
URL: http://svn.digium.com/view/asterisk/team/seanbright/resolve-shadow-warnings/utils/smsq.c?view=diff&rev=136480&r1=136479&r2=136480
==============================================================================
--- team/seanbright/resolve-shadow-warnings/utils/smsq.c (original)
+++ team/seanbright/resolve-shadow-warnings/utils/smsq.c Thu Aug 7 11:30:13 2008
@@ -322,8 +322,7 @@
/* set up user data variables */
{
char tmp[481];
- int n,
- x;
+ int n, x;
for (n = 0, x = 0; x < udl; x++)
{
unsigned short v = ud[x];
More information about the svn-commits
mailing list