fix scripting errors

4 files changed, 44 insertions, 29 deletions

diff --git a/linux/drivers/media/dvb/av7110/av7110.c b/linux/drivers/media/dvb/av7110/av7110.c
index 1261070a8..a5a2193c4 100644
--- a/linux/drivers/media/dvb/av7110/av7110.c
+++ b/linux/drivers/media/dvb/av7110/av7110.c
@@ -392,7 +392,7 @@ static int arm_thread(void *data)
 
 
 static int
-record_cb(dvb_filter_dvb_filter_pes2ts_t *p2t, u8 *buf, size_t len)
+record_cb(dvb_filter_pes2ts_t *p2t, u8 *buf, size_t len)
 {
         dvb_demux_feed_t *dvbdmxfeed=(dvb_demux_feed_t *) p2t->priv;
 
@@ -404,11 +404,11 @@ record_cb(dvb_filter_dvb_filter_pes2ts_t *p2t, u8 *buf, size_t len)
                 return dvbdmxfeed->cb.ts(buf, len, 0, 0, 
                                          &dvbdmxfeed->feed.ts, DMX_OK); 
         else
-                return dvb_filter_dvb_filter_pes2ts(p2t, buf, len);
+                return dvb_filter_pes2ts(p2t, buf, len);
 }
 
 static int 
-dvb_filter_dvb_filter_pes2ts_cb(void *priv, unsigned char *data)
+dvb_filter_pes2ts_cb(void *priv, unsigned char *data)
 {
         dvb_demux_feed_t *dvbdmxfeed=(dvb_demux_feed_t *) priv;
         
@@ -432,20 +432,30 @@ AV_StartRecord(av7110_t *av7110, int av,
 
         switch (av7110->rec_mode) {
         case RP_AUDIO:
-                dvb_filter_dvb_filter_pes2ts_init(&av7110->p2t[0], dvbdmx->pesfilter[0]->pid,
-                            dvb_filter_dvb_filter_pes2ts_cb, (void *)dvbdmx->pesfilter[0]);
+                dvb_filter_pes2ts_init (&av7110->p2t[0],
+					dvbdmx->pesfilter[0]->pid,
+					dvb_filter_pes2ts_cb,
+					(void *)dvbdmx->pesfilter[0]);
                 outcom(av7110, COMTYPE_REC_PLAY, __Record, 2, AudioPES, 0);
                 break;
-        case RP_VIDEO:
-                dvb_filter_dvb_filter_pes2ts_init(&av7110->p2t[1], dvbdmx->pesfilter[1]->pid,
-                            dvb_filter_dvb_filter_pes2ts_cb, (void *)dvbdmx->pesfilter[1]);
+
+	case RP_VIDEO:
+                dvb_filter_pes2ts_init (&av7110->p2t[1],
+					dvbdmx->pesfilter[1]->pid,
+					dvb_filter_pes2ts_cb,
+					(void *)dvbdmx->pesfilter[1]);
                 outcom(av7110, COMTYPE_REC_PLAY, __Record, 2, VideoPES, 0);
                 break;
-        case RP_AV:
-                dvb_filter_dvb_filter_pes2ts_init(&av7110->p2t[0], dvbdmx->pesfilter[0]->pid,
-                            dvb_filter_dvb_filter_pes2ts_cb, (void *)dvbdmx->pesfilter[0]);
-                dvb_filter_dvb_filter_pes2ts_init(&av7110->p2t[1], dvbdmx->pesfilter[1]->pid,
-                            dvb_filter_dvb_filter_pes2ts_cb, (void *)dvbdmx->pesfilter[1]);
+
+	case RP_AV:
+                dvb_filter_pes2ts_init (&av7110->p2t[0],
+					dvbdmx->pesfilter[0]->pid,
+					dvb_filter_pes2ts_cb,
+					(void *)dvbdmx->pesfilter[0]);
+                dvb_filter_pes2ts_init (&av7110->p2t[1],
+					dvbdmx->pesfilter[1]->pid,
+					dvb_filter_pes2ts_cb,
+					(void *)dvbdmx->pesfilter[1]);
                 outcom(av7110, COMTYPE_REC_PLAY, __Record, 2, AV_PES, 0);
                 break;
         }
@@ -2483,9 +2493,12 @@ dvb_play(av7110_t *av7110, const u8 *buf,
                 if (umem) {
                         if (copy_from_user(av7110->kbuf[type], buf, n)) 
                                 return -EFAULT;
-                        dvb_filter_dvb_filter_instant_repack(av7110->kbuf[type], n, &av7110->ipack[type]);
-                } else
-                        dvb_filter_dvb_filter_instant_repack((u8 *)buf, n, &av7110->ipack[type]);
+                        dvb_filter_instant_repack(av7110->kbuf[type], n,
+						  &av7110->ipack[type]);
+                } else {
+                        dvb_filter_instant_repack((u8 *)buf, n,
+						  &av7110->ipack[type]);
+		}
                 todo -= n;
                 buf += n;
         }
@@ -2517,7 +2530,8 @@ dvb_aplay(av7110_t *av7110, const u8 *buf,
                         n=IPACKS*2;
                 if (copy_from_user(av7110->kbuf[type], buf, n)) 
                         return -EFAULT;
-                dvb_filter_dvb_filter_instant_repack(av7110->kbuf[type], n, &av7110->ipack[type]);
+                dvb_filter_instant_repack(av7110->kbuf[type], n,
+					  &av7110->ipack[type]);
 //                        memcpy(dvb->kbuf[type], buf, n); 
                 todo -= n;
                 buf += n;
@@ -3287,7 +3301,8 @@ dvb_write_to_decoder(dvb_demux_feed_t *dvbdmxfeed, u8 *buf, size_t count)
                 }
         }
         
-        dvb_filter_dvb_filter_instant_repack(buf+4, count-4, &av7110->ipack[dvbdmxfeed->pes_type]);
+        dvb_filter_instant_repack(buf+4, count-4,
+				  &av7110->ipack[dvbdmxfeed->pes_type]);
         return 0;
 }
 
diff --git a/linux/drivers/media/dvb/av7110/av7110.h b/linux/drivers/media/dvb/av7110/av7110.h
index 4b996e40c..1337fad21 100644
--- a/linux/drivers/media/dvb/av7110/av7110.h
+++ b/linux/drivers/media/dvb/av7110/av7110.h
@@ -582,7 +582,7 @@ typedef struct av7110_s {
 
         dvb_demux_filter_t     *handle2filter[32];
         p2t_t                   p2t_filter[MAXFILT];
-        dvb_filter_dvb_filter_pes2ts_t                p2t[2];
+        dvb_filter_pes2ts_t     p2t[2];
         struct ipack_s          ipack[2];
         u8                     *kbuf[2];
 
diff --git a/linux/drivers/media/dvb/dvb-core/dvb_filter.c b/linux/drivers/media/dvb/dvb-core/dvb_filter.c
index 2a0f86e9b..c52d1462f 100644
--- a/linux/drivers/media/dvb/dvb-core/dvb_filter.c
+++ b/linux/drivers/media/dvb/dvb-core/dvb_filter.c
@@ -454,7 +454,7 @@ int dvb_filter_instant_repack(u8 *buf, int count, ipack *p)
 			send_ipack(p);
 			dvb_filter_ipack_reset(p);
 			if (c < count)
-				dvb_filter_dvb_filter_instant_repack(buf+c, count-c, p);
+				dvb_filter_instant_repack(buf+c, count-c, p);
 		}
 	}
 	return count;
@@ -495,7 +495,7 @@ void ts_to_pes(ipack *p, u8 *buf) // don't need count (=188)
 		off = buf[4] + 1;
 		if (off+4 > 187) return;
 	}
-	dvb_filter_dvb_filter_instant_repack(buf+4+off, TS_SIZE-4-off, p);
+	dvb_filter_instant_repack(buf+4+off, TS_SIZE-4-off, p);
 }
 
 /* needs 5 byte input, returns picture coding type*/
diff --git a/linux/drivers/media/dvb/dvb-core/dvb_filter.h b/linux/drivers/media/dvb/dvb-core/dvb_filter.h
index c8140a4dd..b084112fa 100644
--- a/linux/drivers/media/dvb/dvb-core/dvb_filter.h
+++ b/linux/drivers/media/dvb/dvb-core/dvb_filter.h
@@ -6,18 +6,18 @@
 
 #include "demux.h"
 
-typedef int (dvb_filter_dvb_filter_pes2ts_cb_t) (void *, unsigned char *);
+typedef int (dvb_filter_pes2ts_cb_t) (void *, unsigned char *);
 
-typedef struct dvb_filter_dvb_filter_pes2ts_s {
+typedef struct dvb_filter_pes2ts_s {
 	unsigned char buf[188];
         unsigned char cc;
-        dvb_filter_dvb_filter_pes2ts_cb_t *cb;
+        dvb_filter_pes2ts_cb_t *cb;
 	void *priv;
-} dvb_filter_dvb_filter_pes2ts_t;
+} dvb_filter_pes2ts_t;
 
-void dvb_filter_dvb_filter_pes2ts_init(dvb_filter_dvb_filter_pes2ts_t *p2ts, unsigned short pid, 
-		 dvb_filter_dvb_filter_pes2ts_cb_t *cb, void *priv);
-int dvb_filter_dvb_filter_pes2ts(dvb_filter_dvb_filter_pes2ts_t *p2ts, unsigned char *pes, int len);
+void dvb_filter_pes2ts_init(dvb_filter_pes2ts_t *p2ts, unsigned short pid, 
+		 	    dvb_filter_pes2ts_cb_t *cb, void *priv);
+int dvb_filter_pes2ts(dvb_filter_pes2ts_t *p2ts, unsigned char *pes, int len);
 
 
 #define PROG_STREAM_MAP  0xBC
@@ -225,7 +225,7 @@ typedef struct audio_i{
 
 
 void dvb_filter_ipack_reset(ipack *p);
-int dvb_filter_dvb_filter_instant_repack(u8 *buf, int count, ipack *p);
+int dvb_filter_instant_repack(u8 *buf, int count, ipack *p);
 void dvb_filter_ipack_init(ipack *p, int size,
 		void (*func)(u8 *buf,  int size, void *priv));
 void dvb_filter_ipack_free(ipack * p);