mirror of
https://github.com/warmcat/libwebsockets.git
synced 2025-03-09 00:00:04 +01:00
move array bounds gcc workaround outside function
Signed-off-by: Andy Green <andy.green@linaro.org>
This commit is contained in:
parent
f7248f8dfa
commit
443ea54c5c
1 changed files with 9 additions and 7 deletions
|
@ -126,6 +126,11 @@ static const struct serveable whitelist[] = {
|
|||
{ "/test.html", "text/html" },
|
||||
};
|
||||
|
||||
/* some versions of gcc see a false positive here, workaround */
|
||||
#ifdef __GNUC__
|
||||
#pragma GCC diagnostic ignored "-Warray-bounds"
|
||||
#endif
|
||||
|
||||
/* this protocol server (always the first one) just knows how to do HTTP */
|
||||
|
||||
static int callback_http(struct libwebsocket_context *context,
|
||||
|
@ -252,18 +257,12 @@ static int callback_http(struct libwebsocket_context *context,
|
|||
* old end guy goes into vacant slot in hash table
|
||||
*/
|
||||
|
||||
/* some versions of gcc see a false positive here, workaround */
|
||||
#ifdef __GNUC__
|
||||
#pragma GCC diagnostic ignored "-Warray-bounds"
|
||||
#endif
|
||||
pollfd_count[hash]--;
|
||||
if (pollfd_count[hash]) {
|
||||
pollfd_maps[hash][n].index = pollfd_maps[hash][pollfd_count[hash]].index;
|
||||
pollfd_maps[hash][n].fd = pollfd_maps[hash][pollfd_count[hash]].fd;
|
||||
}
|
||||
#ifdef __GNUC__
|
||||
#pragma GCC diagnostic pop
|
||||
#endif
|
||||
|
||||
break;
|
||||
|
||||
case LWS_CALLBACK_SET_MODE_POLL_FD:
|
||||
|
@ -296,6 +295,9 @@ static int callback_http(struct libwebsocket_context *context,
|
|||
return 0;
|
||||
}
|
||||
|
||||
#ifdef __GNUC__
|
||||
#pragma GCC diagnostic pop
|
||||
#endif
|
||||
|
||||
/*
|
||||
* this is just an example of parsing handshake headers, you don't need this
|
||||
|
|
Loading…
Add table
Reference in a new issue