aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormarkster <markster@f38db490-d61c-443f-a65b-d21fe96a405b>2004-01-28 21:06:03 +0000
committermarkster <markster@f38db490-d61c-443f-a65b-d21fe96a405b>2004-01-28 21:06:03 +0000
commitf3a293b9903ebcb619d011f97e9caaf19e29e204 (patch)
tree4e28fe56e5e8e26ca212b2f33694480740c107c9
parentacd2b6d1105dfd9626334d458a3c30dd10f89a02 (diff)
Elminate unused code/warnings (bug #934)
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@2085 f38db490-d61c-443f-a65b-d21fe96a405b
-rwxr-xr-xapps/app_voicemail.c2
-rwxr-xr-xchannels/chan_alsa.c8
-rwxr-xr-xchannels/chan_local.c2
-rwxr-xr-xchannels/chan_skinny.c2
-rwxr-xr-xchannels/gentone.c2
-rwxr-xr-xformats/format_pcm_alaw.c2
6 files changed, 16 insertions, 2 deletions
diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c
index 612cf9400..536a2e0a8 100755
--- a/apps/app_voicemail.c
+++ b/apps/app_voicemail.c
@@ -2065,6 +2065,7 @@ static void adsi_status2(struct ast_channel *chan, char *folder, int messages)
}
+/*
static void adsi_clear(struct ast_channel *chan)
{
char buf[256];
@@ -2076,6 +2077,7 @@ static void adsi_clear(struct ast_channel *chan)
adsi_transmit_message(chan, buf, bytes, ADSI_MSG_DISPLAY);
}
+*/
static void adsi_goodbye(struct ast_channel *chan)
{
diff --git a/channels/chan_alsa.c b/channels/chan_alsa.c
index d17d1e36b..112a20b27 100755
--- a/channels/chan_alsa.c
+++ b/channels/chan_alsa.c
@@ -59,7 +59,9 @@ static snd_pcm_format_t format = SND_PCM_FORMAT_S16_LE;
static char indevname[50] = ALSA_INDEV;
static char outdevname[50] = ALSA_OUTDEV;
+#if 0
static struct timeval lasttime;
+#endif
static int usecnt;
static int needanswer = 0;
@@ -122,6 +124,7 @@ static struct chan_alsa_pvt {
} alsa;
+#if 0
static int time_has_passed(void)
{
struct timeval tv;
@@ -133,6 +136,7 @@ static int time_has_passed(void)
return -1;
return 0;
}
+#endif
/* Number of buffers... Each is FRAMESIZE/8 ms long. For example
with 160 sample frames, and a buffer size of 3, we have a 60ms buffer,
@@ -153,7 +157,8 @@ static int readdev = -1;
static int writedev = -1;
static int autoanswer = 1;
-
+
+#if 0
static int calc_loudness(short *frame)
{
int sum = 0;
@@ -167,6 +172,7 @@ static int calc_loudness(short *frame)
sum = sum/FRAME_SIZE;
return sum;
}
+#endif
static int cursound = -1;
static int sampsent = 0;
diff --git a/channels/chan_local.c b/channels/chan_local.c
index 1e11c7b50..2cb73f475 100755
--- a/channels/chan_local.c
+++ b/channels/chan_local.c
@@ -250,6 +250,7 @@ static int local_call(struct ast_channel *ast, char *dest, int timeout)
return res;
}
+/*
static void local_destroy(struct local_pvt *p)
{
struct local_pvt *cur, *prev = NULL;
@@ -271,6 +272,7 @@ static void local_destroy(struct local_pvt *p)
if (!cur)
ast_log(LOG_WARNING, "Unable ot find local '%s@%s' in local list\n", p->exten, p->context);
}
+*/
static int local_hangup(struct ast_channel *ast)
{
diff --git a/channels/chan_skinny.c b/channels/chan_skinny.c
index 2c5f8d931..880ff69bb 100755
--- a/channels/chan_skinny.c
+++ b/channels/chan_skinny.c
@@ -2631,6 +2631,7 @@ static int reload_config(void)
return 0;
}
+#if 0
void delete_devices(void)
{
struct skinny_device *d, *dlast;
@@ -2661,6 +2662,7 @@ void delete_devices(void)
devices=NULL;
ast_mutex_unlock(&devicelock);
}
+#endif
int reload(void)
{
diff --git a/channels/gentone.c b/channels/gentone.c
index 530db0eef..29bd88e91 100755
--- a/channels/gentone.c
+++ b/channels/gentone.c
@@ -38,7 +38,7 @@ int main(int argc, char *argv[])
int freq1, freq2;
float wlen1, wlen2;
float val;
- int x, samples1, samples2, samples=0;
+ int x, samples1, samples2=0, samples=0;
char fn[256];
if (argc < 3) {
fprintf(stderr, "Usage: gensound <name> <freq1> [freq2]\n");
diff --git a/formats/format_pcm_alaw.c b/formats/format_pcm_alaw.c
index d7d375edb..62103068d 100755
--- a/formats/format_pcm_alaw.c
+++ b/formats/format_pcm_alaw.c
@@ -62,6 +62,7 @@ static char *desc = "Raw aLaw 8khz PCM Audio support";
static char *exts = "alaw|al";
+#if 0
/* Returns time in msec since system boot. */
static unsigned long get_time(void)
{
@@ -76,6 +77,7 @@ static unsigned long get_time(void)
}
return cur * 1000 / sysconf( _SC_CLK_TCK );
}
+#endif
static struct ast_filestream *pcm_open(int fd)
{