mirror of
https://github.com/samba-team/samba.git
synced 2024-12-23 17:34:34 +03:00
r25399: Excise uint - > uint32 (where appropriate) or unsigned int.
Jeremy.
This commit is contained in:
parent
1f0d05807b
commit
b4ee924000
@ -296,7 +296,7 @@ struct vfs_ops {
|
|||||||
void *private_data,
|
void *private_data,
|
||||||
struct notify_event *ev),
|
struct notify_event *ev),
|
||||||
void *private_data, void *handle_p);
|
void *private_data, void *handle_p);
|
||||||
int (*chflags)(struct vfs_handle_struct *handle, const char *path, uint flags);
|
int (*chflags)(struct vfs_handle_struct *handle, const char *path, unsigned int flags);
|
||||||
struct file_id (*file_id_create)(struct vfs_handle_struct *handle, SMB_DEV_T dev, SMB_INO_T inode);
|
struct file_id (*file_id_create)(struct vfs_handle_struct *handle, SMB_DEV_T dev, SMB_INO_T inode);
|
||||||
|
|
||||||
/* NT ACL operations. */
|
/* NT ACL operations. */
|
||||||
|
@ -137,7 +137,7 @@ int aixacl_sys_acl_set_file(vfs_handle_struct *handle,
|
|||||||
SMB_ACL_T theacl)
|
SMB_ACL_T theacl)
|
||||||
{
|
{
|
||||||
struct acl *file_acl = NULL;
|
struct acl *file_acl = NULL;
|
||||||
uint rc;
|
unsigned int rc;
|
||||||
|
|
||||||
file_acl = aixacl_smb_to_aixacl(type, theacl);
|
file_acl = aixacl_smb_to_aixacl(type, theacl);
|
||||||
if (!file_acl)
|
if (!file_acl)
|
||||||
@ -157,7 +157,7 @@ int aixacl_sys_acl_set_fd(vfs_handle_struct *handle,
|
|||||||
int fd, SMB_ACL_T theacl)
|
int fd, SMB_ACL_T theacl)
|
||||||
{
|
{
|
||||||
struct acl *file_acl = NULL;
|
struct acl *file_acl = NULL;
|
||||||
uint rc;
|
unsigned int rc;
|
||||||
|
|
||||||
file_acl = aixacl_smb_to_aixacl(SMB_ACL_TYPE_ACCESS, theacl);
|
file_acl = aixacl_smb_to_aixacl(SMB_ACL_TYPE_ACCESS, theacl);
|
||||||
if (!file_acl)
|
if (!file_acl)
|
||||||
|
@ -209,9 +209,9 @@ struct acl *aixacl_smb_to_aixacl(SMB_ACL_TYPE_T acltype, SMB_ACL_T theacl)
|
|||||||
struct acl *file_acl_temp = NULL;
|
struct acl *file_acl_temp = NULL;
|
||||||
struct acl_entry *acl_entry = NULL;
|
struct acl_entry *acl_entry = NULL;
|
||||||
struct ace_id *ace_id = NULL;
|
struct ace_id *ace_id = NULL;
|
||||||
uint id_type;
|
unsigned int id_type;
|
||||||
uint user_id;
|
unsigned int user_id;
|
||||||
uint acl_length;
|
unsigned int acl_length;
|
||||||
int i;
|
int i;
|
||||||
|
|
||||||
DEBUG(10,("Entering aixacl_smb_to_aixacl\n"));
|
DEBUG(10,("Entering aixacl_smb_to_aixacl\n"));
|
||||||
|
@ -183,7 +183,7 @@ static NTSTATUS smb_full_audit_notify_watch(struct vfs_handle_struct *handle,
|
|||||||
struct notify_event *ev),
|
struct notify_event *ev),
|
||||||
void *private_data, void *handle_p);
|
void *private_data, void *handle_p);
|
||||||
static int smb_full_audit_chflags(vfs_handle_struct *handle,
|
static int smb_full_audit_chflags(vfs_handle_struct *handle,
|
||||||
const char *path, uint flags);
|
const char *path, unsigned int flags);
|
||||||
static struct file_id smb_full_audit_file_id_create(struct vfs_handle_struct *handle,
|
static struct file_id smb_full_audit_file_id_create(struct vfs_handle_struct *handle,
|
||||||
SMB_DEV_T dev, SMB_INO_T inode);
|
SMB_DEV_T dev, SMB_INO_T inode);
|
||||||
static size_t smb_full_audit_fget_nt_acl(vfs_handle_struct *handle, files_struct *fsp,
|
static size_t smb_full_audit_fget_nt_acl(vfs_handle_struct *handle, files_struct *fsp,
|
||||||
@ -1460,7 +1460,7 @@ static NTSTATUS smb_full_audit_notify_watch(struct vfs_handle_struct *handle,
|
|||||||
}
|
}
|
||||||
|
|
||||||
static int smb_full_audit_chflags(vfs_handle_struct *handle,
|
static int smb_full_audit_chflags(vfs_handle_struct *handle,
|
||||||
const char *path, uint flags)
|
const char *path, unsigned int flags)
|
||||||
{
|
{
|
||||||
int result;
|
int result;
|
||||||
|
|
||||||
|
@ -957,7 +957,7 @@ static void store_queue_struct(struct tdb_print_db *pdb, struct traverse_struct
|
|||||||
print_queue_struct *queue = pts->queue;
|
print_queue_struct *queue = pts->queue;
|
||||||
size_t len;
|
size_t len;
|
||||||
size_t i;
|
size_t i;
|
||||||
uint qcount;
|
unsigned int qcount;
|
||||||
|
|
||||||
if (max_reported_jobs && (max_reported_jobs < pts->qcount))
|
if (max_reported_jobs && (max_reported_jobs < pts->qcount))
|
||||||
pts->qcount = max_reported_jobs;
|
pts->qcount = max_reported_jobs;
|
||||||
|
@ -2405,8 +2405,8 @@ BOOL smb_io_printer_info_3(const char *desc, RPC_BUFFER *buffer, PRINTER_INFO_3
|
|||||||
|
|
||||||
if (MARSHALLING(ps)) {
|
if (MARSHALLING(ps)) {
|
||||||
/* Ensure the SD is 8 byte aligned in the buffer. */
|
/* Ensure the SD is 8 byte aligned in the buffer. */
|
||||||
uint start = prs_offset(ps); /* Remember the start position. */
|
uint32 start = prs_offset(ps); /* Remember the start position. */
|
||||||
uint off_val = 0;
|
uint32 off_val = 0;
|
||||||
|
|
||||||
/* Write a dummy value. */
|
/* Write a dummy value. */
|
||||||
if (!prs_uint32("offset", ps, depth, &off_val))
|
if (!prs_uint32("offset", ps, depth, &off_val))
|
||||||
|
Loading…
Reference in New Issue
Block a user