]>
Commit | Line | Data |
---|---|---|
449af785 JB |
1 | --- libodraw-20150105/libodraw/libodraw_cue_parser.y.orig 2015-01-05 19:01:57.000000000 +0100 |
2 | +++ libodraw-20150105/libodraw/libodraw_cue_parser.y 2015-01-23 22:14:43.088287239 +0100 | |
3 | @@ -22,6 +22,7 @@ | |
4 | ||
5 | #include <common.h> | |
6 | #include <types.h> | |
7 | +#include <string.h> | |
8 | ||
9 | #if defined( HAVE_STDLIB_H ) || defined( WINAPI ) | |
10 | #include <stdlib.h> | |
11 | @@ -67,8 +68,16 @@ | |
12 | lba += ( ( msf_string[ 3 ] - '0' ) * 10 ) + ( msf_string[ 4 ] - '0' ); \ | |
13 | lba *= CD_FRAMES; \ | |
14 | lba += ( ( msf_string[ 6 ] - '0' ) * 10 ) + ( msf_string[ 7 ] - '0' ); | |
15 | + | |
16 | %} | |
17 | ||
18 | +%code requires { | |
19 | +typedef struct cue_parser_state cue_parser_state_t; | |
20 | +} | |
21 | + | |
22 | +%lex-param { void * NULL } | |
23 | +%parse-param { cue_parser_state_t *parser_state } | |
24 | + | |
25 | /* %name-prefix="cue_scanner_" replaced by -p cue_scanner_ */ | |
26 | /* %no-lines replaced by -l */ | |
27 | ||
28 | @@ -97,8 +106,6 @@ | |
29 | ||
30 | %{ | |
31 | ||
32 | -typedef struct cue_parser_state cue_parser_state_t; | |
33 | - | |
34 | struct cue_parser_state | |
35 | { | |
36 | /* The file | |
37 | @@ -224,6 +231,7 @@ extern int cue_scanner_lex( | |
38 | void *user_data ); | |
39 | ||
40 | extern void cue_scanner_error( | |
41 | + cue_parser_state_t *parser_state, | |
42 | const char *error_string ); | |
43 | ||
44 | extern YY_BUFFER_STATE cue_scanner__scan_buffer( | |
45 | --- libodraw-20150105/libodraw/libodraw_cue_scanner.l.orig 2015-01-05 19:01:57.000000000 +0100 | |
46 | +++ libodraw-20150105/libodraw/libodraw_cue_scanner.l 2015-01-23 21:06:12.108459763 +0100 | |
47 | @@ -374,6 +374,7 @@ int cue_scanner_wrap( | |
48 | } | |
49 | ||
50 | void cue_scanner_error( | |
51 | + cue_parser_state_t *parser_state, | |
52 | const char *error_string ) | |
53 | { | |
54 | if( cue_scanner_suppress_error == 0 ) |