Merge pull request #4196 from neheb/gcc10

move nixio__bin2hex to header and make static
This commit is contained in:
Florian Eckert 2020-07-02 18:52:22 +02:00 committed by GitHub
commit 8ec80e48bb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 6 deletions

View file

@ -153,7 +153,7 @@ int nixio__addr_write(nixio_addr *addr, struct sockaddr *saddr) {
/**
* netmask to prefix helper
*/
int nixio__addr_prefix(struct sockaddr *saddr) {
static int nixio__addr_prefix(struct sockaddr *saddr) {
int prefix = 0;
size_t len;
uint8_t *addr;

View file

@ -19,10 +19,6 @@
#include "nixio.h"
#include <stdlib.h>
const char nixio__bin2hex[16] = {
'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f'
};
static unsigned char nixio__b64encode_tbl[] =
"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";

View file

@ -107,7 +107,9 @@ int nixio__mode_write(int mode, char *modestr);
int nixio__push_stat(lua_State *L, nixio_stat_t *buf);
const char nixio__bin2hex[16];
static const char nixio__bin2hex[16] = {
'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f'
};
/* Module functions */
void nixio_open_file(lua_State *L);