corec: remove more dead code

corec/corec/CMakeLists.txt

@@ -43,7 +43,6 @@ set(corec_node_PUBLIC_HEADERS
   ${CMAKE_CURRENT_SOURCE_DIR}/node/node.h
   ${CMAKE_CURRENT_SOURCE_DIR}/node/nodebase.h
   ${CMAKE_CURRENT_SOURCE_DIR}/node/nodetree.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/node/nodetools.h
 )
 add_library("corec_node" ${corec_node_SOURCES} ${corec_node_PUBLIC_HEADERS} ${corec_base_PUBLIC_HEADERS})
 target_include_directories("corec_node" PUBLIC ".")

corec/corec/array/array.c

@@ -28,6 +28,7 @@
  ****************************************************************************/
 
 #include "array.h"
+#include <corec/memheap.h>
 
 typedef struct datahead
 {

corec/corec/array/array.h

@@ -30,8 +30,7 @@
 #ifndef __ARRAY_H
 #define __ARRAY_H
 
-#include "corec/corec.h"
-#include "corec/memheap.h"
+#include <corec/corec.h>
 
 #ifdef __cplusplus
 extern "C" {
@@ -47,6 +46,8 @@ extern "C" {
 
 #define Data_Var(type,name,len)  struct { size_t n; type p[len]; } __##name; type* name = (__##name.n = sizeof(__##name.p),__##name.p)
 
+typedef struct cc_memheap cc_memheap;
+
 typedef struct array
 {
 	// these are private members, use ARRAY macros to access them

corec/corec/helpers/CMakeLists.txt

@@ -48,24 +48,13 @@ target_include_directories("corec_file" PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT
 
 # Parser API
 set(corec_parser_SOURCES
-  ${CMAKE_CURRENT_SOURCE_DIR}/parser/buffer.c
-  ${CMAKE_CURRENT_SOURCE_DIR}/parser/dataheap.c
-  ${CMAKE_CURRENT_SOURCE_DIR}/parser/hotkey.c
-  ${CMAKE_CURRENT_SOURCE_DIR}/parser/nodelookup.c
   ${CMAKE_CURRENT_SOURCE_DIR}/parser/parser2.c
   ${CMAKE_CURRENT_SOURCE_DIR}/parser/strtab.c
   ${CMAKE_CURRENT_SOURCE_DIR}/parser/strtypes.c
-  ${CMAKE_CURRENT_SOURCE_DIR}/parser/urlpart.c
 )
 set(corec_parser_PUBLIC_HEADERS
-  ${CMAKE_CURRENT_SOURCE_DIR}/parser/buffer.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/parser/dataheap.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/parser/hotkey.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/parser/nodelookup.h
   ${CMAKE_CURRENT_SOURCE_DIR}/parser/parser.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/parser/strtab.h
   ${CMAKE_CURRENT_SOURCE_DIR}/parser/strtypes.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/parser/urlpart.h
   PARENT_SCOPE
 )
 add_library("corec_parser" ${corec_parser_SOURCES} ${corec_parser_PUBLIC_HEADERS})

corec/corec/helpers/charconvert/charconvert.h

@@ -30,7 +30,7 @@
 #ifndef __CHARCONVERT_H
 #define __CHARCONVERT_H
 
-#include "corec/corec.h"
+#include <corec/corec.h>
 
 #ifdef __cplusplus
 extern "C" {

corec/corec/helpers/charconvert/charconvert_linux.c

@@ -28,7 +28,7 @@
  ****************************************************************************/
 
 #include "charconvert.h"
-#include "corec/str/str.h"
+#include <corec/str/str.h>
 
 #if defined(TARGET_LINUX)
 

corec/corec/helpers/charconvert/charconvert_osx.c

@@ -28,7 +28,7 @@
  ****************************************************************************/
 
 #include "charconvert.h"
-#include "corec/str/str.h"
+#include <corec/str/str.h>
 
 #if defined(TARGET_OSX)
 

corec/corec/helpers/charconvert/charconvert_utf8.c

@@ -28,7 +28,7 @@
  ****************************************************************************/
 
 #include "charconvert.h"
-#include "corec/str/str.h"
+#include <corec/str/str.h>
 
 static const uint16_t codepage_1250[128] = {
 0x20ac,0x0081,0x201a,0x0083,0x201e,0x2026,0x2020,0x2021,0x0088,0x2030,0x0160,0x2039,0x015a,0x0164,0x017d,0x0179,

corec/corec/helpers/charconvert/charconvert_win32.c

@@ -28,7 +28,7 @@
  ****************************************************************************/
 
 #include "charconvert.h"
-#include "corec/str/str.h"
+#include <corec/str/str.h>
 
 #if defined(TARGET_WIN)
 

corec/corec/helpers/date/date.h

@@ -30,7 +30,7 @@
 #ifndef __DATE_H
 #define __DATE_H
 
-#include "corec/corec.h"
+#include <corec/corec.h>
 
 #ifdef __cplusplus
 extern "C" {
@@ -65,7 +65,6 @@ typedef struct datepack_t
 DATE_DLL datetime_t GetTimeDate(void); // UTC in s (reference is 1st January 2001 00:00:00.000 UTC, use a helper to get the localized string value)
 DATE_DLL datetime_t TimePackToRel(const datepack_t *tp, bool_t FromLocal);
 DATE_DLL bool_t GetDatePacked(datetime_t t, datepack_t *tp, bool_t ToLocal);
-DATE_DLL bool_t GetIsDst(datetime_t t); // may not be correct on all platforms
 
 #ifdef __cplusplus
 }

corec/corec/helpers/date/date_libc.c

@@ -125,17 +125,3 @@ bool_t GetDatePacked(datetime_t t, datepack_t *tp, bool_t Local)
 
 	return 0;
 }
-
-bool_t GetIsDst(datetime_t t)
-{
-	time_t ot;
-	struct tm *date;
-
-	if (t == INVALID_DATETIME_T)
-        return 0;
-
-	ot = t + DATETIME_OFFSET;
-    date = localtime(&ot);
-
-    return date->tm_isdst;
-}

corec/corec/helpers/date/date_win32.c

@@ -50,6 +50,8 @@ static FILETIME fTimeCache[MAX_CACHED_YEAR - MIN_CACHED_YEAR + 2][2];
 #define TIME_ZONE_ID_INVALID ((DWORD)0xFFFFFFFF)
 #endif
 
+static bool_t GetIsDst(datetime_t t); // may not be correct on all platforms
+
 systick_t GetTimeTick(void)
 {
 	return GetTickCount();

corec/corec/helpers/file/bufstream.c

@@ -28,6 +28,7 @@
  ****************************************************************************/
 
 #include "file.h"
+#include "streams.h"
 
 #define BUFSTREAM_SIZE      4096
 

corec/corec/helpers/file/file.h

@@ -30,8 +30,7 @@
 #ifndef __FILE_H
 #define __FILE_H
 
-#include "corec/node/node.h"
-#include "corec/helpers/date/date.h"
+#include <corec/node/node.h>
 
 #ifdef __cplusplus
 extern "C" {
@@ -50,22 +49,14 @@ extern "C" {
 
 FILE_DLL void CoreC_FileInit(nodemodule* Module);
 
-FILE_DLL bool_t FileExists(nodecontext*, const tchar_t*);
-FILE_DLL bool_t FileMove(nodecontext*, const tchar_t* In,const tchar_t* Out);
-FILE_DLL datetime_t FileDateTime(nodecontext*, const tchar_t*);
 FILE_DLL bool_t PathIsFolder(nodecontext*, const tchar_t*);
-FILE_DLL bool_t FolderCreate(nodecontext*, const tchar_t*);
 // \param Force erase even if the file is read-only
 // \param Safe put in the OS trash rather than a permanent erase
 FILE_DLL bool_t FileErase(nodecontext*, const tchar_t*, bool_t Force, bool_t Safe);
-FILE_DLL bool_t FolderErase(nodecontext*, const tchar_t*, bool_t Force, bool_t Safe);
-FILE_DLL void FindFiles(nodecontext*,const tchar_t* Path, const tchar_t* Mask,void(*Process)(const tchar_t*,void*),void* Param);
-FILE_DLL int64_t GetPathFreeSpace(nodecontext*,const tchar_t* Path);
 
 FILE_DLL void RemovePathDelimiter(tchar_t* Path);
 FILE_DLL void AddPathDelimiter(tchar_t* Path,size_t PathLen);
 FILE_DLL const tchar_t* GetProtocol(const tchar_t* URL, tchar_t *_Protocol, int ProtoLen, bool_t* HasHost);
-FILE_DLL fourcc_t GetProtocolKind(anynode*, tchar_t *_Protocol);
 FILE_DLL void SplitPath(const tchar_t* Path, tchar_t* Dir, int DirLen, tchar_t* Name, int NameLen, tchar_t* Ext, int ExtLen);
 FILE_DLL void SplitURL(const tchar_t* URL, tchar_t* Mime, int MimeLen, tchar_t* Host, int HostLen, int* Port, tchar_t* Path, int PathLen);
 FILE_DLL bool_t SplitAddr(const tchar_t* URL, tchar_t* Peer, int PeerLen, tchar_t* Local, int LocalLen);
@@ -76,31 +67,6 @@ FILE_DLL void AbsPathNormalize(tchar_t* Abs, size_t AbsLen);
 FILE_DLL void ReduceLocalPath(tchar_t* Abs, size_t AbsLen);
 FILE_DLL void RelPath(tchar_t* Rel, int RelLen, const tchar_t* Path, const tchar_t* Base);
 FILE_DLL bool_t UpperPath(tchar_t* Path, tchar_t* Last, size_t LastLen);
-FILE_DLL void StreamLoginInfo(node* p, tchar_t* URL, bool_t Proxy); //URL updated
-
-FILE_DLL tchar_t* FirstSepar(const tchar_t *Path);
-FILE_DLL void SplitURLLogin(const tchar_t *URL, tchar_t *UserName, size_t UserNameLen, tchar_t *Password, size_t PasswordLen, tchar_t *URL2, size_t URL2Len);
-FILE_DLL void SplitShare(const tchar_t *Path, tchar_t *Share, size_t ShareLen, tchar_t *Path2, size_t Path2Len);
-FILE_DLL tchar_t *MergeURL(tchar_t *URL, size_t URLLen, const tchar_t *Proto, const tchar_t *Host, int Port, const tchar_t *Path);
-FILE_DLL tchar_t *GetIP(tchar_t *sIP, size_t IPLen, long IP);
-FILE_DLL void SplitURLParams(const tchar_t* URL, tchar_t* URL2, int URL2Len, tchar_t* Params, int ParamsLen);
-FILE_DLL tchar_t *AddCacheURL(tchar_t* Out, size_t Len, const tchar_t *In);
-FILE_DLL bool_t CheckRemoveCacheURL(const tchar_t** URL);
-FILE_DLL bool_t RemoveURLParam(tchar_t* URL, const tchar_t* Param);
-
-static INLINE size_t FileBlockSize(filepos_t Start,filepos_t End)
-{
-    End -= Start;
-    if (End<0 || End>INT_MAX)
-        return 0;
-    return (size_t)End;
-}
-
-#include "corec/helpers/file/streams.h"
-
-FILE_DLL stream *FileTemp(anynode*);
-FILE_DLL bool_t FileTempName(anynode*,tchar_t *Out, size_t OutLen);
-FILE_DLL err_t FileStat(nodecontext* p, const tchar_t* Path, streamdir* Item);
 
 #ifdef __cplusplus
 }

corec/corec/helpers/file/file_libc.c

@@ -28,6 +28,8 @@
  ****************************************************************************/
 
 #include "file.h"
+#include "streams.h"
+#include <corec/str/str.h>
 
 #ifdef CONFIG_FILEPOS_64
 #define __USE_FILE_OFFSET64
@@ -279,12 +281,6 @@ META_DATA(TYPE_FILEPOS,STREAM_LENGTH,filestream,Length)
 META_PARAM(STRING,NODE_PROTOCOL,T("file"))
 META_END(STREAM_CLASS)
 
-bool_t FileExists(nodecontext *p,const tchar_t* Path)
-{
-    struct stat file_stats;
-    return stat(Path, &file_stats) == 0;
-}
-
 bool_t FileErase(nodecontext *p,const tchar_t* Path, bool_t Force, bool_t Safe)
 {
     if (Force)
@@ -302,23 +298,6 @@ bool_t FileErase(nodecontext *p,const tchar_t* Path, bool_t Force, bool_t Safe)
     return unlink(Path) == 0;
 }
 
-bool_t FolderErase(nodecontext *p,const tchar_t* Path, bool_t Force, bool_t Safe)
-{
-    if (Force)
-    {
-        struct stat file_stats;
-        if (stat(Path, &file_stats) == 0)
-        {
-            if ((file_stats.st_mode & S_IWUSR)==0)
-            {
-                file_stats.st_mode |= S_IWUSR;
-                chmod(Path,file_stats.st_mode);
-            }
-        }
-    }
-    return rmdir(Path) == 0;
-}
-
 bool_t PathIsFolder(nodecontext *p,const tchar_t* Path)
 {
     struct stat file_stats;
@@ -328,80 +307,3 @@ bool_t PathIsFolder(nodecontext *p,const tchar_t* Path)
     }
     return 0;
 }
-
-datetime_t FileDateTime(nodecontext *p,const tchar_t* Path)
-{
-    datetime_t Date = INVALID_DATETIME_T;
-    struct stat file_stats;
-    if (stat(Path, &file_stats) == 0)
-        Date = LinuxToDateTime(file_stats.st_mtime);
-    return Date;
-}
-
-bool_t FileMove(nodecontext *p,const tchar_t* In,const tchar_t* Out)
-{
-    return rename(In,Out) == 0;
-}
-
-bool_t FolderCreate(nodecontext *p,const tchar_t* Path)
-{
-    return mkdir(Path,_RW_ACCESS_DIR) == 0;
-}
-
-void FindFiles(nodecontext *p,const tchar_t* Path, const tchar_t* Mask,void(*Process)(const tchar_t*,void*),void* Param)
-{
-    DIR* Directory;
-    struct dirent* DirectoryInfo;
-    tchar_t TPathToFile[MAXPATH];
-
-    Directory = opendir(Path);
-    if (Directory)
-    {
-        while ( (DirectoryInfo = readdir(Directory)) != NULL )
-        {
-            char* FileExtension = 0;
-            FileExtension = strrchr(DirectoryInfo->d_name, '.');
-            if(FileExtension)
-            {
-                if (strcmp(Mask, FileExtension ) == 0 )
-                {
-                    tcscpy_s(TPathToFile, TSIZEOF(TPathToFile), Path);
-                    tcscat_s(TPathToFile, TSIZEOF(TPathToFile), DirectoryInfo->d_name);
-                    Process(TPathToFile, Param);
-                }
-            }
-        }
-
-        closedir(Directory);
-    }
-
-}
-
-stream *FileTemp(anynode *Any)
-{
-#ifndef TODO
-    assert(NULL); // not supported yet
-#endif
-    return NULL;
-}
-
-bool_t FileTempName(anynode *Any,tchar_t *Out, size_t OutLen)
-{
-#ifndef TODO
-    assert(NULL); // not supported yet
-#endif
-    return 0;
-}
-
-int64_t GetPathFreeSpace(nodecontext* UNUSED_PARAM(p), const tchar_t* Path)
-{
-#ifndef TODO
-    // need to an include (see at includes)
-    struct statfs st;
-    if (statfs(Path, &st) < 0)
-        return -1;
-    return (int64_t)st.f_bsize * (int64_t)st.f_bavail;
-#else
-    return -1;
-#endif
-}