Modified: freeswitch/trunk/src/mod/formats/mod_shout/mod_shout.c (14423 => 14424)
--- freeswitch/trunk/src/mod/formats/mod_shout/mod_shout.c 2009-07-29 21:41:04 UTC (rev 14423)
+++ freeswitch/trunk/src/mod/formats/mod_shout/mod_shout.c 2009-07-29 22:33:44 UTC (rev 14424)
@@ -111,7 +111,7 @@
int mp3err;
int dlen;
FILE *fp;
- int samplerate;
+ size_t samplerate;
uint8_t thread_running;
uint8_t shout_init;
uint32_t prebuf;
@@ -791,7 +791,7 @@
}
switch_buffer_zero(context->audio_buffer);
- *cur_sample = mpg123_seek (context->mh, samples, whence);
+ *cur_sample = mpg123_seek (context->mh, (off_t)samples, whence);
return *cur_sample >= 0 ? SWITCH_STATUS_SUCCESS : SWITCH_STATUS_FALSE;
}
Modified: freeswitch/trunk/src/switch.c (14423 => 14424)
--- freeswitch/trunk/src/switch.c 2009-07-29 21:41:04 UTC (rev 14423)
+++ freeswitch/trunk/src/switch.c 2009-07-29 22:33:44 UTC (rev 14424)
@@ -741,15 +741,15 @@
if (destroy_status == SWITCH_STATUS_RESTART) {
char buf[1024] = "";
- int i = 0;
+ int j = 0;
switch_assert(local_argv[0]);
switch_sleep(1000000);
ret = (int)execv(local_argv[0], local_argv);
fprintf(stderr, "Restart Failed [%s] resorting to plan b\n", strerror(errno));
- for(i = 0; i < argc; i++) {
- switch_snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), "%s ", local_argv[i]);
+ for(j = 0; i < argc; j++) {
+ switch_snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), "%s ", local_argv[j]);
}
ret = system(buf);