From 2af45cd03fe96cea3e9fb96bb05d240278f65f2a Mon Sep 17 00:00:00 2001 From: Jens Steube Date: Tue, 29 Jun 2021 20:13:11 +0200 Subject: [PATCH] Rename hc_fopen_nozip() to hc_fopen_raw() --- include/filehandling.h | 34 +++++++++++++++++----------------- src/cpu_crc32.c | 2 +- src/filehandling.c | 2 +- 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/include/filehandling.h b/include/filehandling.h index 390cc40e0..1d13097e4 100644 --- a/include/filehandling.h +++ b/include/filehandling.h @@ -15,23 +15,23 @@ int _wopen (const char *path, int oflag, ...); #endif -bool hc_fopen (HCFILE *fp, const char *path, char *mode); -bool hc_fopen_nozip (HCFILE *fp, const char *path, char *mode); -int hc_fscanf (HCFILE *fp, const char *format, void *ptr); -int hc_fprintf (HCFILE *fp, const char *format, ...); -int hc_vfprintf (HCFILE *fp, const char *format, va_list ap); -int hc_fseek (HCFILE *fp, off_t offset, int whence); -void hc_rewind (HCFILE *fp); -off_t hc_ftell (HCFILE *fp); -int hc_fgetc (HCFILE *fp); -int hc_fileno (HCFILE *fp); -int hc_feof (HCFILE *fp); -void hc_fflush (HCFILE *fp); -void hc_fclose (HCFILE *fp); -int hc_fputc (int c, HCFILE *fp); -char *hc_fgets (char *buf, int len, HCFILE *fp); -size_t hc_fwrite (const void *ptr, size_t size, size_t nmemb, HCFILE *fp); -size_t hc_fread (void *ptr, size_t size, size_t nmemb, HCFILE *fp); +bool hc_fopen (HCFILE *fp, const char *path, char *mode); +bool hc_fopen_raw (HCFILE *fp, const char *path, char *mode); +int hc_fscanf (HCFILE *fp, const char *format, void *ptr); +int hc_fprintf (HCFILE *fp, const char *format, ...); +int hc_vfprintf (HCFILE *fp, const char *format, va_list ap); +int hc_fseek (HCFILE *fp, off_t offset, int whence); +void hc_rewind (HCFILE *fp); +off_t hc_ftell (HCFILE *fp); +int hc_fgetc (HCFILE *fp); +int hc_fileno (HCFILE *fp); +int hc_feof (HCFILE *fp); +void hc_fflush (HCFILE *fp); +void hc_fclose (HCFILE *fp); +int hc_fputc (int c, HCFILE *fp); +char *hc_fgets (char *buf, int len, HCFILE *fp); +size_t hc_fwrite (const void *ptr, size_t size, size_t nmemb, HCFILE *fp); +size_t hc_fread (void *ptr, size_t size, size_t nmemb, HCFILE *fp); size_t fgetl (HCFILE *fp, char *line_buf, const size_t line_sz); u64 count_lines (HCFILE *fp); diff --git a/src/cpu_crc32.c b/src/cpu_crc32.c index 840c55901..87706e250 100644 --- a/src/cpu_crc32.c +++ b/src/cpu_crc32.c @@ -94,7 +94,7 @@ int cpu_crc32 (const char *filename, u8 *keytab, const size_t keytabsz) HCFILE fp; - hc_fopen_nozip (&fp, filename, "rb"); + hc_fopen_raw (&fp, filename, "rb"); #define MAX_KEY_SIZE (1024 * 1024) diff --git a/src/filehandling.c b/src/filehandling.c index b7b05fe1c..50cc87016 100644 --- a/src/filehandling.c +++ b/src/filehandling.c @@ -113,7 +113,7 @@ bool hc_fopen (HCFILE *fp, const char *path, char *mode) return true; } -bool hc_fopen_nozip (HCFILE *fp, const char *path, char *mode) +bool hc_fopen_raw (HCFILE *fp, const char *path, char *mode) { if (path == NULL || mode == NULL) return false;