luke
/
magic
mirror of https://github.com/RTimothyEdwards/magic.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

path.c: PaZOpen() constify and add prototype

This commit is contained in:
Darryl L. Miles 2024-10-12 08:37:21 +01:00 committed by Tim Edwards
parent d077368436
commit fd7eab2193
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
utils/path.c
View File

@ -817,18 +817,18 @@ PaLockOpen(file, mode, ext, path, library, pRealName, is_locked, fdp)
gzFile gzFile
PaZOpen(file, mode, ext, path, library, pRealName) PaZOpen(file, mode, ext, path, library, pRealName)
char *file; /* Name of the file to be opened. */ const char *file; /* Name of the file to be opened. */
char *mode; /* The file mode, as given to gzopen. */ const char *mode; /* The file mode, as given to gzopen. */
char *ext; /* The extension to be added to the file name, const char *ext; /* The extension to be added to the file name,
* or NULL. Note: this string must include * or NULL. Note: this string must include
* the dot (or whatever separator you use). * the dot (or whatever separator you use).
*/ */
char *path; /* A search path: a list of directory names const char *path; /* A search path: a list of directory names
* separated by colons or blanks. To use * separated by colons or blanks. To use
* only the working directory, use "." for * only the working directory, use "." for
* the path. * the path.
*/ */
char *library; /* A 2nd path containing library names. Can be const char *library; /* A 2nd path containing library names. Can be
* NULL to indicate no library. * NULL to indicate no library.
*/ */
char **pRealName; /* Pointer to a location that will be filled char **pRealName; /* Pointer to a location that will be filled
@ -837,7 +837,8 @@ PaZOpen(file, mode, ext, path, library, pRealName)
* If NULL, then nothing is stored. * If NULL, then nothing is stored.
*/ */
{ {
char extendedName[MAXSIZE], *p1, *p2; char extendedName[MAXSIZE], *p1;
const char *p2;
static char realName[MAXSIZE]; static char realName[MAXSIZE];
int length, extLength, i; int length, extLength, i;
gzFile f; gzFile f;

3
utils/utils.h
View File

@ -76,7 +76,8 @@ extern void SetNoisyDI();
extern bool ParsSplit(); extern bool ParsSplit();
#ifdef HAVE_ZLIB #ifdef HAVE_ZLIB
extern gzFile PaZOpen(char *, char *, char *, char *, char *, char **); extern gzFile PaZOpen(const char *file, const char *mode, const char *ext, const char *path, const char *library,
char **pRealName);
extern gzFile PaLockZOpen(const char *file, const char *mode, const char *ext, const char *path, const char *library, extern gzFile PaLockZOpen(const char *file, const char *mode, const char *ext, const char *path, const char *library,
char **pRealName, bool *is_locked, int *fdp); char **pRealName, bool *is_locked, int *fdp);
extern char *PaCheckCompressed(const char *filename); extern char *PaCheckCompressed(const char *filename);