ogg_afh.c: Rename oggbuf_len to inbuf_size

[paraslash.git] / ogg_afh.c

diff --git a/ogg_afh.c b/ogg_afh.c
index 1d2842874260cb2e6cefa35b52bd91054850ad77..fcc88362981c815cd0a04823d504a7ea4df5dec0 100644 (file)
--- a/ogg_afh.c
+++ b/ogg_afh.c
@@ -35,8 +35,8 @@ static double chunk_time = 0.25;
 
 static OggVorbis_File *oggvorbis_file;
 static FILE *infile;
-static int header_len, oggbuf_len, vi_channels;
-static char *header, *oggbuf;
+static int header_len, inbuf_size, vi_channels;
+static char *header, *inbuf;
 static ssize_t *chunk_table, max_chunk_len;
 static struct audio_format_handler *af;
 static long vi_sampling_rate, vi_bitrate, vi_bitrate_nominal,
@@ -201,9 +201,9 @@ static void ogg_close_audio_file(void)
        free(chunk_table);
        chunk_table = NULL;
        num_chunks = 0;
-       free(oggbuf);
-       oggbuf = NULL;
-       oggbuf_len = 0;
+       free(inbuf);
+       inbuf = NULL;
+       inbuf_size = 0;
 }
 
 static int ogg_save_header(FILE *file, int len)
@@ -311,20 +311,20 @@ static char *ogg_read_chunk(long unsigned current_chunk, ssize_t *len)
        ogg_int64_t cs = get_chunk_size(current_chunk);
        if (!cs) { /* nothing to send for this run */
                *len = 0;
-               return oggbuf;
+               return inbuf;
        }
        if (cs < 0) { /* eof */
                *len = 0;
                return NULL;
        }
        *len = cs;
-       if (!oggbuf || oggbuf_len < *len) {
+       if (!inbuf || inbuf_size < *len) {
                PARA_INFO_LOG("increasing ogg buffer size (%d -> %zu)\n",
-                       oggbuf_len, *len);
-               oggbuf = para_realloc(oggbuf, *len);
-               oggbuf_len = *len;
+                       inbuf_size, *len);
+               inbuf = para_realloc(inbuf, *len);
+               inbuf_size = *len;
        }
-       ret = read(fileno(infile), oggbuf, *len);
+       ret = read(fileno(infile), inbuf, *len);
        if (!ret) {
                *len = 0;
                return NULL;
@@ -336,7 +336,7 @@ static char *ogg_read_chunk(long unsigned current_chunk, ssize_t *len)
        if (ret != *len)
                PARA_WARNING_LOG("short read (%d/%zd)\n", ret, *len);
        *len = ret;
-       return oggbuf;
+       return inbuf;
 }
 
 static char *ogg_get_header_info(int *len)