DO NOT use c++ comments!

CVS patchset: 4711
CVS date: 2003/04/29 21:46:04

6 files changed, 56 insertions, 56 deletions

diff --git a/src/input/libdvdnav/dvd_udf.c b/src/input/libdvdnav/dvd_udf.c
index a1066549c..9ace65c14 100644
--- a/src/input/libdvdnav/dvd_udf.c
+++ b/src/input/libdvdnav/dvd_udf.c
@@ -241,7 +241,7 @@ static int SetUDFCache(dvd_reader_t *device, UDFCacheType type,
   
   if(c == NULL) {
     c = calloc(1, sizeof(struct udf_cache));    
-    //    fprintf(stderr, "calloc: %d\n", sizeof(struct udf_cache));    
+    /*    fprintf(stderr, "calloc: %d\n", sizeof(struct udf_cache)); */
     if(c == NULL) {
       return 0;
     }
@@ -350,7 +350,7 @@ static int Unicodedecode( uint8_t *data, int len, char *target )
 static int UDFDescriptor( uint8_t *data, uint16_t *TagID ) 
 {
     *TagID = GETN2(0);
-    // TODO: check CRC 'n stuff
+    /* TODO: check CRC 'n stuff */
     return 0;
 }
 
@@ -368,7 +368,7 @@ static int UDFShortAD( uint8_t *data, struct AD *ad,
     ad->Flags = ad->Length >> 30;
     ad->Length &= 0x3FFFFFFF;
     ad->Location = GETN4(4);
-    ad->Partition = partition->Number; // use number of current partition
+    ad->Partition = partition->Number; /* use number of current partition */
     return 0;
 }
 
@@ -379,7 +379,7 @@ static int UDFLongAD( uint8_t *data, struct AD *ad )
     ad->Length &= 0x3FFFFFFF;
     ad->Location = GETN4(4);
     ad->Partition = GETN2(8);
-    //GETN(10, 6, Use);
+    /*GETN(10, 6, Use);*/
     return 0;
 }
 
@@ -390,7 +390,7 @@ static int UDFExtAD( uint8_t *data, struct AD *ad )
     ad->Length &= 0x3FFFFFFF;
     ad->Location = GETN4(12);
     ad->Partition = GETN2(16);
-    //GETN(10, 6, Use);
+    /*GETN(10, 6, Use);*/
     return 0;
 }
 
@@ -421,9 +421,9 @@ static int UDFLogVolume( uint8_t *data, char *VolumeDescriptor )
 {
     uint32_t lbsize, MT_L, N_PM;
     Unicodedecode(&data[84], 128, VolumeDescriptor);
-    lbsize = GETN4(212);  // should be 2048
-    MT_L = GETN4(264);    // should be 6
-    N_PM = GETN4(268);    // should be 1
+    lbsize = GETN4(212);  /* should be 2048 */
+    MT_L = GETN4(264);    /* should be 6 */
+    N_PM = GETN4(268);    /* should be 1 */
     if (lbsize != DVD_VIDEO_LB_LEN) return 1;
     return 0;
 }
@@ -438,10 +438,10 @@ static int UDFFileEntry( uint8_t *data, uint8_t *FileType,
     UDFICB( &data[ 16 ], FileType, &flags );
    
     /* Init ad for an empty file (i.e. there isn't a AD, L_AD == 0 ) */
-    ad->Length = GETN4( 60 ); // Really 8 bytes a 56
+    ad->Length = GETN4( 60 ); /* Really 8 bytes a 56 */
     ad->Flags = 0;
-    ad->Location = 0; // what should we put here? 
-    ad->Partition = partition->Number; // use number of current partition
+    ad->Location = 0; /* what should we put here? */
+    ad->Partition = partition->Number; /* use number of current partition */
 
     L_EA = GETN4( 168 );
     L_AD = GETN4( 172 );
@@ -809,7 +809,7 @@ uint32_t UDFFindFile( dvd_reader_t *device, char *filename,
         }
 
         /* File Set Descriptor */
-        if( TagID == 256 ) {  // File Set Descriptor
+        if( TagID == 256 ) {  /* File Set Descriptor */
             UDFLongAD( &LogBlock[ 400 ], &RootICB );
         }
     } while( ( lbnum < partition.Start + partition.Length )
diff --git a/src/input/libdvdnav/ifo_print.c b/src/input/libdvdnav/ifo_print.c
index 6d5b54acf..6432aea09 100644
--- a/src/input/libdvdnav/ifo_print.c
+++ b/src/input/libdvdnav/ifo_print.c
@@ -73,7 +73,7 @@ static void ifoPrint_CMD(int row, vm_cmd_t *command) {
     printf("%02x ", command->bytes[i]);
   printf("| ");
 
-  //vmcmd(command);
+  /* vmcmd(command); */
   printf("\n");
 }
 
@@ -129,19 +129,19 @@ static void ifoPrint_video_attributes(video_attr_t *attr) {
     printf("(please send a bug report) ");
   }
   
-  // Wide is allways allowed..!!!
+  /* Wide is allways allowed..!!! */
   switch(attr->permitted_df) {
   case 0:
     printf("pan&scan+letterboxed ");
     break;
   case 1:
-    printf("only pan&scan "); //??
+    printf("only pan&scan "); /*??*/
     break;
   case 2:
     printf("only letterboxed ");
     break;
   case 3:
-    // not specified
+    /* not specified */
     break;
   default:
     printf("(please send a bug report)");
@@ -198,7 +198,7 @@ static void ifoPrint_video_attributes(video_attr_t *attr) {
   if(attr->film_mode) {
     printf("film");
   } else {
-    printf("video"); //camera
+    printf("video"); /* camera */
   }
 }
 
@@ -251,7 +251,7 @@ static void ifoPrint_audio_attributes(audio_attr_t *attr) {
   
   switch(attr->lang_type) {
   case 0:
-    // not specified
+    /* not specified */
     CHECK_VALUE(attr->lang_code == 0 || attr->lang_code == 0xffff);
     break;
   case 1:
@@ -264,7 +264,7 @@ static void ifoPrint_audio_attributes(audio_attr_t *attr) {
 
   switch(attr->application_mode) {
   case 0:
-    // not specified
+    /* not specified */
     break;
   case 1:
     printf("karaoke mode ");
@@ -311,19 +311,19 @@ static void ifoPrint_audio_attributes(audio_attr_t *attr) {
   case 0:
     printf("Not specified ");
     break;
-  case 1: // Normal audio
+  case 1: /* Normal audio */
     printf("Normal Caption ");
     break;
-  case 2: // visually imparied
+  case 2: /* visually imparied */
     printf("Audio for visually impaired ");
     break;
-  case 3: // Directors 1
+  case 3: /* Directors 1 */
     printf("Director's comments 1 ");
     break;
-  case 4: // Directors 2
+  case 4: /* Directors 2 */
     printf("Director's comments 2 ");
     break;
-    //case 4: // Music score ?    
+    /*case 4:  Music score ? */
   default:
     printf("(please send a bug report) ");
   }
@@ -913,7 +913,7 @@ void ifoPrint_C_ADT(c_adt_t *c_adt) {
   int i, entries;
   
   printf("Number of VOBs in this VOBS: %i\n", c_adt->nr_of_vobs);
-  //entries = c_adt->nr_of_vobs;
+  /* entries = c_adt->nr_of_vobs; */
   entries = (c_adt->last_byte + 1 - C_ADT_SIZE)/sizeof(c_adt_t);
   
   for(i = 0; i < entries; i++) {
@@ -1066,7 +1066,7 @@ void ifoPrint(dvd_reader_t *dvd, int title) {
     printf("\nText Data Manager Information\n");
     printf(  "-----------------------------\n");
     if(ifohandle->txtdt_mgi) {
-      //ifoPrint_TXTDT_MGI(&(vmgi->txtdt_mgi));
+      /* ifoPrint_TXTDT_MGI(&(vmgi->txtdt_mgi)); */
     } else {
       printf("No Text Data Manager Information present\n");
     }
diff --git a/src/input/libdvdnav/ifo_read.c b/src/input/libdvdnav/ifo_read.c
index 60ce74819..a4e5a92d6 100644
--- a/src/input/libdvdnav/ifo_read.c
+++ b/src/input/libdvdnav/ifo_read.c
@@ -659,7 +659,7 @@ static int ifoRead_PGC(ifo_handle_t *ifofile, pgc_t *pgc, unsigned int offset) {
   /* Check that time is 0:0:0:0 also if nr_of_programs == 0 */
   if(pgc->nr_of_programs == 0) {
     CHECK_ZERO(pgc->still_time);
-    CHECK_ZERO(pgc->pg_playback_mode); // ??
+    CHECK_ZERO(pgc->pg_playback_mode); /* ?? */
     CHECK_VALUE(pgc->program_map_offset == 0);
     CHECK_VALUE(pgc->cell_playback_offset == 0);
     CHECK_VALUE(pgc->cell_position_offset == 0);
@@ -844,24 +844,24 @@ int ifoRead_TT_SRPT(ifo_handle_t *ifofile) {
 
   CHECK_ZERO(tt_srpt->zero_1);
   CHECK_VALUE(tt_srpt->nr_of_srpts != 0);
-  CHECK_VALUE(tt_srpt->nr_of_srpts < 100); // ??
+  CHECK_VALUE(tt_srpt->nr_of_srpts < 100); /* ?? */
   CHECK_VALUE((int)tt_srpt->nr_of_srpts * sizeof(title_info_t) <= info_length);
   
   for(i = 0; i < tt_srpt->nr_of_srpts; i++) {
     CHECK_VALUE(tt_srpt->title[i].pb_ty.zero_1 == 0);
     CHECK_VALUE(tt_srpt->title[i].nr_of_angles != 0);
     CHECK_VALUE(tt_srpt->title[i].nr_of_angles < 10);
-    //CHECK_VALUE(tt_srpt->title[i].nr_of_ptts != 0);
-    // XXX: this assertion breaks Ghostbusters:
-    CHECK_VALUE(tt_srpt->title[i].nr_of_ptts < 1000); // ??
+    /* CHECK_VALUE(tt_srpt->title[i].nr_of_ptts != 0);
+       XXX: this assertion breaks Ghostbusters: */
+    CHECK_VALUE(tt_srpt->title[i].nr_of_ptts < 1000); /* ?? */
     CHECK_VALUE(tt_srpt->title[i].title_set_nr != 0);
-    CHECK_VALUE(tt_srpt->title[i].title_set_nr < 100); // ??
+    CHECK_VALUE(tt_srpt->title[i].title_set_nr < 100); /* ?? */
     CHECK_VALUE(tt_srpt->title[i].vts_ttn != 0);
-    CHECK_VALUE(tt_srpt->title[i].vts_ttn < 100); // ??
-    //CHECK_VALUE(tt_srpt->title[i].title_set_sector != 0);
+    CHECK_VALUE(tt_srpt->title[i].vts_ttn < 100); /* ?? */
+    /* CHECK_VALUE(tt_srpt->title[i].title_set_sector != 0); */
   }
   
-  // Make this a function
+  /* Make this a function */
 #if 0
   if(memcmp((uint8_t *)tt_srpt->title + 
             tt_srpt->nr_of_srpts * sizeof(title_info_t), 
@@ -925,7 +925,7 @@ int ifoRead_VTS_PTT_SRPT(ifo_handle_t *ifofile) {
 
   CHECK_ZERO(vts_ptt_srpt->zero_1);
   CHECK_VALUE(vts_ptt_srpt->nr_of_srpts != 0);
-  CHECK_VALUE(vts_ptt_srpt->nr_of_srpts < 100); // ??
+  CHECK_VALUE(vts_ptt_srpt->nr_of_srpts < 100); /* ?? */
   
   info_length = vts_ptt_srpt->last_byte + 1 - VTS_PTT_SRPT_SIZE;
   
@@ -1001,12 +1001,12 @@ int ifoRead_VTS_PTT_SRPT(ifo_handle_t *ifofile) {
   }
   
   for(i = 0; i < vts_ptt_srpt->nr_of_srpts; i++) {
-    CHECK_VALUE(vts_ptt_srpt->title[i].nr_of_ptts < 1000); // ??
+    CHECK_VALUE(vts_ptt_srpt->title[i].nr_of_ptts < 1000); /* ?? */
     for(j = 0; j < vts_ptt_srpt->title[i].nr_of_ptts; j++) {
       CHECK_VALUE(vts_ptt_srpt->title[i].ptt[j].pgcn != 0 );
-      CHECK_VALUE(vts_ptt_srpt->title[i].ptt[j].pgcn < 1000); // ??
+      CHECK_VALUE(vts_ptt_srpt->title[i].ptt[j].pgcn < 1000); /* ?? */
       CHECK_VALUE(vts_ptt_srpt->title[i].ptt[j].pgn != 0);
-      CHECK_VALUE(vts_ptt_srpt->title[i].ptt[j].pgn < 100); // ??
+      CHECK_VALUE(vts_ptt_srpt->title[i].ptt[j].pgn < 100); /* ?? */
     }
   }
 
@@ -1064,9 +1064,9 @@ int ifoRead_PTL_MAIT(ifo_handle_t *ifofile) {
   B2N_32(ptl_mait->last_byte);
   
   CHECK_VALUE(ptl_mait->nr_of_countries != 0);
-  CHECK_VALUE(ptl_mait->nr_of_countries < 100); // ??
+  CHECK_VALUE(ptl_mait->nr_of_countries < 100); /* ?? */
   CHECK_VALUE(ptl_mait->nr_of_vtss != 0);
-  CHECK_VALUE(ptl_mait->nr_of_vtss < 100); // ??  
+  CHECK_VALUE(ptl_mait->nr_of_vtss < 100); /* ?? */
   CHECK_VALUE(ptl_mait->nr_of_countries * PTL_MAIT_COUNTRY_SIZE 
 	      <= ptl_mait->last_byte + 1 - PTL_MAIT_SIZE);
   
@@ -1605,7 +1605,7 @@ static int ifoRead_PGCIT_internal(ifo_handle_t *ifofile, pgcit_t *pgcit,
   /* assert(pgcit->nr_of_pgci_srp != 0);
      Magic Knight Rayearth Daybreak is mastered very strange and has 
      Titles with 0 PTTs. */
-  CHECK_VALUE(pgcit->nr_of_pgci_srp < 10000); // ?? seen max of 1338
+  CHECK_VALUE(pgcit->nr_of_pgci_srp < 10000); /* ?? seen max of 1338 */
   
   info_length = pgcit->nr_of_pgci_srp * PGCI_SRP_SIZE;
   data = malloc(info_length);
@@ -1726,7 +1726,7 @@ int ifoRead_PGCI_UT(ifo_handle_t *ifofile) {
   
   CHECK_ZERO(pgci_ut->zero_1);
   CHECK_VALUE(pgci_ut->nr_of_lus != 0);
-  CHECK_VALUE(pgci_ut->nr_of_lus < 100); // ?? 3-4 ?
+  CHECK_VALUE(pgci_ut->nr_of_lus < 100); /* ?? 3-4 ? */
   CHECK_VALUE((uint32_t)pgci_ut->nr_of_lus * PGCI_LU_SIZE < pgci_ut->last_byte);
 
   info_length = pgci_ut->nr_of_lus * PGCI_LU_SIZE;
@@ -1760,7 +1760,7 @@ int ifoRead_PGCI_UT(ifo_handle_t *ifofile) {
   free(data);
   
   for(i = 0; i < pgci_ut->nr_of_lus; i++) {
-    // Maybe this is only defined for v1.1 and later titles?
+    /* Maybe this is only defined for v1.1 and later titles? */
     /* If the bits in 'lu[i].exists' are enumerated abcd efgh then:
             VTS_x_yy.IFO        VIDEO_TS.IFO
        a == 0x83 "Root"         0x82 "Title"
@@ -1799,8 +1799,8 @@ int ifoRead_PGCI_UT(ifo_handle_t *ifofile) {
       ifofile->pgci_ut = 0;
       return 0;
     }
-    // FIXME: Iterate and verify that all menus that should exists accordingly
-    //        to pgci_ut->lu[i].exists really do?
+    /* FIXME: Iterate and verify that all menus that should exists accordingly
+              to pgci_ut->lu[i].exists really do? */
   }
 
   return 1;
@@ -1861,8 +1861,8 @@ static int ifoRead_VTS_ATTRIBUTES(ifo_handle_t *ifofile,
     unsigned int nr_coded;
     CHECK_VALUE(vts_attributes->last_byte + 1 >= VTS_ATTRIBUTES_MIN_SIZE);  
     nr_coded = (vts_attributes->last_byte + 1 - VTS_ATTRIBUTES_MIN_SIZE)/6;
-    // This is often nr_coded = 70, how do you know how many there really are?
-    if(nr_coded > 32) { // We haven't read more from disk/file anyway
+    /* This is often nr_coded = 70, how do you know how many there really are? */
+    if(nr_coded > 32) { /* We haven't read more from disk/file anyway */
       nr_coded = 32;
     }
     CHECK_VALUE(vts_attributes->nr_of_vtstt_subp_streams <= nr_coded);
@@ -1910,7 +1910,7 @@ int ifoRead_VTS_ATRT(ifo_handle_t *ifofile) {
 
   CHECK_ZERO(vts_atrt->zero_1);
   CHECK_VALUE(vts_atrt->nr_of_vtss != 0);
-  CHECK_VALUE(vts_atrt->nr_of_vtss < 100); //??
+  CHECK_VALUE(vts_atrt->nr_of_vtss < 100); /*??*/
   CHECK_VALUE((uint32_t)vts_atrt->nr_of_vtss * (4 + VTS_ATTRIBUTES_MIN_SIZE) + 
          VTS_ATRT_SIZE < vts_atrt->last_byte + 1);
 
@@ -1954,9 +1954,9 @@ int ifoRead_VTS_ATRT(ifo_handle_t *ifofile) {
       return 0;
     }
 
-    // This assert cant be in ifoRead_VTS_ATTRIBUTES
+    /* This assert cant be in ifoRead_VTS_ATTRIBUTES */
     CHECK_VALUE(offset + vts_atrt->vts[i].last_byte <= vts_atrt->last_byte + 1);
-    // Is this check correct?
+    /* Is this check correct? */
   }
 
   return 1;
@@ -2006,7 +2006,7 @@ int ifoRead_TXTDT_MGI(ifo_handle_t *ifofile) {
     return 0;
   }
 
-  // fprintf(stderr, "-- Not done yet --\n");
+  /* fprintf(stderr, "-- Not done yet --\n"); */
   return 1;
 }
 
diff --git a/src/input/libdvdnav/md5.c b/src/input/libdvdnav/md5.c
index d4fd7d5e2..3ee9abae5 100644
--- a/src/input/libdvdnav/md5.c
+++ b/src/input/libdvdnav/md5.c
@@ -36,7 +36,7 @@
 #endif
 
 #include "md5.h"
-//#include "unlocked-io.h"
+/* #include "unlocked-io.h" */
 
 #ifdef _LIBC
 # include <endian.h>
diff --git a/src/input/libdvdnav/nav_print.c b/src/input/libdvdnav/nav_print.c
index 6df3dc831..842ebe44f 100644
--- a/src/input/libdvdnav/nav_print.c
+++ b/src/input/libdvdnav/nav_print.c
@@ -167,7 +167,7 @@ static void navPrint_BTNIT(btni_t *btni_table, int btngr_ns, int btn_ns) {
 	printf("left %d, ", btni->left);
 	printf("right %d\n", btni->right);
 	
-	// ifoPrint_COMMAND(&btni->cmd);
+	/* ifoPrint_COMMAND(&btni->cmd); */
 	printf("\n");
       }
     }
diff --git a/src/input/libdvdnav/nav_read.c b/src/input/libdvdnav/nav_read.c
index 818fe07dc..eb5f3ae07 100644
--- a/src/input/libdvdnav/nav_read.c
+++ b/src/input/libdvdnav/nav_read.c
@@ -238,7 +238,7 @@ void navRead_PCI(pci_t *pci, unsigned char *buffer) {
 	CHECK_VALUE(pci->hli.btnit[n].down <= pci->hli.hl_gi.btn_ns);
 	CHECK_VALUE(pci->hli.btnit[n].left <= pci->hli.hl_gi.btn_ns);
 	CHECK_VALUE(pci->hli.btnit[n].right <= pci->hli.hl_gi.btn_ns);
-	//vmcmd_verify(pci->hli.btnit[n].cmd);
+	/* vmcmd_verify(pci->hli.btnit[n].cmd); */
       } else {
 	int k;
 	CHECK_VALUE(pci->hli.btnit[n].btn_coln == 0);
@@ -252,7 +252,7 @@ void navRead_PCI(pci_t *pci, unsigned char *buffer) {
 	CHECK_VALUE(pci->hli.btnit[n].left == 0);
 	CHECK_VALUE(pci->hli.btnit[n].right == 0);
 	for (k = 0; k < 8; k++)
-	  CHECK_VALUE(pci->hli.btnit[n].cmd.bytes[k] == 0); //CHECK_ZERO?
+	  CHECK_VALUE(pci->hli.btnit[n].cmd.bytes[k] == 0); /* CHECK_ZERO? */
       }
     }
   }