Updated sources to latest xutils

Author: kala13x

Makefile

@@ -3,9 +3,9 @@
 # https://github.com/kala13x/smake #
 ####################################
 
-CFLAGS = -g -O2 -Wall
+CFLAGS = -O2 -Wall -Wextra -pedantic -I. -I./xutils/src/ -I./xutils/src/crypt/ -I./xutils/src/data/ -I./xutils/src/net/ -I./xutils/src/sys/
 CFLAGS += -I./src -I./xutils/build/include
-LD_LIBS = ./xutils/build/lib/libxutils.a
+LD_LIBS = ./xutils/build/libxutils.a
 LIBS = -lpthread -lm
 NAME = smake
 ODIR = ./obj
@@ -23,7 +23,7 @@ VPATH = ./src
 
 .c.$(OBJ):
 	@test -d $(ODIR) || mkdir -p $(ODIR)
-	$(CC) $(CFLAGS)  -c -o $(ODIR)/$@ $< $(LIBS)
+	$(CC) $(CFLAGS) -c -o $(ODIR)/$@ $< $(LIBS)
 
 $(NAME):$(OBJS)
 	$(CC) $(CFLAGS) -o $(ODIR)/$(NAME) $(OBJECTS) $(LD_LIBS) $(LIBS)

smake.json

@@ -1,8 +1,8 @@
 {
     "build": {
-        "flags": "-g -O2 -Wall",
-        "libs": "-lpthread",
-        "ldLibs": "./xutils/build/lib/libxutils.a",
+        "flags": "-O2 -Wall -Wextra -pedantic -I./xutils/src/ -I./xutils/src/crypt/ -I./xutils/src/data/ -I./xutils/src/net/ -I./xutils/src/sys/",
+        "libs": " -lpthread -lm",
+        "ldLibs": "./xutils/build/libxutils.a",
         "outputDir": "./obj",
         "overwrite": true,
         "name": "smake",

src/cfg.c

@@ -52,7 +52,7 @@ xbool_t SMake_SerializeIncludes(xarray_t *pArr, const char *pDlmt, char *pOutput
     for (i = 0; i < nCount; i++)
     {
         const char *pData = (const char*)XArray_GetData(pArr, i);
-        if (!xstrused(pData) || xstrcmp(pData, "./") || xstrcmp(pData, ".") ) continue;
+        if (!xstrused(pData)) continue;
 
         if (!bStarted)  bStarted = XTRUE;
         else if (pDlmt) nAvail = xstrncatf(pOutput, nAvail, "%s", pDlmt);

src/find.c

@@ -20,7 +20,9 @@
 
 int SMake_SearchCb(xfile_search_t *pSearch, xfile_entry_t *pEntry, const char *pMsg)
 {
-    XSYNC_ATOMIC_SET(pSearch->pInterrupted, XTRUE);
+    XSYNC_ATOMIC_SET(pSearch->pInterrupted, XTRUE);\
+    (void)pEntry;
+    (void)pMsg;
     return XSTDOK;
 }
 
@@ -95,6 +97,7 @@ XSTATUS SMake_FindLibs(smake_ctx_t *pCtx, const smake_find_t *pFind)
         if (nStatus != XSTDOK) break;
     }
 
+    (void)pCtx;
     XArray_Destroy(pLibs);
     return nStatus;
 }

src/make.c

@@ -344,6 +344,7 @@ int SMake_CompareName(const void *pData1, const void *pData2, void *pCtx)
     SMakeFile *pObj1 = (SMakeFile*)pFirst->pData;
     SMakeFile *pObj2 = (SMakeFile*)pSecond->pData;
 
+    (void)pCtx;
     return strcmp(pObj1->sName, pObj2->sName);
 }
 
@@ -355,6 +356,7 @@ int SMake_CompareLen(const void *pData1, const void *pData2, void *pCtx)
     const char *pStr1 = (const char*)pFirst->pData;
     const char *pStr2 = (const char*)pSecond->pData;
 
+    (void)pCtx;
     return strlen(pStr1) > strlen(pStr2);
 }
 

src/stdinc.h

@@ -11,13 +11,13 @@
 #define __CMAKE_STDINC_H__
 
 /* libxutils includes */
-#include "xutils/xstd.h"
-#include "xutils/array.h"
-#include "xutils/xjson.h"
-#include "xutils/xstr.h"
-#include "xutils/xlog.h"
-#include "xutils/xcli.h"
-#include "xutils/xfs.h"
-#include "xutils/map.h"
+#include "xutils/src/xstd.h"
+#include "xutils/src/data/array.h"
+#include "xutils/src/data/xjson.h"
+#include "xutils/src/data/xstr.h"
+#include "xutils/src/data/map.h"
+#include "xutils/src/sys/xlog.h"
+#include "xutils/src/sys/xcli.h"
+#include "xutils/src/sys/xfs.h"
 
 #endif /* __CMAKE_STDINC_H__ */