RTOS/rtems
1
0
Fork 0
forked from Imagelibrary/rtems
Code Pull Requests Activity

imfs: Constify rtems_tarfs_load()

Browse Source 
Change the public image data type to a void pointer.
This commit is contained in:
Sebastian Huber
2023-10-20 10:01:35 +02:00
parent b0bd4bff49
commit 51d596281c
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cpukit/include/rtems/imfs.h
View File

@@ -477,7 +477,7 @@ extern void IMFS_fsunmount(
*/ */
extern int rtems_tarfs_load( extern int rtems_tarfs_load(
const char *mountpoint, const char *mountpoint,
uint8_t *tar_image, const void *tar_image,
size_t tar_size size_t tar_size
); );

8
cpukit/libfs/src/imfs/imfs_load_tar.c
View File

@@ -45,7 +45,7 @@
int rtems_tarfs_load( int rtems_tarfs_load(
const char *mountpoint, const char *mountpoint,
uint8_t *tar_image, const void *tar_image,
size_t tar_size size_t tar_size
) )
{ {
@@ -57,6 +57,7 @@ int rtems_tarfs_load(
size_t len; size_t len;
Untar_HeaderContext ctx; Untar_HeaderContext ctx;
unsigned long ptr; unsigned long ptr;
const uint8_t *image;
len = strlen( mountpoint ); len = strlen( mountpoint );
if ( len >= sizeof( buf ) - UNTAR_FILE_NAME_SIZE - 2 ) { if ( len >= sizeof( buf ) - UNTAR_FILE_NAME_SIZE - 2 ) {
@@ -82,11 +83,12 @@ int rtems_tarfs_load(
} }
ptr = 0; ptr = 0;
image = tar_image;
while ( ptr + 512 <= tar_size ) { while ( ptr + 512 <= tar_size ) {
int retval; int retval;
retval = Untar_ProcessHeader( &ctx, (const char *) &tar_image[ ptr ] ); retval = Untar_ProcessHeader( &ctx, (const char *) &image[ ptr ] );
if ( retval != UNTAR_SUCCESSFUL ) { if ( retval != UNTAR_SUCCESSFUL ) {
return -1; return -1;
} }
@@ -97,7 +99,7 @@ int rtems_tarfs_load(
retval = IMFS_make_linearfile( retval = IMFS_make_linearfile(
ctx.file_path, ctx.file_path,
ctx.mode, ctx.mode,
&tar_image[ ptr ], &image[ ptr ],
ctx.file_size ctx.file_size
); );
if ( retval != 0 ) { if ( retval != 0 ) {