diff options
Diffstat (limited to 'src/lib/dlt_filetransfer.c')
-rw-r--r-- | src/lib/dlt_filetransfer.c | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/src/lib/dlt_filetransfer.c b/src/lib/dlt_filetransfer.c index e9fbf3e..bd196ea 100644 --- a/src/lib/dlt_filetransfer.c +++ b/src/lib/dlt_filetransfer.c @@ -91,7 +91,7 @@ uint32_t getFilesize(const char *file, int *ok) } *ok = 1; - return (uint32_t) st.st_size; + return (uint32_t)st.st_size; } /** A simple Hash function for C-strings @@ -104,7 +104,7 @@ void stringHash(const char *str, uint32_t *hash) if (!str || !hash) return; - unsigned int len = (unsigned int) strlen(str); + unsigned int len = strlen(str); unsigned int i = 0; @@ -112,7 +112,7 @@ void stringHash(const char *str, uint32_t *hash) return; for (i = 0; i < len; i++) - *hash = (uint32_t) ((*hash) * 53) + (uint32_t) str[i]; + *hash = 53 * *hash + str[i]; } @@ -133,10 +133,10 @@ uint32_t getFileSerialNumber(const char *file, int *ok) } else { *ok = 1; - ret = (uint32_t) st.st_ino; + ret = st.st_ino; ret = ret << (sizeof(ret) * 8) / 2; - ret |= (uint32_t) st.st_size; - ret ^= (uint32_t) st.st_ctime; + ret |= st.st_size; + ret ^= st.st_ctime; stringHash(file, &ret); } @@ -333,7 +333,7 @@ int dlt_user_log_file_infoAbout(DltContext *fileContext, const char *filename) DLT_STRING("filename"), DLT_STRING(filename), DLT_STRING("file size in bytes"), DLT_UINT(fsize), DLT_STRING("file creation date"), DLT_STRING(creationdate), - DLT_STRING("number of packages"), DLT_INT(dlt_user_log_file_packagesCount(fileContext, filename)), + DLT_STRING("number of packages"), DLT_UINT(dlt_user_log_file_packagesCount(fileContext, filename)), DLT_STRING("FLIF") ); return 0; @@ -407,7 +407,7 @@ int dlt_user_log_file_packagesCount(DltContext *fileContext, const char *filenam return packages; } else { - packages = (int) (filesize / BUFFER_SIZE); + packages = filesize / BUFFER_SIZE; if (filesize % BUFFER_SIZE == 0) return packages; @@ -468,7 +468,7 @@ int dlt_user_log_file_header_alias(DltContext *fileContext, const char *filename DLT_STRING(alias), DLT_UINT(fsize), DLT_STRING(fcreationdate); - DLT_INT(dlt_user_log_file_packagesCount(fileContext, filename)), + DLT_UINT(dlt_user_log_file_packagesCount(fileContext, filename)), DLT_UINT(BUFFER_SIZE), DLT_STRING("FLST") ); @@ -523,7 +523,7 @@ int dlt_user_log_file_header(DltContext *fileContext, const char *filename) DLT_STRING(filename), DLT_UINT(fsize), DLT_STRING(fcreationdate); - DLT_INT(dlt_user_log_file_packagesCount(fileContext, filename)), + DLT_UINT(dlt_user_log_file_packagesCount(fileContext, filename)), DLT_UINT(BUFFER_SIZE), DLT_STRING("FLST") ); @@ -548,7 +548,7 @@ int dlt_user_log_file_data(DltContext *fileContext, const char *filename, int pa { FILE *file; int pkgNumber; - uint16_t readBytes; + uint32_t readBytes; if (isFile(filename)) { @@ -565,9 +565,9 @@ int dlt_user_log_file_data(DltContext *fileContext, const char *filename, int pa DLT_LOG(*fileContext, DLT_LOG_ERROR, DLT_STRING("Error at dlt_user_log_file_data: packageToTransfer out of scope"), DLT_STRING("packageToTransfer:"), - DLT_INT(packageToTransfer), + DLT_UINT(packageToTransfer), DLT_STRING("numberOfMaximalPackages:"), - DLT_INT(dlt_user_log_file_packagesCount(fileContext, filename)), + DLT_UINT(dlt_user_log_file_packagesCount(fileContext, filename)), DLT_STRING("for File:"), DLT_STRING(filename) ); @@ -595,7 +595,7 @@ int dlt_user_log_file_data(DltContext *fileContext, const char *filename, int pa } - readBytes = (uint16_t) fread(buffer, sizeof(char), BUFFER_SIZE, file); + readBytes = fread(buffer, sizeof(char), BUFFER_SIZE, file); int ok; uint32_t fserial = getFileSerialNumber(filename, &ok); @@ -608,7 +608,7 @@ int dlt_user_log_file_data(DltContext *fileContext, const char *filename, int pa DLT_LOG(*fileContext, DLT_LOG_INFO, DLT_STRING("FLDA"), DLT_UINT(fserial), - DLT_INT(packageToTransfer), + DLT_UINT(packageToTransfer), DLT_RAW(buffer, readBytes), DLT_STRING("FLDA") ); @@ -624,7 +624,7 @@ int dlt_user_log_file_data(DltContext *fileContext, const char *filename, int pa /* If free space < 50% the package won't be transferred. */ if (checkUserBufferForFreeSpace() > 0) { pkgNumber++; - readBytes = (uint16_t) fread(buffer, sizeof(char), BUFFER_SIZE, file); + readBytes = fread(buffer, sizeof(char), BUFFER_SIZE, file); int ok; uint32_t fserial = getFileSerialNumber(filename, &ok); @@ -637,7 +637,7 @@ int dlt_user_log_file_data(DltContext *fileContext, const char *filename, int pa DLT_LOG(*fileContext, DLT_LOG_INFO, DLT_STRING("FLDA"), DLT_UINT(fserial), - DLT_INT(pkgNumber), + DLT_UINT(pkgNumber), DLT_RAW(buffer, readBytes), DLT_STRING("FLDA") ); |