From 2cedce4cb348f6980ec64ab746b58d32f62b20a3 Mon Sep 17 00:00:00 2001
From: Tilman Sauerbeck <tilman@code-monkey.de>
Date: Wed, 16 Aug 2006 19:50:28 +0200
Subject: [PATCH] Code cleanup.

---
 ext/vcedit.c | 34 +++++++++++++++-------------------
 1 file changed, 15 insertions(+), 19 deletions(-)

diff --git a/ext/vcedit.c b/ext/vcedit.c
index b6c7dfd..24622e8 100644
--- a/ext/vcedit.c
+++ b/ext/vcedit.c
@@ -133,7 +133,6 @@ vcedit_clear_internals (vcedit_state *state)
 	}
 
 	state->serial = 0;
-	state->prevW = state->extrapage = state->eosin = 0;
 }
 
 void
@@ -168,6 +167,8 @@ _v_writestring (oggpack_buffer *o, char *s, int len)
 static int
 _commentheader_out (vorbis_comment *vc, char *vendor, ogg_packet *op)
 {
+	int i;
+
 	oggpack_buffer opb;
 
 	oggpack_writeinit (&opb);
@@ -183,16 +184,13 @@ _commentheader_out (vorbis_comment *vc, char *vendor, ogg_packet *op)
 	/* comments */
 	oggpack_write (&opb, vc->comments, 32);
 
-	if (vc->comments) {
-		int i;
-
-		for (i = 0; i < vc->comments; i++) {
-			if (vc->user_comments[i]) {
-				oggpack_write (&opb, vc->comment_lengths[i], 32);
-				_v_writestring (&opb, vc->user_comments[i],
-				                vc->comment_lengths[i]);
-			} else
-				oggpack_write (&opb, 0, 32);
+	for (i = 0; i < vc->comments; i++) {
+		if (!vc->user_comments[i])
+			oggpack_write (&opb, 0, 32);
+		else {
+			oggpack_write (&opb, vc->comment_lengths[i], 32);
+			_v_writestring (&opb, vc->user_comments[i],
+			                vc->comment_lengths[i]);
 		}
 	}
 
@@ -214,13 +212,12 @@ _commentheader_out (vorbis_comment *vc, char *vendor, ogg_packet *op)
 static int
 _blocksize (vcedit_state *s, ogg_packet *p)
 {
-	int this = vorbis_packet_blocksize (s->vi, p);
-	int ret = (this + s->prevW) / 4;
+	int this, ret = 0;
 
-	if (!s->prevW) {
-		s->prevW = this;
-		return 0;
-	}
+	this = vorbis_packet_blocksize (s->vi, p);
+
+	if (s->prevW)
+		ret = (this + s->prevW) / 4;
 
 	s->prevW = this;
 
@@ -418,8 +415,7 @@ vcedit_write (vcedit_state *state)
 		return -1;
 	}
 
-	state->eosin = 0;
-	state->extrapage = 0;
+	state->prevW = state->extrapage = state->eosin = 0;
 
 	header_main.bytes = state->mainlen;
 	header_main.packet = state->mainbuf;
-- 
2.30.2