RYTEC
/
libiec61850
mirror of https://github.com/mz-automation/libiec61850.git
6
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge 3a20f6e40b into a13961110b

Browse Source
pull/525/merge
denxxjkee 1 week ago committed by GitHub
parent a13961110b 3a20f6e40b
commit 5fc1fdaea7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File

14
hal/filesystem/linux/file_provider_linux.c
Unescape Escape View File

@ -38,7 +38,7 @@ struct sDirectoryHandle {
}; };
FileHandle FileHandle
FileSystem_openFile(char* fileName, bool readWrite) FileSystem_openFile(const char* fileName, bool readWrite)
{ {
FileHandle newHandle = NULL; FileHandle newHandle = NULL;
@ -57,7 +57,7 @@ FileSystem_readFile(FileHandle handle, uint8_t* buffer, int maxSize)
} }
int int
FileSystem_writeFile(FileHandle handle, uint8_t* buffer, int size) FileSystem_writeFile(FileHandle handle, const uint8_t* buffer, int size)
{ {
return fwrite(buffer, 1, size, (FILE*) handle); return fwrite(buffer, 1, size, (FILE*) handle);
} }
@ -69,7 +69,7 @@ FileSystem_closeFile(FileHandle handle)
} }
bool bool
FileSystem_deleteFile(char* filename) FileSystem_deleteFile(const char* filename)
{ {
if (remove(filename) == 0) if (remove(filename) == 0)
return true; return true;
@ -78,7 +78,7 @@ FileSystem_deleteFile(char* filename)
} }
bool bool
FileSystem_renameFile(char* oldFilename, char* newFilename) FileSystem_renameFile(const char* oldFilename, const char* newFilename)
{ {
if (rename(oldFilename, newFilename) == 0) if (rename(oldFilename, newFilename) == 0)
return true; return true;
@ -88,7 +88,7 @@ FileSystem_renameFile(char* oldFilename, char* newFilename)
bool bool
FileSystem_getFileInfo(char* filename, uint32_t* fileSize, uint64_t* lastModificationTimestamp) FileSystem_getFileInfo(const char* filename, uint32_t* fileSize, uint64_t* lastModificationTimestamp)
{ {
struct stat fileStats; struct stat fileStats;
@ -106,7 +106,7 @@ FileSystem_getFileInfo(char* filename, uint32_t* fileSize, uint64_t* lastModific
} }
DirectoryHandle DirectoryHandle
FileSystem_openDirectory(char* directoryName) FileSystem_openDirectory(const char* directoryName)
{ {
DIR* dirHandle = opendir(directoryName); DIR* dirHandle = opendir(directoryName);
@ -120,7 +120,7 @@ FileSystem_openDirectory(char* directoryName)
return handle; return handle;
} }
char* const char*
FileSystem_readDirectory(DirectoryHandle directory, bool* isDirectory) FileSystem_readDirectory(DirectoryHandle directory, bool* isDirectory)
{ {
struct dirent* dir; struct dirent* dir;

14
hal/filesystem/win32/file_provider_win32.c
Unescape Escape View File

@ -47,7 +47,7 @@ struct sDirectoryHandle {
FileHandle FileHandle
FileSystem_openFile(char* fileName, bool readWrite) FileSystem_openFile(const char* fileName, bool readWrite)
{ {
FileHandle newHandle = NULL; FileHandle newHandle = NULL;
@ -66,7 +66,7 @@ FileSystem_readFile(FileHandle handle, uint8_t* buffer, int maxSize)
} }
int int
FileSystem_writeFile(FileHandle handle, uint8_t* buffer, int size) FileSystem_writeFile(FileHandle handle, const uint8_t* buffer, int size)
{ {
return fwrite(buffer, 1, size, (FILE*) handle); return fwrite(buffer, 1, size, (FILE*) handle);
} }
@ -78,7 +78,7 @@ FileSystem_closeFile(FileHandle handle)
} }
bool bool
FileSystem_getFileInfo(char* filename, uint32_t* fileSize, uint64_t* lastModificationTimestamp) FileSystem_getFileInfo(const char* filename, uint32_t* fileSize, uint64_t* lastModificationTimestamp)
{ {
WIN32_FILE_ATTRIBUTE_DATA fad; WIN32_FILE_ATTRIBUTE_DATA fad;
@ -104,7 +104,7 @@ FileSystem_getFileInfo(char* filename, uint32_t* fileSize, uint64_t* lastModific
} }
DirectoryHandle DirectoryHandle
FileSystem_openDirectory(char* directoryName) FileSystem_openDirectory(const char* directoryName)
{ {
DirectoryHandle dirHandle = (DirectoryHandle) GLOBAL_CALLOC(1, sizeof(struct sDirectoryHandle)); DirectoryHandle dirHandle = (DirectoryHandle) GLOBAL_CALLOC(1, sizeof(struct sDirectoryHandle));
@ -168,7 +168,7 @@ getNextDirectoryEntry(DirectoryHandle directory, bool* isDirectory)
bool bool
FileSystem_deleteFile(char* filename) FileSystem_deleteFile(const char* filename)
{ {
if (remove(filename) == 0) if (remove(filename) == 0)
return true; return true;
@ -177,7 +177,7 @@ FileSystem_deleteFile(char* filename)
} }
bool bool
FileSystem_renameFile(char* oldFilename, char* newFilename) FileSystem_renameFile(const char* oldFilename, const char* newFilename)
{ {
if (rename(oldFilename, newFilename) == 0) if (rename(oldFilename, newFilename) == 0)
return true; return true;
@ -186,7 +186,7 @@ FileSystem_renameFile(char* oldFilename, char* newFilename)
} }
char* const char*
FileSystem_readDirectory(DirectoryHandle directory, bool* isDirectory) FileSystem_readDirectory(DirectoryHandle directory, bool* isDirectory)
{ {
char* fileName = getNextDirectoryEntry(directory, isDirectory); char* fileName = getNextDirectoryEntry(directory, isDirectory);

14
hal/inc/hal_filesystem.h
Unescape Escape View File

@ -44,7 +44,7 @@ typedef struct sDirectoryHandle* DirectoryHandle;
* NULL if opening fails * NULL if opening fails
*/ */
PAL_API FileHandle PAL_API FileHandle
FileSystem_openFile(char* pathName, bool readWrite); FileSystem_openFile(const char* pathName, bool readWrite);
/** /**
* \brief read from an open file * \brief read from an open file
@ -73,7 +73,7 @@ FileSystem_readFile(FileHandle handle, uint8_t* buffer, int maxSize);
* \return the number of bytes actually written * \return the number of bytes actually written
*/ */
PAL_API int PAL_API int
FileSystem_writeFile(FileHandle handle, uint8_t* buffer, int size); FileSystem_writeFile(FileHandle handle, const uint8_t* buffer, int size);
/** /**
* \brief close an open file * \brief close an open file
@ -97,7 +97,7 @@ FileSystem_closeFile(FileHandle handle);
* \return true if file exists, false if not * \return true if file exists, false if not
*/ */
PAL_API bool PAL_API bool
FileSystem_getFileInfo(char* filename, uint32_t* fileSize, uint64_t* lastModificationTimestamp); FileSystem_getFileInfo(const char* filename, uint32_t* fileSize, uint64_t* lastModificationTimestamp);
/** /**
* \brief delete a file * \brief delete a file
@ -107,7 +107,7 @@ FileSystem_getFileInfo(char* filename, uint32_t* fileSize, uint64_t* lastModific
* \return true on success, false on error * \return true on success, false on error
*/ */
PAL_API bool PAL_API bool
FileSystem_deleteFile(char* filename); FileSystem_deleteFile(const char* filename);
/** /**
* \brief rename a file * \brief rename a file
@ -118,7 +118,7 @@ FileSystem_deleteFile(char* filename);
* \return true on success, false on error * \return true on success, false on error
*/ */
PAL_API bool PAL_API bool
FileSystem_renameFile(char* oldFilename, char* newFilename); FileSystem_renameFile(const char* oldFilename, const char* newFilename);
/** /**
* \brief open the directoy with the specified name * \brief open the directoy with the specified name
@ -128,7 +128,7 @@ FileSystem_renameFile(char* oldFilename, char* newFilename);
* \return a handle for the opened directory to be used in subsequent calls to identify the directory * \return a handle for the opened directory to be used in subsequent calls to identify the directory
*/ */
PAL_API DirectoryHandle PAL_API DirectoryHandle
FileSystem_openDirectory(char* directoryName); FileSystem_openDirectory(const char* directoryName);
/** /**
* \brief read the next directory entry * \brief read the next directory entry
@ -142,7 +142,7 @@ FileSystem_openDirectory(char* directoryName);
* *
* \return the name of the directory entry * \return the name of the directory entry
*/ */
PAL_API char* PAL_API const char*
FileSystem_readDirectory(DirectoryHandle directory, bool* isDirectory); FileSystem_readDirectory(DirectoryHandle directory, bool* isDirectory);

2
src/mms/iso_mms/server/mms_file_service.c
Unescape Escape View File

@ -960,7 +960,7 @@ addFileEntriesToResponse(const char* basepath, uint8_t* buffer, int bufPos, int
if (directory != NULL) { if (directory != NULL) {
bool isDirectory; bool isDirectory;
char* fileName = FileSystem_readDirectory(directory, &isDirectory); const char* fileName = FileSystem_readDirectory(directory, &isDirectory);
while (fileName != NULL) { while (fileName != NULL) {
directoryName[directoryNameLength] = 0; directoryName[directoryNameLength] = 0;

Write Preview
Loading…
Cancel
Save