1 files changed, 28 insertions, 23 deletions

diff --git a/src/input/input_dvb.c b/src/input/input_dvb.c
index 9a40b1996..98a60134f 100644
--- a/src/input/input_dvb.c
+++ b/src/input/input_dvb.c
@@ -116,9 +116,9 @@
 #define LOG_READS
 */
 
-#include "xine_internal.h"
-#include "xineutils.h"
-#include "input_plugin.h"
+#include <xine/xine_internal.h>
+#include <xine/xineutils.h>
+#include <xine/input_plugin.h>
 #include "net_buf_ctrl.h"
 
 #define BUFSIZE 16384
@@ -237,9 +237,8 @@ typedef struct {
   
   int				 adapter_num;
 
-  char				 frontend_device[100];
-  char 				 dvr_device[100];
-  char				 demux_device[100];
+  char 				*dvr_device;
+  char				*demux_device;
   
   struct dmx_pes_filter_params   pesFilterParams[MAX_FILTERS];
   struct dmx_pes_filter_params   subFilterParams[MAX_SUBTITLES];
@@ -362,7 +361,7 @@ typedef struct {
 } dvb_input_plugin_t;
 
 typedef struct {
-	char *name;
+	const char *name;
 	int value;
 } Param;
 
@@ -551,9 +550,10 @@ static void tuner_dispose(tuner_t * this)
     for (x = 0; x < MAX_SUBTITLES; x++)
       if (this->fd_subfilter[x] >= 0)
         close(this->fd_subfilter[x]);
-    
-    if(this)
-      free(this);
+
+    free(this->dvr_device);
+    free(this->demux_device);
+    free(this);
 }
 
 
@@ -563,10 +563,9 @@ static tuner_t *tuner_init(xine_t * xine, int adapter)
     tuner_t *this;
     int x;
     int test_video;
-    char *video_device=xine_xmalloc(200);
+    char *video_device = NULL;
+    char *frontend_device = NULL;
 
-    _x_assert(video_device != NULL);
-    
     this = (tuner_t *) xine_xmalloc(sizeof(tuner_t));
 
     _x_assert(this != NULL);
@@ -579,21 +578,24 @@ static tuner_t *tuner_init(xine_t * xine, int adapter)
     this->xine = xine;
     this->adapter_num = adapter;
     
-    snprintf(this->frontend_device,100,"/dev/dvb/adapter%i/frontend0",this->adapter_num);
-    snprintf(this->demux_device,100,"/dev/dvb/adapter%i/demux0",this->adapter_num);
-    snprintf(this->dvr_device,100,"/dev/dvb/adapter%i/dvr0",this->adapter_num);
-    snprintf(video_device,100,"/dev/dvb/adapter%i/video0",this->adapter_num);
-    
-    if ((this->fd_frontend = open(this->frontend_device, O_RDWR)) < 0) {
+    asprintf(&this->demux_device,"/dev/dvb/adapter%i/demux0",this->adapter_num);
+    asprintf(&this->dvr_device,"/dev/dvb/adapter%i/dvr0",this->adapter_num);
+    asprintf(&video_device,"/dev/dvb/adapter%i/video0",this->adapter_num);
+
+    asprintf(&frontend_device,"/dev/dvb/adapter%i/frontend0",this->adapter_num);
+    if ((this->fd_frontend = open(frontend_device, O_RDWR)) < 0) {
       xprintf(this->xine, XINE_VERBOSITY_DEBUG, "FRONTEND DEVICE: %s\n", strerror(errno));
       tuner_dispose(this);
-      return NULL;
+      this = NULL;
+      goto exit;
     }
+    free(frontend_device); frontend_device = NULL;
 
     if ((ioctl(this->fd_frontend, FE_GET_INFO, &this->feinfo)) < 0) {
       xprintf(this->xine, XINE_VERBOSITY_DEBUG, "FE_GET_INFO: %s\n", strerror(errno));
       tuner_dispose(this);
-      return NULL;
+      this = NULL;
+      goto exit;
     }
 
     for (x = 0; x < MAX_FILTERS; x++) {
@@ -601,7 +603,8 @@ static tuner_t *tuner_init(xine_t * xine, int adapter)
       if (this->fd_pidfilter[x] < 0) {
         xprintf(this->xine, XINE_VERBOSITY_DEBUG, "DEMUX DEVICE PIDfilter: %s\n", strerror(errno));
         tuner_dispose(this);
-	return NULL;
+	this = NULL;
+	goto exit;
       }
    }
     for (x = 0; x < MAX_SUBTITLES; x++) {
@@ -633,7 +636,9 @@ static tuner_t *tuner_init(xine_t * xine, int adapter)
        close(test_video);
   }
 
+ exit:
   free(video_device);
+  free(frontend_device);
   
   return this;
 }
@@ -1594,7 +1599,7 @@ static void load_epg_data(dvb_input_plugin_t *this)
 
           case 0x54: {  /* Content Descriptor, riveting stuff */
               int content_bits = getbits(eit, 8, 4);
-              char *content[] = {
+              static const char *const content[] = {
 		  "UNKNOWN","MOVIE","NEWS","ENTERTAINMENT","SPORT",
 		  "CHILDRENS","MUSIC","ARTS/CULTURE","CURRENT AFFAIRS",
 		  "EDUCATIONAL","INFOTAINMENT","SPECIAL","COMEDY","DRAMA",