[asterisk-commits] seanbright: branch seanbright/resolve-shadow-warnings r114582 - /team/seanbri...

[SVN commits to the Asterisk project]

Author: seanbright
Date: Wed Apr 23 10:06:11 2008
New Revision: 114582

URL: http://svn.digium.com/view/asterisk?view=rev&rev=114582
Log:
More channels that I just got to compile.

Modified:
    team/seanbright/resolve-shadow-warnings/channels/chan_console.c
    team/seanbright/resolve-shadow-warnings/channels/chan_jingle.c

Modified: team/seanbright/resolve-shadow-warnings/channels/chan_console.c
URL: http://svn.digium.com/view/asterisk/team/seanbright/resolve-shadow-warnings/channels/chan_console.c?view=diff&rev=114582&r1=114581&r2=114582
==============================================================================
--- team/seanbright/resolve-shadow-warnings/channels/chan_console.c (original)
+++ team/seanbright/resolve-shadow-warnings/channels/chan_console.c Wed Apr 23 10:06:11 2008
@@ -311,7 +311,7 @@
 			.suggestedLatency = (1.0 / 50.0), /* 20 ms */
 			.device = paNoDevice,
 		};
-		PaDeviceIndex index, num_devices, def_input, def_output;
+		PaDeviceIndex idx, num_devices, def_input, def_output;
 
 		if (!(num_devices = Pa_GetDeviceCount()))
 			return res;
@@ -319,23 +319,23 @@
 		def_input = Pa_GetDefaultInputDevice();
 		def_output = Pa_GetDefaultOutputDevice();
 
-		for (index = 0; 
-			index < num_devices && (input_params.device == paNoDevice 
+		for (idx = 0; 
+			idx < num_devices && (input_params.device == paNoDevice 
 				|| output_params.device == paNoDevice); 
-			index++) 
+			idx++) 
 		{
-			const PaDeviceInfo *dev = Pa_GetDeviceInfo(index);
+			const PaDeviceInfo *dev = Pa_GetDeviceInfo(idx);
 
 			if (dev->maxInputChannels) {
-				if ( (index == def_input && !strcasecmp(pvt->input_device, "default")) ||
+				if ( (idx == def_input && !strcasecmp(pvt->input_device, "default")) ||
 					!strcasecmp(pvt->input_device, dev->name) )
-					input_params.device = index;
+					input_params.device = idx;
 			}
 
 			if (dev->maxOutputChannels) {
-				if ( (index == def_output && !strcasecmp(pvt->output_device, "default")) ||
+				if ( (idx == def_output && !strcasecmp(pvt->output_device, "default")) ||
 					!strcasecmp(pvt->output_device, dev->name) )
-					output_params.device = index;
+					output_params.device = idx;
 			}
 		}
 
@@ -922,7 +922,7 @@
 
 static char *cli_list_available(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a)
 {
-	PaDeviceIndex index, num, def_input, def_output;
+	PaDeviceIndex idx, num, def_input, def_output;
 
 	if (cmd == CLI_INIT) {
 		e->command = "console list available";
@@ -950,16 +950,16 @@
 
 	def_input = Pa_GetDefaultInputDevice();
 	def_output = Pa_GetDefaultOutputDevice();
-	for (index = 0; index < num; index++) {
-		const PaDeviceInfo *dev = Pa_GetDeviceInfo(index);
+	for (idx = 0; idx < num; idx++) {
+		const PaDeviceInfo *dev = Pa_GetDeviceInfo(idx);
 		if (!dev)
 			continue;
 		ast_cli(a->fd, "=== ---------------------------------------------------------\n"
 		               "=== Device Name: %s\n", dev->name);
 		if (dev->maxInputChannels)
-			ast_cli(a->fd, "=== ---> %sInput Device\n", (index == def_input) ? "Default " : "");
+			ast_cli(a->fd, "=== ---> %sInput Device\n", (idx == def_input) ? "Default " : "");
 		if (dev->maxOutputChannels)
-			ast_cli(a->fd, "=== ---> %sOutput Device\n", (index == def_output) ? "Default " : "");
+			ast_cli(a->fd, "=== ---> %sOutput Device\n", (idx == def_output) ? "Default " : "");
 		ast_cli(a->fd, "=== ---------------------------------------------------------\n===\n");
 	}
 

Modified: team/seanbright/resolve-shadow-warnings/channels/chan_jingle.c
URL: http://svn.digium.com/view/asterisk/team/seanbright/resolve-shadow-warnings/channels/chan_jingle.c?view=diff&rev=114582&r1=114581&r2=114582
==============================================================================
--- team/seanbright/resolve-shadow-warnings/channels/chan_jingle.c (original)
+++ team/seanbright/resolve-shadow-warnings/channels/chan_jingle.c Wed Apr 23 10:06:11 2008
@@ -159,7 +159,7 @@
 };
 
 static const char desc[] = "Jingle Channel";
-static const char type[] = "Jingle";
+static const char channel_type[] = "Jingle";
 
 static int global_capability = AST_FORMAT_ULAW | AST_FORMAT_ALAW | AST_FORMAT_GSM | AST_FORMAT_H263;
 
@@ -1418,7 +1418,7 @@
 }
 
 /*! \brief Part of PBX interface */
-static struct ast_channel *jingle_request(const char *type, int format, void *data, int *cause)
+static struct ast_channel *jingle_request(const char *request_type, int format, void *data, int *cause)
 {
 	struct jingle_pvt *p = NULL;
 	struct jingle *client = NULL;
@@ -1820,7 +1820,7 @@
 	ast_cli_register_multiple(jingle_cli, sizeof(jingle_cli) / sizeof(jingle_cli[0]));
 	/* Make sure we can register our channel type */
 	if (ast_channel_register(&jingle_tech)) {
-		ast_log(LOG_ERROR, "Unable to register channel class %s\n", type);
+		ast_log(LOG_ERROR, "Unable to register channel class %s\n", channel_type);
 		return -1;
 	}
 	return 0;