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

path.c: PaLockOpen() constify and add prototype

This commit is contained in:
Darryl L. Miles 2024-10-12 08:36:54 +01:00 committed by Tim Edwards
parent 875d825afb
commit d077368436
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

@ -632,18 +632,18 @@ PaLockZOpen(file, mode, ext, path, library, pRealName, is_locked, fdp)
FILE * FILE *
PaLockOpen(file, mode, ext, path, library, pRealName, is_locked, fdp) PaLockOpen(file, mode, ext, path, library, pRealName, is_locked, fdp)
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 fopen. */ const char *mode; /* The file mode, as given to fopen. */
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
@ -658,7 +658,8 @@ PaLockOpen(file, mode, ext, path, library, pRealName, is_locked, fdp)
*/ */
int *fdp; /* If non-NULL, put the file descriptor here. */ int *fdp; /* If non-NULL, put the file descriptor here. */
{ {
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;
FILE *f; FILE *f;

3
utils/utils.h
View File

@ -49,7 +49,8 @@ extern int LookupStructFull(const char *str, const char * const *table, int size
extern int PaExpand(const char **, char **, int); extern int PaExpand(const char **, char **, int);
extern char *nextName(const char **ppath, const char *file, char *dest, int size); extern char *nextName(const char **ppath, const char *file, char *dest, int size);
extern FILE *PaOpen(char *, char *, char *, char *, char *, char **); extern FILE *PaOpen(char *, char *, char *, char *, char *, char **);
extern FILE *PaLockOpen(char *, char *, char *, char *, char *, char **, bool *, int *); extern FILE *PaLockOpen(const char *file, const char *mode, const char *ext, const char *path, const char *library,
char **pRealName, bool *is_locked, int *fdp);
extern char *StrDup(char **, const char *); extern char *StrDup(char **, const char *);
extern bool Match(const char *pattern, const char *string); extern bool Match(const char *pattern, const char *string);
extern char *ArgStr(int *pargc, char ***pargv, const char *argType); extern char *ArgStr(int *pargc, char ***pargv, const char *argType);