PERFORCE change 123965 for review
Roman Divacky
rdivacky at FreeBSD.org
Mon Jul 23 14:49:39 UTC 2007
http://perforce.freebsd.org/chv.cgi?CH=123965
Change 123965 by rdivacky at rdivacky_witten on 2007/07/23 14:48:37
args->uap and introduce local variables that shadow the uap context where
appropriate.
Suggested by: kib
Affected files ...
.. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/vfs_syscalls.c#47 edit
Differences ...
==== //depot/projects/soc2007/rdivacky/linux_at/sys/kern/vfs_syscalls.c#47 (text+ko) ====
@@ -963,10 +963,10 @@
};
#endif
int
-openat(struct thread *td, struct openat_args *args)
+openat(struct thread *td, struct openat_args *uap)
{
- return (kern_openat(td, args->fd, args->path, UIO_USERSPACE,
- args->flag, args->mode));
+ return (kern_openat(td, uap->fd, uap->path, UIO_USERSPACE,
+ uap->flag, uap->mode));
}
int
@@ -1226,10 +1226,10 @@
};
#endif
int
-mknodat(struct thread *td, struct mknodat_args *args)
+mknodat(struct thread *td, struct mknodat_args *uap)
{
- return (kern_mknodat(td, args->fd, args->path, UIO_USERSPACE, args->mode,
- args->dev));
+ return (kern_mknodat(td, uap->fd, uap->path, UIO_USERSPACE, uap->mode,
+ uap->dev));
}
int
@@ -1394,9 +1394,9 @@
};
#endif
int
-mkfifoat(struct thread *td, struct mkfifoat_args *args)
+mkfifoat(struct thread *td, struct mkfifoat_args *uap)
{
- return (kern_mkfifoat(td, args->fd, args->path, UIO_USERSPACE, args->mode));
+ return (kern_mkfifoat(td, uap->fd, uap->path, UIO_USERSPACE, uap->mode));
}
int
@@ -1521,17 +1521,21 @@
};
#endif
int
-linkat(struct thread *td, struct linkat_args *args)
+linkat(struct thread *td, struct linkat_args *uap)
{
- if (args->flag & ~AT_SYMLINK_FOLLOW)
+ int flag = uap->flag;
+ int fd1 = uap->fd1, fd2 = uap->fd2;
+ const char *path1 = uap->path1, *path2 = uap->path2;
+
+ if (flag & ~AT_SYMLINK_FOLLOW)
return (EINVAL);
- if (args->flag & AT_SYMLINK_FOLLOW)
- return (kern_linkat(td, args->fd1, args->fd2, args->path1,
- args->path2, UIO_USERSPACE, FOLLOW));
+ if (flag & AT_SYMLINK_FOLLOW)
+ return (kern_linkat(td, fd1, fd2, path1, path2, UIO_USERSPACE,
+ FOLLOW));
else
- return (kern_linkat(td, args->fd1, args->fd2, args->path1,
- args->path2, UIO_USERSPACE, 0));
+ return (kern_linkat(td, fd1, fd2, path1, path2, UIO_USERSPACE,
+ 0));
}
static int hardlink_check_uid = 0;
@@ -1703,9 +1707,9 @@
};
#endif
int
-symlinkat(struct thread *td, struct symlinkat_args *args)
+symlinkat(struct thread *td, struct symlinkat_args *uap)
{
- return (kern_symlinkat(td, args->path1, args->fd, args->path2, UIO_USERSPACE));
+ return (kern_symlinkat(td, uap->path1, uap->fd, uap->path2, UIO_USERSPACE));
}
int
@@ -1883,15 +1887,19 @@
};
#endif
int
-unlinkat(struct thread *td, struct unlinkat_args *args)
+unlinkat(struct thread *td, struct unlinkat_args *uap)
{
- if (args->flag & ~AT_REMOVEDIR)
+ int flag = uap->flag;
+ int fd = uap->fd;
+ const char *path = uap->path;
+
+ if (flag & ~AT_REMOVEDIR)
return (EINVAL);
- if (args->flag & AT_REMOVEDIR)
- return (kern_rmdirat(td, args->fd, args->path, UIO_USERSPACE));
+ if (flag & AT_REMOVEDIR)
+ return (kern_rmdirat(td, fd, path, UIO_USERSPACE));
else
- return (kern_unlinkat(td, args->fd, args->path, UIO_USERSPACE));
+ return (kern_unlinkat(td, fd, path, UIO_USERSPACE));
}
int
@@ -2180,12 +2188,12 @@
int flag;
}
#endif
-int faccessat(struct thread *td, struct faccessat_args *args)
+int faccessat(struct thread *td, struct faccessat_args *uap)
{
- if (args->flag & ~AT_EACCESS)
+ if (uap->flag & ~AT_EACCESS)
return (EINVAL);
/* XXX: what about mode? */
- return (kern_accessat(td, args->fd, args->path, UIO_USERSPACE, args->flag));
+ return (kern_accessat(td, uap->fd, uap->path, UIO_USERSPACE, uap->flag));
}
int
@@ -2413,15 +2421,20 @@
}
#endif
int
-fstatat(struct thread *td, struct fstatat_args *args)
+fstatat(struct thread *td, struct fstatat_args *uap)
{
- if (args->flag & ~AT_SYMLINK_NOFOLLOW)
+ int flag = uap->flag;
+ int fd = uap->fd;
+ const char *path = uap->path;
+ struct stat *buf = uap->buf;
+
+ if (flag & ~AT_SYMLINK_NOFOLLOW)
return (EINVAL);
- if (args->flag & AT_SYMLINK_NOFOLLOW)
- return (kern_lstatat(td, args->fd, args->path, UIO_USERSPACE, args->buf));
+ if (flag & AT_SYMLINK_NOFOLLOW)
+ return (kern_lstatat(td, fd, path, UIO_USERSPACE, buf));
else
- return (kern_statat(td, args->fd, args->path, UIO_USERSPACE, args->buf));
+ return (kern_statat(td, fd, path, UIO_USERSPACE, buf));
}
int
@@ -2691,10 +2704,10 @@
};
#endif
int
-readlinkat(struct thread *td, struct readlinkat_args *args)
+readlinkat(struct thread *td, struct readlinkat_args *uap)
{
- return (kern_readlinkat(td, args->fd, args->path, UIO_USERSPACE,
- args->buf, UIO_USERSPACE, args->bufsize));
+ return (kern_readlinkat(td, uap->fd, uap->path, UIO_USERSPACE,
+ uap->buf, UIO_USERSPACE, uap->bufsize));
}
int
@@ -2962,17 +2975,20 @@
}
#endif
int
-fchmodat(struct thread *td, struct fchmodat_args *args)
+fchmodat(struct thread *td, struct fchmodat_args *uap)
{
- if (args->flag & ~AT_SYMLINK_NOFOLLOW)
+ int flag = uap->flag;
+ int fd = uap->fd;
+ const char *path = uap->path;
+ mode_t mode = uap->mode;
+
+ if (flag & ~AT_SYMLINK_NOFOLLOW)
return (EINVAL);
- if (args->flag & AT_SYMLINK_NOFOLLOW)
- return (kern_lchmodat(td, args->fd, args->path, UIO_USERSPACE,
- args->mode));
+ if (flag & AT_SYMLINK_NOFOLLOW)
+ return (kern_lchmodat(td, fd, path, UIO_USERSPACE, mode));
else
- return (kern_chmodat(td, args->fd, args->path, UIO_USERSPACE,
- args->mode));
+ return (kern_chmodat(td, fd, path, UIO_USERSPACE, mode));
}
int
@@ -3160,17 +3176,21 @@
#ifndef _SYS_SYSPROTO_H_
#endif
int
-fchownat(struct thread *td, struct fchownat_args *args)
+fchownat(struct thread *td, struct fchownat_args *uap)
{
- if (args->flag & ~AT_SYMLINK_NOFOLLOW)
+ int flag = uap->flag;
+ int fd = uap->fd;
+ const char *path = uap->path;
+ uid_t uid = uap->uid;
+ uid_t gid = uap->gid;
+
+ if (flag & ~AT_SYMLINK_NOFOLLOW)
return (EINVAL);
- if (args->flag & AT_SYMLINK_NOFOLLOW)
- return (kern_lchownat(td, args->fd, args->path, UIO_USERSPACE,
- args->uid, args->gid));
+ if (flag & AT_SYMLINK_NOFOLLOW)
+ return (kern_lchownat(td, fd, path, UIO_USERSPACE, uid, gid));
else
- return (kern_chownat(td, args->fd, args->path, UIO_USERSPACE,
- args->uid, args->gid));
+ return (kern_chownat(td, fd, path, UIO_USERSPACE, uid, gid));
}
int
@@ -3414,10 +3434,10 @@
#ifndef _SYS_SYSPROTO_H_
#endif
int
-futimesat(struct thread *td, struct futimesat_args *args)
+futimesat(struct thread *td, struct futimesat_args *uap)
{
- return (kern_utimesat(td, args->fd, args->path, UIO_USERSPACE,
- args->times, UIO_USERSPACE));
+ return (kern_utimesat(td, uap->fd, uap->path, UIO_USERSPACE,
+ uap->times, UIO_USERSPACE));
}
int
@@ -3836,9 +3856,9 @@
};
#endif
int
-renameat(struct thread *td, struct renameat_args *args)
+renameat(struct thread *td, struct renameat_args *uap)
{
- return (kern_renameat(td, args->oldfd, args->old, args->newfd, args->new,
+ return (kern_renameat(td, uap->oldfd, uap->old, uap->newfd, uap->new,
UIO_USERSPACE));
}
@@ -4021,9 +4041,9 @@
};
#endif
int
-mkdirat(struct thread *td, struct mkdirat_args *args)
+mkdirat(struct thread *td, struct mkdirat_args *uap)
{
- return (kern_mkdirat(td, args->fd, args->path, UIO_USERSPACE, args->mode));
+ return (kern_mkdirat(td, uap->fd, uap->path, UIO_USERSPACE, uap->mode));
}
int
More information about the p4-projects
mailing list