Merge pull request #126 from mariux64/0.30.3

0.30.3
mariux64 · Mar 22, 2022 · 837e8b1 · 837e8b1
2 parents a43642c + 46a6886
commit 837e8b1
Show file tree

Hide file tree

Showing 6 changed files with 153 additions and 140 deletions.
diff --git a/Makefile b/Makefile
@@ -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
 
@@ -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}\"

diff --git a/mx_util.c b/mx_util.c
@@ -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);
@@ -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);
@@ -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);
@@ -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);
@@ -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);
@@ -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);
@@ -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);
@@ -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);
@@ -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);
@@ -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);
@@ -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;
@@ -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;
@@ -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;