X-Git-Url: http://git.eversberg.eu/gitweb.cgi?p=lcr.git;a=blobdiff_plain;f=tones.c;h=4f8a40f680a6b6eb941e5464a559ae8fb25fae6a;hp=48625bb6841a89c18f0325463f332c74e9f8d924;hb=a425aedc1ee2c0bba4ba20904943afb21bd6e2e5;hpb=de8f81a69bac7db90856ddb639c4bfa62fa80150

diff --git a/tones.c b/tones.c
index 48625bb..4f8a40f 100644
--- a/tones.c
+++ b/tones.c
@@ -41,7 +41,7 @@ int open_tone(char *file, int *codec, signed int *length, signed int *left)
 	char linkname[256];        
 	unsigned char buffer[256];
 	struct fmt *fmt;
-	int channels, bytes;
+	int channels = 0, bytes = 0;
 	unsigned int size, chunk;
 	int gotfmt = 0;
 	struct stat _stat;
@@ -272,7 +272,7 @@ int open_tone(char *file, int *codec, signed int *length, signed int *left)
  */
 int read_tone(int fh, unsigned char *buffer, int codec, int len, signed int size, signed int *left, int speed)
 {
-	int l;
+	int l = 0;
 	int offset;
 	signed short buffer16[len], *buf16 = buffer16;
 	signed short buffer32[len<<1], *buf32 = buffer32;
@@ -463,7 +463,7 @@ int fetch_tones(void)
 		SCPY((*toneset_nextpointer)->directory, p);
 		tonesettone_nextpointer = &(*toneset_nextpointer)->first;
 
-		SPRINT(path, "%s/%s", INSTALL_DATA, p);
+		SPRINT(path, "%s/%s", SHARE_DATA, p);
 		dir = opendir(path);
 		if (dir == NULL)
 		{