From cf5ccb5725c8a06d290e5dc4d935c566f764e096 Mon Sep 17 00:00:00 2001
From: Angel Ortega <angel@triptico.com>
Date: Mon, 8 Oct 2007 16:12:10 +0200
Subject: [PATCH] More coding style changes.

---
 main.c      | 24 ++++++++++++------------
 midi_song.c |  8 ++++----
 midiin.c    | 14 +++++++-------
 song.c      |  4 ++--
 ss_core.c   | 14 +++++++-------
 ss_eff.c    | 36 ++++++++++++++++++------------------
 ss_gen.c    |  8 ++++----
 ss_input.c  | 28 ++++++++++++++--------------
 ss_ins.c    | 14 +++++++-------
 ss_outdev.c | 48 ++++++++++++++++++++++++------------------------
 ss_output.c | 18 +++++++++---------
 ss_song.c   | 10 +++++-----
 support.c   | 22 +++++++++++-----------
 13 files changed, 124 insertions(+), 124 deletions(-)

diff --git a/main.c b/main.c
index 07647d5..9d3309b 100644
--- a/main.c
+++ b/main.c
@@ -87,39 +87,39 @@ static int main_usage(void)
 	printf("\n");
 	printf("Internal sample size: %d bytes (floating point)\n", (int) sizeof(sample_t));
 
-	return (1);
+	return 1;
 }
 
 
 static int main_interactive(char *script_or_ins)
 {
 	printf("UNIMPLEMENTED; use the 'midiin' program instead.\n");
-	return (0);
+	return 0;
 }
 
 
 static int main_midi(char *script)
 {
 	if (compile_ahs(script))
-		return (3);
+		return 3;
 
 	if (midi_device_open(devfile) < 0) {
 		printf("Error: can't open MIDI device\n");
-		return (2);
+		return 2;
 	}
 
 	midi_song_play(skip_secs);
 
 	midi_device_close();
 
-	return (0);
+	return 0;
 }
 
 
 static int main_ss(char *script)
 {
 	if (compile_ahs(script))
-		return (3);
+		return 3;
 
 	ss_song_render(skip_secs, driver, devfile);
 
@@ -127,7 +127,7 @@ static int main_ss(char *script)
 		printf("clipped: %d optimal volume: %f\n",
 		       ss_output_clipped, ss_optimal_volume);
 
-	return (0);
+	return 0;
 }
 
 
@@ -141,7 +141,7 @@ static int ahxm_main(int argc, char *argv[])
 	int interactive = 0;
 
 	if (argc == 1)
-		return (main_usage());
+		return main_usage();
 
 	read_config();
 
@@ -221,14 +221,14 @@ static int ahxm_main(int argc, char *argv[])
 		else if (strcmp(opt, "-T") == 0)
 			trace = 1;
 		else
-			return (main_usage());
+			return main_usage();
 
 	}
 
 	script = argv[argc - 1];
 
 	if (*script == '-')
-		return (main_usage());
+		return main_usage();
 
 	if (interactive)
 		ret = main_interactive(script);
@@ -237,11 +237,11 @@ static int ahxm_main(int argc, char *argv[])
 	else
 		ret = main_ss(script);
 
-	return (ret);
+	return ret;
 }
 
 
 int main(int argc, char *argv[])
 {
-	return (ahxm_main(argc, argv));
+	return ahxm_main(argc, argv);
 }
diff --git a/midi_song.c b/midi_song.c
index a55c84b..9711d4f 100644
--- a/midi_song.c
+++ b/midi_song.c
@@ -131,9 +131,9 @@ static int midi_ev_cmp_by_time(const void *v1, const void *v2)
 	e2 = (struct midi_ev_generic *) v2;
 
 	if (e1->msecs == e2->msecs)
-		return (e1->type - e2->type);
+		return e1->type - e2->type;
 
-	return (e1->msecs - e2->msecs);
+	return e1->msecs - e2->msecs;
 }
 
 
@@ -410,7 +410,7 @@ int midi_song_play(int skip_secs)
 	if (verbose >= 1)
 		printf("\n");
 
-	return (0);
+	return 0;
 }
 
 
@@ -419,7 +419,7 @@ int midi_device_open(char *devfile)
 	if (devfile == NULL)
 		devfile = "/dev/midi";
 
-	return ((midi_fd = open(devfile, O_WRONLY)));
+	return (midi_fd = open(devfile, O_WRONLY));
 }
 
 
diff --git a/midiin.c b/midiin.c
index 5a3a076..f51773d 100644
--- a/midiin.c
+++ b/midiin.c
@@ -157,7 +157,7 @@ int main(int argc, char *argv[])
 	if (argc == 0) {
 		printf("Usage:\n");
 		printf("midiin [instrument.pat] [midi device]\n");
-		return (1);
+		return 1;
 	}
 
 	if (argc > 1)
@@ -173,32 +173,32 @@ int main(int argc, char *argv[])
 
 	if ((ext = strchr(instrument, '.')) == NULL) {
 		printf("The instrument '%s' doesn't have an extension\n", instrument);
-		return (2);
+		return 2;
 	}
 
 	if (strcmp(ext, ".pat") == 0 || strcmp(ext, ".PAT") == 0) {
 		if (ss_load_pat_file(&ss_song_ins[0], instrument) < 0) {
 			printf("Error loading '%s'\n", instrument);
-			return (2);
+			return 2;
 		}
 	}
 	else {
 		if (compile_ahs(instrument))
-			return (2);
+			return 2;
 
 		if (ss_song_render(0, "default", NULL))
-			return (4);
+			return 4;
 	}
 
 	/* opens the MIDI channel */
 	if ((midi_fd = open(midi_dev, O_RDONLY | O_NONBLOCK)) == -1) {
 		printf("Error opening midi device '%s'\n", midi_dev);
-		return (3);
+		return 3;
 	}
 
 	midiin();
 
 	ss_output_close();
 
-	return (0);
+	return 0;
 }
diff --git a/song.c b/song.c
index 80f99ce..b45f96f 100644
--- a/song.c
+++ b/song.c
@@ -362,7 +362,7 @@ static int song_ev_cmp(const void *v1, const void *v2)
 	if (ret == 0)
 		ret = e1->event_id - e2->event_id;
 
-	return (ret);
+	return ret;
 }
 
 
@@ -425,5 +425,5 @@ int song_test_measure_boundary(double ev_time, int num, int den, int line)
 	if ((ret = ((int) (ev_time * (double) den)) % num))
 		printf("Measure boundary check failed in line %d\n", line);
 
-	return (ret);
+	return ret;
 }
diff --git a/ss_core.c b/ss_core.c
index d6bee5c..febcd1e 100644
--- a/ss_core.c
+++ b/ss_core.c
@@ -65,7 +65,7 @@ double ss_note_frequency(int note)
 	int n;
 
 	if (note < 0 || note > 127)
-		return (0);
+		return 0;
 
 	/* builds the table if empty */
 	if (note_frequency[0] == 0.0) {
@@ -74,7 +74,7 @@ double ss_note_frequency(int note)
 			    pow(2.0, (((double) n - 9.0) / 12.0));
 	}
 
-	return (note_frequency[note]);
+	return note_frequency[note];
 }
 
 
@@ -108,7 +108,7 @@ struct ss_wave *ss_alloc_wave(int size, int n_channels, int s_rate, int p_size)
 		memset(w->wave, '\0', n_channels * sizeof(sample_t *));
 	}
 
-	return (w);
+	return w;
 }
 
 
@@ -221,7 +221,7 @@ static sample_t ss_pick_sample(struct ss_wave *w, int channel, double offset)
 		ss_load_page(w, o);
 
 	wave = w->wave[channel];
-	return (wave[o - w->p_offset]);
+	return wave[o - w->p_offset];
 }
 
 
@@ -316,7 +316,7 @@ sample_t ss_get_sample(struct ss_wave * w, int channel, double offset)
 		break;
 	}
 
-	return (r);
+	return r;
 }
 
 
@@ -345,7 +345,7 @@ double ss_tempo_from_wave(struct ss_wave *w, int note, double len)
 	d *= 4.0;
 	d *= len;
 
-	return (d);
+	return d;
 }
 
 
@@ -369,5 +369,5 @@ double ss_pitch_from_tempo(struct ss_wave *w, double tempo, double len)
 	d /= 60.0;
 	d *= (tempo / 4.0);
 
-	return (w->base_freq * d * len);
+	return w->base_freq * d * len;
 }
diff --git a/ss_eff.c b/ss_eff.c
index bfaf7d3..5427276 100644
--- a/ss_eff.c
+++ b/ss_eff.c
@@ -51,7 +51,7 @@ static struct ss_eff *ss_eff_add(struct ss_eff **ec, double size,
 
 	/* create new structure and reset */
 	if ((e = malloc(sizeof(struct ss_eff))) == NULL)
-		return (NULL);
+		return NULL;
 
 	memset(e, '\0', sizeof(struct ss_eff));
 
@@ -76,7 +76,7 @@ static struct ss_eff *ss_eff_add(struct ss_eff **ec, double size,
 	e->gain = gain;
 	e->func = func;
 
-	return (e);
+	return e;
 }
 
 
@@ -95,7 +95,7 @@ static double ss_eff_lfo(struct ss_eff *e)
 	double r = sin(e->lfo);
 	e->lfo += e->lfo_inc;
 
-	return (r);
+	return r;
 }
 
 
@@ -123,7 +123,7 @@ sample_t ss_eff_process(struct ss_eff * e, sample_t s)
 		e = e->next;
 	}
 
-	return (s);
+	return s;
 }
 
 
@@ -157,7 +157,7 @@ static sample_t *eff_cursor_ptr(struct ss_eff *e)
 /* returns a pointer to the current sample */
 {
 	sample_t *wave = e->wave->wave[0];
-	return (wave + (int) e->cursor);
+	return wave + (int) e->cursor;
 }
 
 
@@ -172,7 +172,7 @@ static sample_t func_delay(struct ss_eff *e, sample_t input)
 	s = *p;
 	*p = input;
 
-	return (s);
+	return s;
 }
 
 
@@ -202,7 +202,7 @@ static sample_t func_echo(struct ss_eff *e, sample_t input)
 	s = *p * e->gain;
 	*p = input;
 
-	return (input + s);
+	return input + s;
 }
 
 
@@ -233,7 +233,7 @@ static sample_t func_comb(struct ss_eff *e, sample_t input)
 	s = *p;
 	*p = input + (s * e->gain);
 
-	return (input + s);
+	return input + s;
 }
 
 
@@ -268,7 +268,7 @@ static sample_t func_allpass(struct ss_eff *e, sample_t input)
 
 	*p = u;
 
-	return (s);
+	return s;
 }
 
 
@@ -303,7 +303,7 @@ static sample_t func_flanger(struct ss_eff *e, sample_t input)
 	p = eff_cursor_ptr(e);
 	*p = input;
 
-	return (input + s);
+	return input + s;
 }
 
 
@@ -343,7 +343,7 @@ static sample_t func_wobble(struct ss_eff *e, sample_t input)
 
 	s = (input * fabs(ss_eff_lfo(e)) * e->gain) + (input * (1.0 - e->gain));
 
-	return (s);
+	return s;
 }
 
 
@@ -374,7 +374,7 @@ void ss_eff_wobble(struct ss_eff **ec, double freq, double phase, sample_t gain)
 
 static sample_t func_square_wobble(struct ss_eff *e, sample_t input)
 {
-	return (ss_eff_lfo(e) > 0 ? input : 0);
+	return ss_eff_lfo(e) > 0 ? input : 0;
 }
 
 
@@ -406,7 +406,7 @@ static sample_t func_half_wobble(struct ss_eff *e, sample_t input)
 
 	s = ss_eff_lfo(e);
 
-	return (s > 0.0 ? s * input : 0.0);
+	return s > 0.0 ? s * input : 0.0;
 }
 
 
@@ -441,7 +441,7 @@ static sample_t func_fader(struct ss_eff *e, sample_t input)
 	if (e->cursor == e->wave->size - 1)
 		e->igain = 0;
 
-	return (s);
+	return s;
 }
 
 
@@ -491,7 +491,7 @@ static sample_t func_foldback(struct ss_eff *e, sample_t input)
 	else if (input < -e->gain)
 		s = -e->gain + (-e->gain - input);
 
-	return (s);
+	return s;
 }
 
 
@@ -519,7 +519,7 @@ static sample_t func_atan(struct ss_eff *e, sample_t input)
 	/* http://www.musicdsp.org/showArchiveComment.php?ArchiveID=104 */
 	s = atan(s * e->gain) / e->gain;
 
-	return (s);
+	return s;
 }
 
 
@@ -546,7 +546,7 @@ static sample_t func_distort(struct ss_eff *e, sample_t input)
 	/* http://www.musicdsp.org/showArchiveComment.php?ArchiveID=86 */
 	s = s - e->gain * s * s * s;
 
-	return (s);
+	return s;
 }
 
 
@@ -573,7 +573,7 @@ static sample_t func_overdrive(struct ss_eff *e, sample_t input)
 	/* http://www.musicdsp.org/archive.php?classid=4#41 */
 	s = s * (fabs(s) + e->gain) / (s * s + (e->gain - 1) * fabs(s) + 1);
 
-	return (s);
+	return s;
 }
 
 
diff --git a/ss_gen.c b/ss_gen.c
index 3fad289..3f57eec 100644
--- a/ss_gen.c
+++ b/ss_gen.c
@@ -90,7 +90,7 @@ static struct ss_gen *ss_gen_dequeue(struct ss_gen **q, struct ss_gen *g)
 	if (g->next != NULL)
 		g->next->prev = g->prev;
 
-	return (g);
+	return g;
 }
 
 
@@ -102,7 +102,7 @@ static struct ss_gen *ss_gen_pop(struct ss_gen **q)
 	if (*q != NULL)
 		g = ss_gen_dequeue(q, *q);
 
-	return (g);
+	return g;
 }
 
 
@@ -122,7 +122,7 @@ struct ss_gen *ss_gen_alloc(struct ss_gen **q)
 	if ((g = ss_gen_pop(&ss_gen_free_queue)) != NULL)
 		ss_gen_enqueue(q, g);
 
-	return (g);
+	return g;
 }
 
 
@@ -331,5 +331,5 @@ int ss_gen_frame(struct ss_gen *g, int n_channels, sample_t frame[])
 	/* process portamento */
 	g->inc += g->portamento;
 
-	return (to_free);
+	return to_free;
 }
diff --git a/ss_input.c b/ss_input.c
index f7cee0e..100230b 100644
--- a/ss_input.c
+++ b/ss_input.c
@@ -50,7 +50,7 @@ static int fget16(FILE * f)
 	c = fgetc(f);
 	c += (fgetc(f) * 256);
 
-	return (c);
+	return c;
 }
 
 
@@ -64,7 +64,7 @@ static int fget32(FILE * f)
 	c += (fgetc(f) * 65536);
 	c += (fgetc(f) * 16777216);
 
-	return (c);
+	return c;
 }
 
 
@@ -75,7 +75,7 @@ static sample_t load_sample(FILE * f, int bits, int sign)
 
 	/* if on eof, return silence */
 	if (feof(f))
-		return (0);
+		return 0;
 
 	if (bits == 8) {
 		s = fgetc(f) - 128;
@@ -88,7 +88,7 @@ static sample_t load_sample(FILE * f, int bits, int sign)
 			s = (short int) fget16(f);
 	}
 
-	return (((sample_t) s) / 32768.0);
+	return ((sample_t) s) / 32768.0;
 }
 
 
@@ -138,15 +138,15 @@ struct ss_wave *ss_load_wav_file(char *file,
 	else {
 		/* find the file in the library path */
 		if ((file = libpath_locate(file)) == NULL)
-			return (NULL);
+			return NULL;
 
 		/* try converting */
 		if ((file = transconv(file, ".wav", "ahxm")) == NULL)
-			return (NULL);
+			return NULL;
 	}
 
 	if ((f = fopen(file, "r")) == NULL)
-		return (NULL);
+		return NULL;
 
 	fread(riffid, 1, 4, f);
 	riffid[4] = 0;
@@ -156,7 +156,7 @@ struct ss_wave *ss_load_wav_file(char *file,
 
 	if (strcmp(waveid, "WAVE")) {
 		fclose(f);
-		return (NULL);
+		return NULL;
 	}
 
 	fread(fmtid, 1, 4, f);
@@ -169,7 +169,7 @@ struct ss_wave *ss_load_wav_file(char *file,
 	if (fget16(f) != 1) {
 		/* wicked compressed format? fail */
 		fclose(f);
-		return (NULL);
+		return NULL;
 	}
 
 	n_channels = fget16(f);
@@ -218,7 +218,7 @@ struct ss_wave *ss_load_wav_file(char *file,
 
 	fclose(f);
 
-	return (w);
+	return w;
 }
 
 
@@ -244,19 +244,19 @@ int ss_load_pat_file(struct ss_ins *i, char *file)
 	struct ss_wave *w;
 
 	if ((f = libpath_fopen(file, "r")) == NULL)
-		return (-100);
+		return -100;
 
 	/* read signatures */
 	fread(buffer, 12, 1, f);
 	if (strcmp(buffer, "GF1PATCH110") != 0) {
 		fclose(f);
-		return (-101);
+		return -101;
 	}
 
 	fread(buffer, 10, 1, f);
 	if (strcmp(buffer, "ID#000002") != 0) {
 		fclose(f);
-		return (-102);
+		return -102;
 	}
 
 	/* skip description */
@@ -379,5 +379,5 @@ int ss_load_pat_file(struct ss_ins *i, char *file)
 	}
 
 	fclose(f);
-	return (0);
+	return 0;
 }
diff --git a/ss_ins.c b/ss_ins.c
index ed949e9..47a276a 100644
--- a/ss_ins.c
+++ b/ss_ins.c
@@ -131,7 +131,7 @@ struct ss_wave *ss_ins_find_layer(struct ss_ins *i, double freq, int *off)
 	else
 		(*off)++;
 
-	return (w);
+	return w;
 }
 
 
@@ -246,11 +246,11 @@ int ss_ins_play(struct ss_ins *i, double freq, sample_t vol, int note_id, struct
 
 	/* if the instrument is disabled, no more notes are allowed */
 	if (i->disabled)
-		return (-1);
+		return -1;
 
 	/* get a free generator, or fail */
 	if ((g = ss_gen_alloc(&i->gens)) == NULL)
-		return (-2);
+		return -2;
 
 	/* start the generator */
 	ss_gen_play(g, freq, vol, note_id, w);
@@ -261,7 +261,7 @@ int ss_ins_play(struct ss_ins *i, double freq, sample_t vol, int note_id, struct
 	ss_gen_vibrato(g, i->vib_depth, i->vib_freq);
 	ss_gen_portamento(g, i->portamento);
 
-	return (1);
+	return 1;
 }
 
 
@@ -293,7 +293,7 @@ int ss_ins_note_on(struct ss_ins *i, int note, sample_t vol, int note_id)
 			break;
 	}
 
-	return (g);
+	return g;
 }
 
 
@@ -340,7 +340,7 @@ int ss_ins_frame(struct ss_ins *i, sample_t frame[])
 		for (n = 0; n < i->n_channels; n++)
 			ss_eff_off(&i->effs[n]);
 
-		return (0);
+		return 0;
 	}
 
 	/* resets this local frame */
@@ -359,5 +359,5 @@ int ss_ins_frame(struct ss_ins *i, sample_t frame[])
 	for (n = 0; n < i->n_channels; n++)
 		frame[n] += ss_eff_process(i->effs[n], l_frame[n] * i->vols[n]);
 
-	return (1);
+	return 1;
 }
diff --git a/ss_outdev.c b/ss_outdev.c
index 2162141..651278f 100644
--- a/ss_outdev.c
+++ b/ss_outdev.c
@@ -41,7 +41,7 @@
 
 static void *d_unsupp(char *drvname, char *filename, int freq, int n_channels, int *ssize)
 {
-	return (NULL);
+	return NULL;
 }
 
 
@@ -76,22 +76,22 @@ static void *d_arts(char *drvname, char *filename, int freq, int n_channels, int
 	static struct ss_outdrv_arts drv;
 
 	if (drvname && strcmp("arts", drvname) != 0)
-		return (NULL);
+		return NULL;
 
 	/* filename specified? get out */
 	if (filename != NULL)
-		return (NULL);
+		return NULL;
 
 	*ssize = sizeof(struct ss_outdrv_arts);
 	drv.func = d_arts_func;
 	drv.size = n_channels >= 2 ? 2 : 1;
 
 	if (arts_init() || (drv.arts = arts_play_stream(freq, 16, drv.size, "ahxm")) == NULL)
-		return (NULL);
+		return NULL;
 
 	drv.size *= sizeof(short int);
 
-	return (&drv);
+	return &drv;
 }
 
 
@@ -136,7 +136,7 @@ static void *d_esd(char *drvname, char *filename, int freq, int n_channels, int
 	esd_format_t format;
 
 	if (drvname && strcmp("esd", drvname) != 0)
-		return (NULL);
+		return NULL;
 
 	*ssize = sizeof(struct ss_outdrv_esd);
 	drv.func = d_esd_func;
@@ -147,11 +147,11 @@ static void *d_esd(char *drvname, char *filename, int freq, int n_channels, int
 
 	if (esd_open_sound(filename) < 0 ||
 	    (drv.fd = esd_play_stream_fallback(format, freq, NULL, "ahxm")) < 0)
-		return (NULL);
+		return NULL;
 
 	drv.size *= sizeof(short int);
 
-	return (&drv);
+	return &drv;
 }
 
 
@@ -197,11 +197,11 @@ static void *d_sgi(char *drvname, char *filename, int freq, int n_channels, int
 	ALpv p[2];
 
 	if (drvname && strcmp("sgi", drvname) != 0)
-		return (NULL);
+		return NULL;
 
 	/* filename specified? get out */
 	if (filename != NULL)
-		return (NULL);
+		return NULL;
 
 	*ssize = sizeof(struct ss_outdrv_sgi);
 	drv.func = d_sgi_func;
@@ -212,7 +212,7 @@ static void *d_sgi(char *drvname, char *filename, int freq, int n_channels, int
 	p[1].value.ll = alDoubleToFixed((double) freq);
 
 	if (!(drv.ac = alNewConfig()))
-		return (NULL);
+		return NULL;
 
 	if (alSetChannels(drv.ac, n_channels) < 0 ||
 	    alSetWidth(drv.ac, AL_SAMPLE_16) < 0 ||
@@ -222,10 +222,10 @@ static void *d_sgi(char *drvname, char *filename, int freq, int n_channels, int
 	    alSetParams(alGetDevice(drv.ac), p, 2) < 0 ||
 	    !(drv.ap = alOpenPort("ahxm", "w", drv.ac))) {
 		alFreeConfig(drv.ac);
-		return (NULL);
+		return NULL;
 	}
 
-	return (&drv);
+	return &drv;
 }
 
 #else				/* CONFOPT_SGI */
@@ -259,7 +259,7 @@ static int is_little_endian(void)
 	short s = 1;
 	unsigned char *c = (unsigned char *) &s;
 
-	return (*c == 1);
+	return *c == 1;
 }
 
 static void d_oss_func(void *d, short int *frame)
@@ -281,7 +281,7 @@ static void *d_oss(char *drvname, char *filename, int freq, int n_channels, int
 	int fr, st, fm;
 
 	if (drvname && strcmp("oss", drvname) != 0)
-		return (NULL);
+		return NULL;
 
 	if (filename == NULL)
 		filename = "/dev/dsp";
@@ -295,7 +295,7 @@ static void *d_oss(char *drvname, char *filename, int freq, int n_channels, int
 	drv.size = n_channels >= 2 ? 2 : 1;
 
 	if ((drv.fd = open(filename, O_WRONLY)) < 0)
-		return (NULL);
+		return NULL;
 
 	if (ioctl(drv.fd, SNDCTL_DSP_SETFRAGMENT, &fr) < 0 ||
 	    ioctl(drv.fd, SNDCTL_DSP_RESET, 0) < 0 ||
@@ -303,12 +303,12 @@ static void *d_oss(char *drvname, char *filename, int freq, int n_channels, int
 	    ioctl(drv.fd, SNDCTL_DSP_STEREO, &st) < 0 ||
 	    ioctl(drv.fd, SNDCTL_DSP_SETFMT, &fm) < 0) {
 		close(drv.fd);
-		return (NULL);
+		return NULL;
 	}
 
 	drv.size *= sizeof(short int);
 
-	return (&drv);
+	return &drv;
 }
 
 #else				/* CONFOPT_LINUX_OSS */
@@ -377,7 +377,7 @@ static void *d_wav(char *drvname, char *filename, int freq, int n_channels, int
 	static struct ss_outdrv_wav drv;
 
 	if (drvname && strcmp("wav", drvname) != 0)
-		return (NULL);
+		return NULL;
 
 	if (filename == NULL)
 		filename = "output.wav";
@@ -388,7 +388,7 @@ static void *d_wav(char *drvname, char *filename, int freq, int n_channels, int
 	drv.n_frames = 0;
 
 	if ((drv.fd = fopen(filename, "w")) == NULL)
-		return (0);
+		return 0;
 
 	/* write wav header */
 
@@ -406,7 +406,7 @@ static void *d_wav(char *drvname, char *filename, int freq, int n_channels, int
 	fwrite("data", 1, 4, drv.fd);
 	fput32(0, drv.fd);	/* second checkpoint (offset: 40) */
 
-	return (&drv);
+	return &drv;
 }
 
 
@@ -449,7 +449,7 @@ static void *outdev_thread(void *driver)
 	}
 
 	pthread_mutex_unlock(&mutex);
-	return (NULL);
+	return NULL;
 }
 
 
@@ -527,7 +527,7 @@ void *ss_outdev_open(char *drvname, char *file, int freq, int n_channels)
 
 	thread_setup(ret, n_channels);
 
-	return (ret);
+	return ret;
 }
 
 
@@ -546,5 +546,5 @@ void *ss_outdev_close(void *drv)
 		free(drv);
 	}
 
-	return (NULL);
+	return NULL;
 }
diff --git a/ss_output.c b/ss_output.c
index 6a9d72c..25285f3 100644
--- a/ss_output.c
+++ b/ss_output.c
@@ -128,8 +128,8 @@ int ss_output_open(char *drvname, char *filename)
 	/* store a copy of the filename */
 	ss_output_file_name = filename;
 
-	return ((outdev = ss_outdev_open(drvname,
-					 filename, ss_frequency, ss_nchannels)) == NULL);
+	return (outdev = ss_outdev_open(drvname,
+					 filename, ss_frequency, ss_nchannels)) == NULL;
 }
 
 
@@ -195,7 +195,7 @@ int ss_output_write(sample_t frame[])
 	/* finally write */
 	ss_outdev_write(outdev, is);
 
-	return (ret);
+	return ret;
 }
 
 
@@ -224,7 +224,7 @@ static int cue_file_init(void)
 	FILE *f;
 
 	if (ss_output_file_name == NULL || (f = fopen(ss_cue_file_name, "w")) == NULL)
-		return (-2);
+		return -2;
 
 	/* write first line */
 	fprintf(f, "FILE \"%s\" WAVE\n", ss_output_file_name);
@@ -232,7 +232,7 @@ static int cue_file_init(void)
 
 	ss_cue_file_track = 0;
 
-	return (0);
+	return 0;
 }
 
 
@@ -242,20 +242,20 @@ int cue_file_song_info(int frame, char *author, char *name)
 	FILE *f;
 
 	if (ss_cue_file_name == NULL)
-		return (0);
+		return 0;
 
 	/* init if it's the first time */
 	if (ss_cue_file_track == -1) {
 		/* can't open? fail */
 		if (cue_file_init() < 0) {
 			ss_cue_file_name = NULL;
-			return (-1);
+			return -1;
 		}
 	}
 
 	/* open or fail */
 	if ((f = fopen(ss_cue_file_name, "a")) == NULL)
-		return (-1);
+		return -1;
 
 	s = frame / ss_frequency;
 
@@ -265,5 +265,5 @@ int cue_file_song_info(int frame, char *author, char *name)
 	fprintf(f, "  INDEX 01 %02d:%02d:00\n", s / 60, s % 60);
 
 	fclose(f);
-	return (0);
+	return 0;
 }
diff --git a/ss_song.c b/ss_song.c
index d0effad..fd018c4 100644
--- a/ss_song.c
+++ b/ss_song.c
@@ -241,7 +241,7 @@ static int ss_ev_cmp(const void *v1, const void *v2)
 	if (ret == 0)
 		ret = e1->event_id - e2->event_id;
 
-	return (ret);
+	return ret;
 }
 
 
@@ -1015,7 +1015,7 @@ static union ss_ev *process_this_frame_events(union ss_ev *e, int skip_frames)
 
 	frame++;
 
-	return (e);
+	return e;
 }
 
 
@@ -1036,7 +1036,7 @@ int ss_song_render(int skip_secs, char *driver, char *devfile)
 
 	if (trace) {
 		ss_song_trace_events();
-		return (0);
+		return 0;
 	}
 
 	/* set the number of channels, unless forced */
@@ -1045,7 +1045,7 @@ int ss_song_render(int skip_secs, char *driver, char *devfile)
 
 	if (ss_output_open(driver, devfile) < 0) {
 		printf("Error: can't init driver\n");
-		return (2);
+		return 2;
 	}
 
 	/* init the generators */
@@ -1081,5 +1081,5 @@ int ss_song_render(int skip_secs, char *driver, char *devfile)
 
 	ss_output_close();
 
-	return (0);
+	return 0;
 }
diff --git a/support.c b/support.c
index 0735cea..b92610d 100644
--- a/support.c
+++ b/support.c
@@ -151,7 +151,7 @@ FILE *libpath_fopen(char *filename, char *mode)
 		located_file[sizeof(located_file) - 1] = '\0';
 
 		libpath_add(filename, 1);
-		return (f);
+		return f;
 	}
 
 	/* couldn't open; try concatenating all stored paths */
@@ -166,7 +166,7 @@ FILE *libpath_fopen(char *filename, char *mode)
 		}
 	}
 
-	return (f);
+	return f;
 }
 
 
@@ -184,10 +184,10 @@ char *libpath_locate(char *filename)
 	FILE *f;
 
 	if ((f = libpath_fopen(filename, "r")) == NULL)
-		return (NULL);
+		return NULL;
 
 	fclose(f);
-	return (located_file);
+	return located_file;
 }
 
 
@@ -230,7 +230,7 @@ static char *transconv_sha_file(char *file, char *ext)
 	}
 
 	c_file[n * 2] = '\0';
-	return (c_file);
+	return c_file;
 }
 
 
@@ -255,7 +255,7 @@ static char *transconv_unique_file(char *file, char *ext, char *dir)
 	strcat(tmp, transconv_sha_file(file, ext));
 	strcat(tmp, ext);
 
-	return (tmp);
+	return tmp;
 }
 
 
@@ -277,7 +277,7 @@ char *transconv_pipe(char *cmd, char *ext, char *dir)
 		system(tmp);
 	}
 
-	return (c_file);
+	return c_file;
 }
 
 
@@ -291,18 +291,18 @@ char *transconv(char *file, char *ext, char *dir)
 
 	/* gets this file extension */
 	if (file == NULL || (this_ext = strrchr(file, '.')) == NULL)
-		return (NULL);
+		return NULL;
 
 	/* if it's already the desired type, do nothing */
 	if (strcmp(ext, this_ext) == 0)
-		return (file);
+		return file;
 
 	/* get a unique name */
 	c_file = transconv_unique_file(file, ext, dir);
 
 	/* does the file already exist? */
 	if (access(c_file, R_OK) == 0)
-		return (c_file);
+		return c_file;
 
 	/* no; look for a suitable converter */
 	for (n = 0, t = transconvs; n < n_transconvs; n++, t++) {
@@ -324,5 +324,5 @@ char *transconv(char *file, char *ext, char *dir)
 		}
 	}
 
-	return (c_file);
+	return c_file;
 }
-- 
2.11.4.GIT