mirror of
https://github.com/linux-apfs/apfstests.git
synced 2026-05-01 15:01:44 -07:00
Drop the xfs-specific MAXNAMELEN in favor of the Posix NAME_MAX
This makes it easier to lose libxfs.h later. Signed-off-by: Eric Sandeen <sandeen@sandeen.net> Reviewed-by: Christoph Hellwig <hch@lst.de>
This commit is contained in:
@@ -25,9 +25,6 @@
|
||||
#include <lib/hsm.h>
|
||||
|
||||
#include <string.h>
|
||||
#ifdef linux
|
||||
#define MAXNAMELEN 256
|
||||
#endif
|
||||
|
||||
/*
|
||||
* Define some standard formats for the printf statements below.
|
||||
@@ -96,7 +93,7 @@ print_one_mount_event(
|
||||
char hans1[HANDLE_STR], hans2[HANDLE_STR], hans3[HANDLE_STR];
|
||||
void *namp1, *namp2;
|
||||
size_t nlen1, nlen2;
|
||||
char nams1[MAXNAMELEN], nams2[MAXNAMELEN];
|
||||
char nams1[NAME_MAX + 1], nams2[NAME_MAX + 1];
|
||||
mode_t mode;
|
||||
|
||||
#if VERITAS_21
|
||||
@@ -207,7 +204,7 @@ print_one_message(
|
||||
void *hanp1, *hanp2, *namp1, *namp2;
|
||||
u_int hlen1, hlen2, nlen1, nlen2;
|
||||
char hans1[HANDLE_STR], hans2[HANDLE_STR];
|
||||
char nams1[MAXNAMELEN], nams2[MAXNAMELEN];
|
||||
char nams1[NAME_MAX + 1], nams2[NAME_MAX + 1];
|
||||
|
||||
/***** USER EVENTS *****/
|
||||
|
||||
|
||||
@@ -65,8 +65,6 @@ clear_region_event(
|
||||
size_t hlen,
|
||||
char *hans1);
|
||||
|
||||
#define MAXNAMELEN 256
|
||||
|
||||
/*
|
||||
* Keep these global so the exit_handler and err_msg routines can get to them
|
||||
*/
|
||||
@@ -294,7 +292,7 @@ print_one_mount_event(
|
||||
char hans1[HANDLE_STR], hans2[HANDLE_STR], hans3[HANDLE_STR];
|
||||
void *namp1, *namp2;
|
||||
size_t nlen1, nlen2;
|
||||
char nams1[MAXNAMELEN], nams2[MAXNAMELEN];
|
||||
char nams1[NAME_MAX + 1], nams2[NAME_MAX + 1];
|
||||
mode_t mode;
|
||||
|
||||
#if VERITAS_21
|
||||
@@ -391,7 +389,7 @@ handle_message(
|
||||
void *hanp1, *hanp2, *namp1, *namp2;
|
||||
u_int hlen1, hlen2, nlen1, nlen2;
|
||||
char hans1[HANDLE_STR], hans2[HANDLE_STR];
|
||||
char nams1[MAXNAMELEN], nams2[MAXNAMELEN];
|
||||
char nams1[NAME_MAX + 1], nams2[NAME_MAX + 1];
|
||||
|
||||
/*
|
||||
* Set the defaults for responding to events
|
||||
|
||||
@@ -39,10 +39,6 @@
|
||||
#include <lib/dmport.h>
|
||||
#include <lib/hsm.h>
|
||||
|
||||
#ifdef linux
|
||||
#define MAXNAMELEN 256
|
||||
#endif
|
||||
|
||||
/*
|
||||
* Define some standard formats for the printf statements below.
|
||||
*/
|
||||
@@ -291,7 +287,7 @@ print_one_mount_event(
|
||||
char hans1[HANDLE_STR], hans2[HANDLE_STR], hans3[HANDLE_STR];
|
||||
void *namp1, *namp2;
|
||||
size_t nlen1, nlen2;
|
||||
char nams1[MAXNAMELEN], nams2[MAXNAMELEN];
|
||||
char nams1[NAME_MAX + 1], nams2[NAME_MAX + 1];
|
||||
mode_t mode;
|
||||
|
||||
#if VERITAS
|
||||
@@ -386,7 +382,7 @@ handle_message(
|
||||
void *hanp1, *hanp2, *namp1, *namp2;
|
||||
u_int hlen1, hlen2, nlen1, nlen2;
|
||||
char hans1[HANDLE_STR], hans2[HANDLE_STR];
|
||||
char nams1[MAXNAMELEN], nams2[MAXNAMELEN];
|
||||
char nams1[NAME_MAX + 1], nams2[NAME_MAX + 1];
|
||||
void *fs_hanp;
|
||||
size_t fs_hlen;
|
||||
dm_timestruct_t *pending_time;
|
||||
|
||||
+23
-23
@@ -477,7 +477,7 @@ attr_list_path(pathname_t *name,
|
||||
int flags,
|
||||
attrlist_cursor_t *cursor)
|
||||
{
|
||||
char buf[MAXNAMELEN];
|
||||
char buf[NAME_MAX + 1];
|
||||
pathname_t newname;
|
||||
int rval;
|
||||
|
||||
@@ -501,7 +501,7 @@ attr_list_path(pathname_t *name,
|
||||
int
|
||||
attr_remove_path(pathname_t *name, const char *attrname, int flags)
|
||||
{
|
||||
char buf[MAXNAMELEN];
|
||||
char buf[NAME_MAX + 1];
|
||||
pathname_t newname;
|
||||
int rval;
|
||||
|
||||
@@ -521,7 +521,7 @@ int
|
||||
attr_set_path(pathname_t *name, const char *attrname, const char *attrvalue,
|
||||
const int valuelength, int flags)
|
||||
{
|
||||
char buf[MAXNAMELEN];
|
||||
char buf[NAME_MAX + 1];
|
||||
pathname_t newname;
|
||||
int rval;
|
||||
|
||||
@@ -556,7 +556,7 @@ check_cwd(void)
|
||||
int
|
||||
creat_path(pathname_t *name, mode_t mode)
|
||||
{
|
||||
char buf[MAXNAMELEN];
|
||||
char buf[NAME_MAX + 1];
|
||||
pathname_t newname;
|
||||
int rval;
|
||||
|
||||
@@ -697,7 +697,7 @@ doproc(void)
|
||||
int
|
||||
fent_to_name(pathname_t *name, flist_t *flp, fent_t *fep)
|
||||
{
|
||||
char buf[MAXNAMELEN];
|
||||
char buf[NAME_MAX + 1];
|
||||
int i;
|
||||
fent_t *pfep;
|
||||
int e;
|
||||
@@ -762,7 +762,7 @@ free_pathname(pathname_t *name)
|
||||
int
|
||||
generate_fname(fent_t *fep, int ft, pathname_t *name, int *idp, int *v)
|
||||
{
|
||||
char buf[MAXNAMELEN];
|
||||
char buf[NAME_MAX + 1];
|
||||
flist_t *flp;
|
||||
int id;
|
||||
int j;
|
||||
@@ -890,7 +890,7 @@ init_pathname(pathname_t *name)
|
||||
int
|
||||
lchown_path(pathname_t *name, uid_t owner, gid_t group)
|
||||
{
|
||||
char buf[MAXNAMELEN];
|
||||
char buf[NAME_MAX + 1];
|
||||
pathname_t newname;
|
||||
int rval;
|
||||
|
||||
@@ -909,8 +909,8 @@ lchown_path(pathname_t *name, uid_t owner, gid_t group)
|
||||
int
|
||||
link_path(pathname_t *name1, pathname_t *name2)
|
||||
{
|
||||
char buf1[MAXNAMELEN];
|
||||
char buf2[MAXNAMELEN];
|
||||
char buf1[NAME_MAX + 1];
|
||||
char buf2[NAME_MAX + 1];
|
||||
int down1;
|
||||
pathname_t newname1;
|
||||
pathname_t newname2;
|
||||
@@ -964,7 +964,7 @@ link_path(pathname_t *name1, pathname_t *name2)
|
||||
int
|
||||
lstat64_path(pathname_t *name, struct stat64 *sbuf)
|
||||
{
|
||||
char buf[MAXNAMELEN];
|
||||
char buf[NAME_MAX + 1];
|
||||
pathname_t newname;
|
||||
int rval;
|
||||
|
||||
@@ -1000,7 +1000,7 @@ make_freq_table(void)
|
||||
int
|
||||
mkdir_path(pathname_t *name, mode_t mode)
|
||||
{
|
||||
char buf[MAXNAMELEN];
|
||||
char buf[NAME_MAX + 1];
|
||||
pathname_t newname;
|
||||
int rval;
|
||||
|
||||
@@ -1019,7 +1019,7 @@ mkdir_path(pathname_t *name, mode_t mode)
|
||||
int
|
||||
mknod_path(pathname_t *name, mode_t mode, dev_t dev)
|
||||
{
|
||||
char buf[MAXNAMELEN];
|
||||
char buf[NAME_MAX + 1];
|
||||
pathname_t newname;
|
||||
int rval;
|
||||
|
||||
@@ -1040,7 +1040,7 @@ namerandpad(int id, char *buf, int i)
|
||||
{
|
||||
int bucket;
|
||||
static int buckets[] =
|
||||
{ 2, 4, 8, 16, 32, 64, 128, MAXNAMELEN - 1 };
|
||||
{ 2, 4, 8, 16, 32, 64, 128, NAME_MAX };
|
||||
int padlen;
|
||||
int padmod;
|
||||
|
||||
@@ -1060,7 +1060,7 @@ namerandpad(int id, char *buf, int i)
|
||||
int
|
||||
open_path(pathname_t *name, int oflag)
|
||||
{
|
||||
char buf[MAXNAMELEN];
|
||||
char buf[NAME_MAX + 1];
|
||||
pathname_t newname;
|
||||
int rval;
|
||||
|
||||
@@ -1079,7 +1079,7 @@ open_path(pathname_t *name, int oflag)
|
||||
DIR *
|
||||
opendir_path(pathname_t *name)
|
||||
{
|
||||
char buf[MAXNAMELEN];
|
||||
char buf[NAME_MAX + 1];
|
||||
pathname_t newname;
|
||||
DIR *rval;
|
||||
|
||||
@@ -1120,7 +1120,7 @@ process_freq(char *arg)
|
||||
int
|
||||
readlink_path(pathname_t *name, char *lbuf, size_t lbufsiz)
|
||||
{
|
||||
char buf[MAXNAMELEN];
|
||||
char buf[NAME_MAX + 1];
|
||||
pathname_t newname;
|
||||
int rval;
|
||||
|
||||
@@ -1139,8 +1139,8 @@ readlink_path(pathname_t *name, char *lbuf, size_t lbufsiz)
|
||||
int
|
||||
rename_path(pathname_t *name1, pathname_t *name2)
|
||||
{
|
||||
char buf1[MAXNAMELEN];
|
||||
char buf2[MAXNAMELEN];
|
||||
char buf1[NAME_MAX + 1];
|
||||
char buf2[NAME_MAX + 1];
|
||||
int down1;
|
||||
pathname_t newname1;
|
||||
pathname_t newname2;
|
||||
@@ -1194,7 +1194,7 @@ rename_path(pathname_t *name1, pathname_t *name2)
|
||||
int
|
||||
rmdir_path(pathname_t *name)
|
||||
{
|
||||
char buf[MAXNAMELEN];
|
||||
char buf[NAME_MAX + 1];
|
||||
pathname_t newname;
|
||||
int rval;
|
||||
|
||||
@@ -1267,7 +1267,7 @@ show_ops(int flag, char *lead_str)
|
||||
int
|
||||
stat64_path(pathname_t *name, struct stat64 *sbuf)
|
||||
{
|
||||
char buf[MAXNAMELEN];
|
||||
char buf[NAME_MAX + 1];
|
||||
pathname_t newname;
|
||||
int rval;
|
||||
|
||||
@@ -1286,7 +1286,7 @@ stat64_path(pathname_t *name, struct stat64 *sbuf)
|
||||
int
|
||||
symlink_path(const char *name1, pathname_t *name)
|
||||
{
|
||||
char buf[MAXNAMELEN];
|
||||
char buf[NAME_MAX + 1];
|
||||
pathname_t newname;
|
||||
int rval;
|
||||
|
||||
@@ -1310,7 +1310,7 @@ symlink_path(const char *name1, pathname_t *name)
|
||||
int
|
||||
truncate64_path(pathname_t *name, off64_t length)
|
||||
{
|
||||
char buf[MAXNAMELEN];
|
||||
char buf[NAME_MAX + 1];
|
||||
pathname_t newname;
|
||||
int rval;
|
||||
|
||||
@@ -1329,7 +1329,7 @@ truncate64_path(pathname_t *name, off64_t length)
|
||||
int
|
||||
unlink_path(pathname_t *name)
|
||||
{
|
||||
char buf[MAXNAMELEN];
|
||||
char buf[NAME_MAX + 1];
|
||||
pathname_t newname;
|
||||
int rval;
|
||||
|
||||
|
||||
+3
-4
@@ -28,7 +28,6 @@
|
||||
#include <string.h>
|
||||
#include <unistd.h>
|
||||
|
||||
#define MAXNAMELEN 256
|
||||
#ifndef __sgi__
|
||||
typedef unsigned int uint_t;
|
||||
#endif
|
||||
@@ -81,7 +80,7 @@ main(int argc, char **argv)
|
||||
DIR *dirp;
|
||||
int i;
|
||||
int j;
|
||||
char name[MAXNAMELEN];
|
||||
char name[NAME_MAX + 1];
|
||||
struct stat stb;
|
||||
double stime;
|
||||
|
||||
@@ -150,8 +149,8 @@ main(int argc, char **argv)
|
||||
minchars = hexchars(lastsize - 1);
|
||||
if (nchars < minchars)
|
||||
nchars = minchars;
|
||||
else if (nchars >= MAXNAMELEN)
|
||||
nchars = MAXNAMELEN - 1;
|
||||
else if (nchars >= NAME_MAX + 1)
|
||||
nchars = NAME_MAX;
|
||||
if (ndirs > MAX_DIR_COUNT)
|
||||
ndirs = MAX_DIR_COUNT;
|
||||
if (ndirs < MIN_DIR_COUNT)
|
||||
|
||||
+3
-4
@@ -34,7 +34,6 @@
|
||||
#include <attr/attributes.h>
|
||||
#endif
|
||||
|
||||
#define MAXNAMELEN 256
|
||||
#ifndef sgi
|
||||
typedef unsigned int uint_t;
|
||||
#endif
|
||||
@@ -92,7 +91,7 @@ main(int argc, char **argv)
|
||||
uint_t cursize;
|
||||
int i;
|
||||
int j;
|
||||
char name[MAXNAMELEN];
|
||||
char name[NAME_MAX + 1];
|
||||
char attr[DMFATTRLEN];
|
||||
double stime;
|
||||
|
||||
@@ -168,8 +167,8 @@ main(int argc, char **argv)
|
||||
minchars = hexchars(lastsize - 1);
|
||||
if (nchars < minchars)
|
||||
nchars = minchars;
|
||||
else if (nchars >= MAXNAMELEN)
|
||||
nchars = MAXNAMELEN - 1;
|
||||
else if (nchars >= NAME_MAX + 1)
|
||||
nchars = NAME_MAX;
|
||||
if (ndirs > MAX_DIR_COUNT)
|
||||
ndirs = MAX_DIR_COUNT;
|
||||
if (ndirs < MIN_DIR_COUNT)
|
||||
|
||||
Reference in New Issue
Block a user