From 98f7177f4a7e793c3ea1984386f74c696ea54d9f Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Sat, 18 Oct 2008 08:17:55 +0200 Subject: [PATCH] input_stream: don't declare method typedefs The typedefs aren't using by anybody but struct input_stream. Remove them and declare the method type within struct input_stream. --- src/inputStream.h | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/src/inputStream.h b/src/inputStream.h index 3637ac150..84af9a785 100644 --- a/src/inputStream.h +++ b/src/inputStream.h @@ -23,14 +23,6 @@ typedef struct input_stream InputStream; -typedef int (*InputStreamSeekFunc) (struct input_stream *inStream, long offset, - int whence); -typedef size_t(*InputStreamReadFunc) (struct input_stream *inStream, void *ptr, - size_t size); -typedef int (*InputStreamCloseFunc) (struct input_stream *inStream); -typedef int (*InputStreamAtEOFFunc) (struct input_stream *inStream); -typedef int (*InputStreamBufferFunc) (struct input_stream *inStream); - struct input_stream { int ready; @@ -40,12 +32,14 @@ struct input_stream { char *mime; int seekable; - /* don't touc this stuff */ - InputStreamSeekFunc seekFunc; - InputStreamReadFunc readFunc; - InputStreamCloseFunc closeFunc; - InputStreamAtEOFFunc atEOFFunc; - InputStreamBufferFunc bufferFunc; + int (*seekFunc)(struct input_stream *inStream, long offset, + int whence); + size_t (*readFunc)(struct input_stream *inStream, void *ptr, + size_t size); + int (*closeFunc)(struct input_stream *inStream); + int (*atEOFFunc)(struct input_stream *inStream); + int (*bufferFunc)(struct input_stream *inStream); + void *data; char *metaName; char *metaTitle;