Skip to content

0.30.3 #126

Merged
merged 16 commits into from
Mar 22, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 2 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MXQ_VERSION_MAJOR = 0
MXQ_VERSION_MINOR = 30
MXQ_VERSION_PATCH = 2
MXQ_VERSION_PATCH = 3
MXQ_VERSION_EXTRA = "beta"
MXQ_VERSIONDATE = 2022

Expand Down Expand Up @@ -121,6 +121,7 @@ CFLAGS_MYSQL += ${CFLAGS_MXQ_MYSQL_DEFAULT_GROUP}
CFLAGS_MYSQL += -DMX_MYSQL_FAIL_WAIT_DEFAULT=5

CFLAGS += -g
CFLAGS += -O3
CFLAGS += -Wall
CFLAGS += -DMXQ_VERSION=\"${MXQ_VERSION}\"
CFLAGS += -DMXQ_VERSIONFULL=\"${MXQ_VERSIONFULL}\"
Expand Down
25 changes: 13 additions & 12 deletions mx_util.c
Original file line number Diff line number Diff line change
Expand Up @@ -356,7 +356,7 @@ int mx_strtoll(char *str, signed long long int *to)

int mx_strtoui(char *str, unsigned int *to)
{
unsigned long int ul;
unsigned long int ul = 0; /* avoid false maybe-uninitialized warning */
int res;

assert(str);
Expand All @@ -376,7 +376,7 @@ int mx_strtoui(char *str, unsigned int *to)

int mx_strtou8(char *str, uint8_t *to)
{
unsigned long int ul;
unsigned long int ul = 0; /* avoid false maybe-uninitialized warning */
int res;

assert(str);
Expand All @@ -396,7 +396,7 @@ int mx_strtou8(char *str, uint8_t *to)

int mx_strtou16(char *str, uint16_t *to)
{
unsigned long int ul;
unsigned long int ul = 0; /* avoid false maybe-uninitialized warning */
int res;

assert(str);
Expand All @@ -416,7 +416,7 @@ int mx_strtou16(char *str, uint16_t *to)

int mx_strtou32(char *str, uint32_t *to)
{
unsigned long int ul;
unsigned long int ul = 0; /* avoid false maybe-uninitialized warning */
int res;

assert(str);
Expand All @@ -436,7 +436,7 @@ int mx_strtou32(char *str, uint32_t *to)

int mx_strtou64(char *str, uint64_t *to)
{
unsigned long long int ull;
unsigned long long int ull = 0; /* avoid false maybe-uninitialized warning */;
int res;

assert(str);
Expand All @@ -458,7 +458,7 @@ int mx_strtou64(char *str, uint64_t *to)

int mx_strtoi(char *str, signed int *to)
{
signed long int l;
signed long int l = 0; /* avoid false maybe-uninitialized warning */
int res;

assert(str);
Expand All @@ -478,7 +478,7 @@ int mx_strtoi(char *str, signed int *to)

int mx_strtoi8(char *str, int8_t *to)
{
signed long int l;
signed long int l = 0; /* avoid false maybe-uninitialized warning */
int res;

assert(str);
Expand All @@ -498,7 +498,7 @@ int mx_strtoi8(char *str, int8_t *to)

int mx_strtoi16(char *str, int16_t *to)
{
signed long int l;
signed long int l = 0; /* avoid false maybe-uninitialized warning */
int res;

assert(str);
Expand All @@ -518,7 +518,7 @@ int mx_strtoi16(char *str, int16_t *to)

int mx_strtoi32(char *str, int32_t *to)
{
signed long int l;
signed long int l = 0; /* avoid false maybe-uninitialized warning */
int res;

assert(str);
Expand All @@ -538,7 +538,7 @@ int mx_strtoi32(char *str, int32_t *to)

int mx_strtoi64(char *str, int64_t *to)
{
signed long long int ll;
signed long long int ll = 0; /* avoid false maybe-uninitialized warning */
int res;

assert(str);
Expand Down Expand Up @@ -797,7 +797,7 @@ int mx_read_first_line_from_file(char *fname, char **line)

int mx_strscan_ull(char **str, unsigned long long int *to)
{
unsigned long long int l;
unsigned long long int l = 0; /* avoid false maybe-uninitialized warning */;
char *s;
char *p;
char o = 0;
Expand Down Expand Up @@ -828,7 +828,7 @@ int mx_strscan_ull(char **str, unsigned long long int *to)

int mx_strscan_ll(char **str, long long int *to)
{
long long int l;
long long int l = 0; /* avoid false maybe-uninitialized warning */;
char *s;
char *p;
char o = 0;
Expand Down Expand Up @@ -1268,6 +1268,7 @@ int mx_daemon(int nochdir, int noclose)
return daemon(nochdir, noclose);
}

/* guarantee stable sort */
void _mx_sort_linked_list (void **list, int (*cmp)(void *o1,void *o2), void ** getnextptr(void *o)) {

void *unsorted=*list;
Expand Down