diff options
| author | Jedzkie <jedzkie13@rocketmail.com> | 2020-06-23 08:00:00 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-23 08:00:00 +0800 |
| commit | 520863eaeda83da14b88d09f6378cd8abd5a5174 (patch) | |
| tree | 2496ea36744dc2f51d264741a78699e719ceeb3b /3rdparty/libconfig/extra/gen/clangwarnings.patch | |
| parent | 0b7768837bed2aa521de5b9b76b2348943d7db20 (diff) | |
| parent | 9b89425550094f51d633e5b5d6e86af65bffbf39 (diff) | |
| download | hercules-520863eaeda83da14b88d09f6378cd8abd5a5174.tar.gz hercules-520863eaeda83da14b88d09f6378cd8abd5a5174.tar.bz2 hercules-520863eaeda83da14b88d09f6378cd8abd5a5174.tar.xz hercules-520863eaeda83da14b88d09f6378cd8abd5a5174.zip | |
Merge branch 'master' into jedzkie-pr03
Diffstat (limited to '3rdparty/libconfig/extra/gen/clangwarnings.patch')
| -rw-r--r-- | 3rdparty/libconfig/extra/gen/clangwarnings.patch | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/3rdparty/libconfig/extra/gen/clangwarnings.patch b/3rdparty/libconfig/extra/gen/clangwarnings.patch index 0270dfc44..ecae69c0e 100644 --- a/3rdparty/libconfig/extra/gen/clangwarnings.patch +++ b/3rdparty/libconfig/extra/gen/clangwarnings.patch @@ -10,7 +10,7 @@ index 3595578..26444f8 100644 - yymsg = "Deleting"; - YY_SYMBOL_PRINT (yymsg, yytype, yyvaluep, yylocationp); + YY_SYMBOL_PRINT (yymsg != NULL ? yymsg : "Deleting", yytype, yyvaluep, yylocationp); - + YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN YYUSE (yytype); diff --git a/scanner.c b/scanner.c @@ -22,15 +22,15 @@ index 60882db..8b8af33 100644 #include <errno.h> #include <stdlib.h> +#include <assert.h> - + /* end standard C headers. */ - + @@ -1702,6 +1703,8 @@ static int yy_get_next_buffer (yyscan_t yyscanner) - libconfig_yy_create_buffer(yyin,YY_BUF_SIZE ,yyscanner); + yy_create_buffer( yyin, YY_BUF_SIZE , yyscanner); } - + + assert(YY_CURRENT_BUFFER != NULL); // Fixes compiler warning -Wnull-dereference on gcc-6 and -O3 + - libconfig_yy_init_buffer(YY_CURRENT_BUFFER,input_file ,yyscanner); - libconfig_yy_load_buffer_state(yyscanner ); + yy_init_buffer( YY_CURRENT_BUFFER, input_file , yyscanner); + yy_load_buffer_state( yyscanner ); } |