apio/minitar
1
1
Fork 0
Code Issues Pull Requests Releases 15 Activity

Rename minitar_read_file to minitar_read_file_contents

Browse Source
This commit is contained in:
apio 2022-11-06 14:23:35 +01:00
parent 97da894c0f
commit df26e6d772
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/tar.c
View File

@ -4,11 +4,12 @@
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
// all of these are defined in util.c
int minitar_read_header(struct minitar*, struct tar_header*); int minitar_read_header(struct minitar*, struct tar_header*);
int minitar_validate_header(struct tar_header*); int minitar_validate_header(struct tar_header*);
void minitar_parse_tar_header(struct tar_header*, struct minitar_entry_metadata*); void minitar_parse_tar_header(struct tar_header*, struct minitar_entry_metadata*);
struct minitar_entry* minitar_dup_entry(struct minitar_entry*); struct minitar_entry* minitar_dup_entry(struct minitar_entry*);
char* minitar_read_file(struct minitar_entry_metadata*, struct minitar*); char* minitar_read_file_contents(struct minitar_entry_metadata*, struct minitar*);
struct minitar* minitar_open(const char* pathname) struct minitar* minitar_open(const char* pathname)
{ {
@ -48,7 +49,7 @@ static struct minitar_entry* minitar_attempt_read_entry(struct minitar* mp, int*
} }
*valid = 1; *valid = 1;
minitar_parse_tar_header(&hdr, &entry.metadata); minitar_parse_tar_header(&hdr, &entry.metadata);
char* buf = minitar_read_file(&entry.metadata, mp); char* buf = minitar_read_file_contents(&entry.metadata, mp);
if (!buf) return NULL; if (!buf) return NULL;
entry.ptr = buf; entry.ptr = buf;
return minitar_dup_entry(&entry); return minitar_dup_entry(&entry);

2
src/util.c
View File

@ -89,7 +89,7 @@ struct minitar_entry* minitar_dup_entry(struct minitar_entry* original)
return new; return new;
} }
char* minitar_read_file(struct minitar_entry_metadata* metadata, struct minitar* mp) char* minitar_read_file_contents(struct minitar_entry_metadata* metadata, struct minitar* mp)
{ {
char* buf = malloc(metadata->size + 1); char* buf = malloc(metadata->size + 1);
if (!buf) return NULL; if (!buf) return NULL;