[xine-devel] vcdnav gcc 2.96 compile fix

[Gert V. <Ger...@wx...>]

The following patch fixes compile errors of xine-vcdnav with gcc 2.96:


diff -urN /home/gert/DVD_CVS/xine-vcdnav/input/input_vcdnav.c xine-vcdnav/input/input_vcdnav.c
--- /home/gert/DVD_CVS/xine-vcdnav/input/input_vcdnav.c	Wed Jun 26 19:57:16 2002
+++ xine-vcdnav/input/input_vcdnav.c	Fri Jun 28 19:37:09 2002
@@ -377,14 +377,15 @@

    vcdnav_input_plugin_t  *this = (vcdnav_input_plugin_t *) this_gen;
    vcdinfo_obj_t *obj = &this->vcd;
+#if defined (__linux__) || defined(__sun)
+  unpacked_msf_t *start_msf;
+#endif

    dbg_print(INPUT_DBG_MSF,
  	    "cur: %02d:%02d:%02d\n",
  	    this->cur_loc.min, this->cur_loc.sec, this->cur_loc.frame);

  #if defined (__linux__) || defined(__sun)
-  unpacked_msf_t *start_msf;
-
    start_msf = &(this->origin_loc);

    switch (origin) {
diff -urN /home/gert/DVD_CVS/xine-vcdnav/input/vcdnav.c xine-vcdnav/input/vcdnav.c
--- /home/gert/DVD_CVS/xine-vcdnav/input/vcdnav.c	Tue Jun 25 14:19:58 2002
+++ xine-vcdnav/input/vcdnav.c	Fri Jun 28 19:47:50 2002
@@ -72,7 +72,6 @@
  #include "vcdnav.h"

  #define MRL_PREFIX "vcdnav://"
-static const unsigned int mrl_prefix_len = strlen(MRL_PREFIX);

  static off_t _vcdnav_get_track_length (input_plugin_t *this_gen, int track);
  static void  _vcdnav_set_origin(vcdnav_input_plugin_t *this,
@@ -293,10 +292,12 @@
    int count;
    char *p;
    unsigned int num = 0;
+  size_t mrl_prefix_len = 0;

    type_str[0]='\0';
    itemid->type = VCDINFO_ITEM_TYPE_ENTRY;

+  mrl_prefix_len = strlen(MRL_PREFIX);
    if ( NULL != mrl && !strncasecmp(mrl, MRL_PREFIX, mrl_prefix_len) )
      p = &mrl[mrl_prefix_len];
    else {
@@ -699,8 +700,8 @@
      this->log_err(this->plugin, _("bad segment number %d\n"), num);
      return;
    } else {
-    this->look_for_next = true;
      const msf_t *msf = vcdinfo_get_seg_msf(obj, num);
+    this->look_for_next = true;

      this->cur_loc.min = from_bcd8(msf->m);
      this->cur_loc.sec = from_bcd8(msf->s);
diff -urN /home/gert/DVD_CVS/xine-vcdnav/vcdimager-0.7.12-rocky/frontends/cli/vcddump.c 
xine-vcdnav/vcdimager-0.7.12-rocky/frontends/cli/vcddump.c
--- /home/gert/DVD_CVS/xine-vcdnav/vcdimager-0.7.12-rocky/frontends/cli/vcddump.c	Tue Jun 25 14:30:45 2002
+++ xine-vcdnav/vcdimager-0.7.12-rocky/frontends/cli/vcddump.c	Fri Jun 28 19:43:26 2002
@@ -1361,10 +1361,10 @@
      {"volset",&gl.show.pvd.volset},
      {"xa",    &gl.show.pvd.xa},
    };
+
+  poptContext optCon = poptGetContext (NULL, argc, argv, optionsTable, 0);

    init();
-
-  poptContext optCon = poptGetContext (NULL, argc, argv, optionsTable, 0);

    /* end of local declarations */