lagertonne/yolobs-studio
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

New upstream version 24.0.1+dfsg1

Browse source
This commit is contained in:
Sebastian Ramacher 2019-09-22 23:19:10 +02:00
parent b14f9eae6d
commit 5a730d6ec3
842 changed files with 42245 additions and 33385 deletions
Download patch file Download diff file Expand all files Collapse all files

15
libobs/util/cf-parser.c
View file

@ -17,23 +17,22 @@
#include "cf-parser.h"
void cf_adderror(struct cf_parser *p, const char *error, int level,
const char *val1, const char *val2, const char *val3)
const char *val1, const char *val2, const char *val3)
{
uint32_t row, col;
lexer_getstroffset(&p->cur_token->lex->base_lexer,
p->cur_token->unmerged_str.array,
&row, &col);
p->cur_token->unmerged_str.array, &row, &col);
if (!val1 && !val2 && !val3) {
error_data_add(&p->error_list, p->cur_token->lex->file,
row, col, error, level);
error_data_add(&p->error_list, p->cur_token->lex->file, row,
col, error, level);
} else {
struct dstr formatted;
dstr_init(&formatted);
dstr_safe_printf(&formatted, error, val1, val2, val3, NULL);
error_data_add(&p->error_list, p->cur_token->lex->file,
row, col, formatted.array, level);
error_data_add(&p->error_list, p->cur_token->lex->file, row,
col, formatted.array, level);
dstr_free(&formatted);
}
@ -53,7 +52,7 @@ bool cf_pass_pair(struct cf_parser *p, char in, char out)
break;
continue;
} else if(*p->cur_token->str.array == out) {
} else if (*p->cur_token->str.array == out) {
p->cur_token++;
return true;
}