1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add printf-style format attribute to oniguruma functions

Browse Source 
Also make the format string compatible with literal strings which
are const arrays of "plain" chars.
This commit is contained in:
Nobuyoshi Nakada 2021-09-27 19:02:45 +09:00 committed by GitHub
parent f8000e2931
commit efa0c31ce5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
Notes: git 2021-09-27 19:03:06 +09:00 
Merged: https://github.com/ruby/ruby/pull/4899

Merged-By: nobu <nobu@ruby-lang.org>
3 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
regerror.c
View File

@ -312,7 +312,7 @@ onig_error_code_to_str(UChar* s, OnigPosition code, ...)
void void
onig_vsnprintf_with_pattern(UChar buf[], int bufsize, OnigEncoding enc, onig_vsnprintf_with_pattern(UChar buf[], int bufsize, OnigEncoding enc,
UChar* pat, UChar* pat_end, const UChar *fmt, va_list args) UChar* pat, UChar* pat_end, const char *fmt, va_list args)
{ {
size_t need; size_t need;
int n, len; int n, len;
@ -376,7 +376,7 @@ onig_vsnprintf_with_pattern(UChar buf[], int bufsize, OnigEncoding enc,
#if 0 /* unused */ #if 0 /* unused */
void void
onig_snprintf_with_pattern(UChar buf[], int bufsize, OnigEncoding enc, onig_snprintf_with_pattern(UChar buf[], int bufsize, OnigEncoding enc,
UChar* pat, UChar* pat_end, const UChar *fmt, ...) UChar* pat, UChar* pat_end, const char *fmt, ...)
{ {
va_list args; va_list args;
va_start(args, fmt); va_start(args, fmt);

8
regint.h
View File

@ -903,9 +903,13 @@ extern void onig_print_statistics(FILE* f);
# endif # endif
#endif #endif
#ifndef PRINTF_ARGS
#define PRINTF_ARGS(func, fmt, vargs) func
#endif
extern UChar* onig_error_code_to_format(OnigPosition code); extern UChar* onig_error_code_to_format(OnigPosition code);
extern void onig_vsnprintf_with_pattern(UChar buf[], int bufsize, OnigEncoding enc, UChar* pat, UChar* pat_end, const UChar *fmt, va_list args); PRINTF_ARGS(extern void onig_vsnprintf_with_pattern(UChar buf[], int bufsize, OnigEncoding enc, UChar* pat, UChar* pat_end, const char *fmt, va_list args), 6, 0);
extern void onig_snprintf_with_pattern(UChar buf[], int bufsize, OnigEncoding enc, UChar* pat, UChar* pat_end, const UChar *fmt, ...); PRINTF_ARGS(extern void onig_snprintf_with_pattern(UChar buf[], int bufsize, OnigEncoding enc, UChar* pat, UChar* pat_end, const char *fmt, ...), 6, 7);
extern int onig_bbuf_init(BBuf* buf, OnigDistance size); extern int onig_bbuf_init(BBuf* buf, OnigDistance size);
extern int onig_compile(regex_t* reg, const UChar* pattern, const UChar* pattern_end, OnigErrorInfo* einfo); extern int onig_compile(regex_t* reg, const UChar* pattern, const UChar* pattern_end, OnigErrorInfo* einfo);
#ifdef RUBY #ifdef RUBY

6
regparse.c
View File

@ -2833,6 +2833,10 @@ fetch_name(OnigCodePoint start_code, UChar** src, UChar* end,
#endif /* USE_NAMED_GROUP */ #endif /* USE_NAMED_GROUP */
#ifdef PRINTF_ARGS
PRINTF_ARGS(static void onig_syntax_warn(ScanEnv *env, const char *fmt, ...), 2, 3);
#endif
static void static void
onig_syntax_warn(ScanEnv *env, const char *fmt, ...) onig_syntax_warn(ScanEnv *env, const char *fmt, ...)
{ {
@ -2841,7 +2845,7 @@ onig_syntax_warn(ScanEnv *env, const char *fmt, ...)
va_start(args, fmt); va_start(args, fmt);
onig_vsnprintf_with_pattern(buf, WARN_BUFSIZE, env->enc, onig_vsnprintf_with_pattern(buf, WARN_BUFSIZE, env->enc,
env->pattern, env->pattern_end, env->pattern, env->pattern_end,
(const UChar *)fmt, args); fmt, args);
va_end(args); va_end(args);
#ifdef RUBY #ifdef RUBY
if (env->sourcefile == NULL) if (env->sourcefile == NULL)