# HG changeset patch # User alex # Date 1062369387 0 # Node ID 45d37ee040912ed6805a68b4e4f89c6cc15cd792 # Parent 3aea64e0d6d901d9b83aab97621f4c3f5b13b21a 10l, lot of missing new-lines. In case of an error, all the messages will be screwed up diff -r 3aea64e0d6d9 -r 45d37ee04091 vobsub.c --- a/vobsub.c Sun Aug 31 22:27:10 2003 +0000 +++ b/vobsub.c Sun Aug 31 22:36:27 2003 +0000 @@ -327,7 +327,7 @@ else if ((c & 0xf0) == 0x20) version = 2; else { - mp_msg(MSGT_VOBSUB,MSGL_ERR, "Unsupported MPEG version: 0x%02x", c); + mp_msg(MSGT_VOBSUB,MSGL_ERR, "VobSub: Unsupported MPEG version: 0x%02x\n", c); return -1; } if (version == 4) { @@ -940,16 +940,16 @@ rar_stream_t *fd = rar_open(name, "rb"); if (fd == NULL) { if (force) - mp_msg(MSGT_VOBSUB,MSGL_ERR, "Can't open IFO file"); + mp_msg(MSGT_VOBSUB,MSGL_ERR, "VobSub: Can't open IFO file\n"); } else { // parse IFO header unsigned char block[0x800]; const char *const ifo_magic = "DVDVIDEO-VTS"; if (rar_read(block, sizeof(block), 1, fd) != 1) { if (force) - mp_msg(MSGT_VOBSUB,MSGL_ERR, "Can't read IFO header"); + mp_msg(MSGT_VOBSUB,MSGL_ERR, "VobSub: Can't read IFO header\n"); } else if (memcmp(block, ifo_magic, strlen(ifo_magic) + 1)) - mp_msg(MSGT_VOBSUB,MSGL_ERR, "Bad magic in IFO header\n"); + mp_msg(MSGT_VOBSUB,MSGL_ERR, "VobSub: Bad magic in IFO header\n"); else { unsigned long pgci_sector = block[0xcc] << 24 | block[0xcd] << 16 | block[0xce] << 8 | block[0xcf]; @@ -982,7 +982,7 @@ } if (rar_seek(fd, pgci_sector * sizeof(block), SEEK_SET) || rar_read(block, sizeof(block), 1, fd) != 1) - mp_msg(MSGT_VOBSUB,MSGL_ERR, "Can't read IFO PGCI"); + mp_msg(MSGT_VOBSUB,MSGL_ERR, "VobSub: Can't read IFO PGCI\n"); else { unsigned long idx; unsigned long pgc_offset = block[0xc] << 24 | block[0xd] << 16 @@ -1034,7 +1034,7 @@ fd = rar_open(buf, "rb"); if (fd == NULL) { if(force) - mp_msg(MSGT_VOBSUB,MSGL_ERR,"VobSub: Can't open IDX file"); + mp_msg(MSGT_VOBSUB,MSGL_ERR,"VobSub: Can't open IDX file\n"); else { free(buf); free(vob); @@ -1057,7 +1057,7 @@ mpg = mpeg_open(buf); if (mpg == NULL) { if(force) - mp_msg(MSGT_VOBSUB,MSGL_ERR,"VobSub: Can't open SUB file"); + mp_msg(MSGT_VOBSUB,MSGL_ERR,"VobSub: Can't open SUB file\n"); else { free(buf); @@ -1070,7 +1070,7 @@ off_t pos = mpeg_tell(mpg); if (mpeg_run(mpg) < 0) { if (!mpeg_eof(mpg)) - mp_msg(MSGT_VOBSUB,MSGL_ERR,"mpeg_run error"); + mp_msg(MSGT_VOBSUB,MSGL_ERR,"VobSub: mpeg_run error\n"); break; } if (mpg->packet_size) {