Am 02.06.2010 10:58, schrieb Fabian Greffrath:
Am 02.06.2010 10:28, schrieb Hans de Goede:
Yes, as can #493735 of course.


Not entirely, the "this" keyword is still used in mmsh.h and mmsx.h.

I guess the attached patch for finally fix it.

>From eb1312be01397a403f4fd80a3b5192cb2a53aa72 Mon Sep 17 00:00:00 2001
From: Fabian Greffrath <fab...@greffrath.com>
Date: Wed, 2 Jun 2010 11:20:47 +0200
Subject: [PATCH] Do not incorrectly use the reserved keyword "this" as a variable name.

---
 src/mmsh.h |   12 ++++++------
 src/mmsx.h |    6 +++---
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/mmsh.h b/src/mmsh.h
index 6a33f0c..b222eea 100644
--- a/src/mmsh.h
+++ b/src/mmsh.h
@@ -41,20 +41,20 @@ mmsh_t*   mmsh_connect (mms_io_t *io, void *data, const char *url_, int bandwidt
 
 int      mmsh_read (mms_io_t *io, mmsh_t *instance, char *data, int len);
 int      mmsh_time_seek (mms_io_t *io, mmsh_t *instance, double time_sec);
-mms_off_t mmsh_seek (mms_io_t *io, mmsh_t *this, mms_off_t offset, int origin);
+mms_off_t mmsh_seek (mms_io_t *io, mmsh_t *instance, mms_off_t offset, int origin);
 uint32_t mmsh_get_length (mmsh_t *instance);
-double   mmsh_get_time_length (mmsh_t *this);
-uint64_t mmsh_get_raw_time_length (mmsh_t *this);
+double   mmsh_get_time_length (mmsh_t *instance);
+uint64_t mmsh_get_raw_time_length (mmsh_t *instance);
 mms_off_t mmsh_get_current_pos (mmsh_t *instance);
 void     mmsh_close (mmsh_t *instance);
 
 int      mmsh_peek_header (mmsh_t *instance, char *data, int maxsize);
 
-uint32_t mmsh_get_asf_header_len (mmsh_t *this);
+uint32_t mmsh_get_asf_header_len (mmsh_t *instance);
 
-uint32_t mmsh_get_asf_packet_len (mmsh_t *this);
+uint32_t mmsh_get_asf_packet_len (mmsh_t *instance);
 
-int      mmsh_get_seekable (mmsh_t *this);
+int      mmsh_get_seekable (mmsh_t *instance);
 
 #ifdef __cplusplus
 }
diff --git a/src/mmsx.h b/src/mmsx.h
index ed6837b..df4adfc 100644
--- a/src/mmsx.h
+++ b/src/mmsx.h
@@ -55,11 +55,11 @@ int       mmsx_peek_header (mmsx_t *instance, char *data, int maxsize);
 
 mms_off_t mmsx_get_current_pos (mmsx_t *instance);
 
-uint32_t  mmsx_get_asf_header_len (mmsx_t *this);
+uint32_t  mmsx_get_asf_header_len (mmsx_t *instance);
 
-uint64_t  mmsx_get_asf_packet_len (mmsx_t *this);
+uint64_t  mmsx_get_asf_packet_len (mmsx_t *instance);
 
-int       mmsx_get_seekable (mmsx_t *this);
+int       mmsx_get_seekable (mmsx_t *instance);
 
 #ifdef __cplusplus
 }
-- 
1.7.1

_______________________________________________
pkg-multimedia-maintainers mailing list
pkg-multimedia-maintainers@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-multimedia-maintainers

Reply via email to