svn commit: samba r25399 - in branches: SAMBA_3_2/source/include
SAMBA_3_2/source/modules SAMBA_3_2/source/printing
SAMBA_3_2/source/rpc_parse SAMBA_3_2_0/source/include
SAMBA_3_2_0/source/modules SAMBA_3_2_0/source/printing
SAMBA_3_2_0/source/rpc_parse
jra at samba.org
jra at samba.org
Fri Sep 28 01:32:11 GMT 2007
Author: jra
Date: 2007-09-28 01:32:08 +0000 (Fri, 28 Sep 2007)
New Revision: 25399
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=25399
Log:
Excise uint - > uint32 (where appropriate) or unsigned int.
Jeremy.
Modified:
branches/SAMBA_3_2/source/include/vfs.h
branches/SAMBA_3_2/source/modules/vfs_aixacl.c
branches/SAMBA_3_2/source/modules/vfs_aixacl_util.c
branches/SAMBA_3_2/source/modules/vfs_full_audit.c
branches/SAMBA_3_2/source/printing/printing.c
branches/SAMBA_3_2/source/rpc_parse/parse_spoolss.c
branches/SAMBA_3_2_0/source/include/vfs.h
branches/SAMBA_3_2_0/source/modules/vfs_aixacl.c
branches/SAMBA_3_2_0/source/modules/vfs_aixacl_util.c
branches/SAMBA_3_2_0/source/modules/vfs_full_audit.c
branches/SAMBA_3_2_0/source/printing/printing.c
branches/SAMBA_3_2_0/source/rpc_parse/parse_spoolss.c
Changeset:
Modified: branches/SAMBA_3_2/source/include/vfs.h
===================================================================
--- branches/SAMBA_3_2/source/include/vfs.h 2007-09-28 01:17:46 UTC (rev 25398)
+++ branches/SAMBA_3_2/source/include/vfs.h 2007-09-28 01:32:08 UTC (rev 25399)
@@ -296,7 +296,7 @@
void *private_data,
struct notify_event *ev),
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);
/* NT ACL operations. */
Modified: branches/SAMBA_3_2/source/modules/vfs_aixacl.c
===================================================================
--- branches/SAMBA_3_2/source/modules/vfs_aixacl.c 2007-09-28 01:17:46 UTC (rev 25398)
+++ branches/SAMBA_3_2/source/modules/vfs_aixacl.c 2007-09-28 01:32:08 UTC (rev 25399)
@@ -137,7 +137,7 @@
SMB_ACL_T theacl)
{
struct acl *file_acl = NULL;
- uint rc;
+ unsigned int rc;
file_acl = aixacl_smb_to_aixacl(type, theacl);
if (!file_acl)
@@ -157,7 +157,7 @@
int fd, SMB_ACL_T theacl)
{
struct acl *file_acl = NULL;
- uint rc;
+ unsigned int rc;
file_acl = aixacl_smb_to_aixacl(SMB_ACL_TYPE_ACCESS, theacl);
if (!file_acl)
Modified: branches/SAMBA_3_2/source/modules/vfs_aixacl_util.c
===================================================================
--- branches/SAMBA_3_2/source/modules/vfs_aixacl_util.c 2007-09-28 01:17:46 UTC (rev 25398)
+++ branches/SAMBA_3_2/source/modules/vfs_aixacl_util.c 2007-09-28 01:32:08 UTC (rev 25399)
@@ -209,9 +209,9 @@
struct acl *file_acl_temp = NULL;
struct acl_entry *acl_entry = NULL;
struct ace_id *ace_id = NULL;
- uint id_type;
- uint user_id;
- uint acl_length;
+ unsigned int id_type;
+ unsigned int user_id;
+ unsigned int acl_length;
int i;
DEBUG(10,("Entering aixacl_smb_to_aixacl\n"));
Modified: branches/SAMBA_3_2/source/modules/vfs_full_audit.c
===================================================================
--- branches/SAMBA_3_2/source/modules/vfs_full_audit.c 2007-09-28 01:17:46 UTC (rev 25398)
+++ branches/SAMBA_3_2/source/modules/vfs_full_audit.c 2007-09-28 01:32:08 UTC (rev 25399)
@@ -183,7 +183,7 @@
struct notify_event *ev),
void *private_data, void *handle_p);
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,
SMB_DEV_T dev, SMB_INO_T inode);
static size_t smb_full_audit_fget_nt_acl(vfs_handle_struct *handle, files_struct *fsp,
@@ -1460,7 +1460,7 @@
}
static int smb_full_audit_chflags(vfs_handle_struct *handle,
- const char *path, uint flags)
+ const char *path, unsigned int flags)
{
int result;
Modified: branches/SAMBA_3_2/source/printing/printing.c
===================================================================
--- branches/SAMBA_3_2/source/printing/printing.c 2007-09-28 01:17:46 UTC (rev 25398)
+++ branches/SAMBA_3_2/source/printing/printing.c 2007-09-28 01:32:08 UTC (rev 25399)
@@ -957,7 +957,7 @@
print_queue_struct *queue = pts->queue;
size_t len;
size_t i;
- uint qcount;
+ unsigned int qcount;
if (max_reported_jobs && (max_reported_jobs < pts->qcount))
pts->qcount = max_reported_jobs;
Modified: branches/SAMBA_3_2/source/rpc_parse/parse_spoolss.c
===================================================================
--- branches/SAMBA_3_2/source/rpc_parse/parse_spoolss.c 2007-09-28 01:17:46 UTC (rev 25398)
+++ branches/SAMBA_3_2/source/rpc_parse/parse_spoolss.c 2007-09-28 01:32:08 UTC (rev 25399)
@@ -2405,8 +2405,8 @@
if (MARSHALLING(ps)) {
/* Ensure the SD is 8 byte aligned in the buffer. */
- uint start = prs_offset(ps); /* Remember the start position. */
- uint off_val = 0;
+ uint32 start = prs_offset(ps); /* Remember the start position. */
+ uint32 off_val = 0;
/* Write a dummy value. */
if (!prs_uint32("offset", ps, depth, &off_val))
Modified: branches/SAMBA_3_2_0/source/include/vfs.h
===================================================================
--- branches/SAMBA_3_2_0/source/include/vfs.h 2007-09-28 01:17:46 UTC (rev 25398)
+++ branches/SAMBA_3_2_0/source/include/vfs.h 2007-09-28 01:32:08 UTC (rev 25399)
@@ -296,7 +296,7 @@
void *private_data,
struct notify_event *ev),
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);
/* NT ACL operations. */
Modified: branches/SAMBA_3_2_0/source/modules/vfs_aixacl.c
===================================================================
--- branches/SAMBA_3_2_0/source/modules/vfs_aixacl.c 2007-09-28 01:17:46 UTC (rev 25398)
+++ branches/SAMBA_3_2_0/source/modules/vfs_aixacl.c 2007-09-28 01:32:08 UTC (rev 25399)
@@ -137,7 +137,7 @@
SMB_ACL_T theacl)
{
struct acl *file_acl = NULL;
- uint rc;
+ unsigned int rc;
file_acl = aixacl_smb_to_aixacl(type, theacl);
if (!file_acl)
@@ -157,7 +157,7 @@
int fd, SMB_ACL_T theacl)
{
struct acl *file_acl = NULL;
- uint rc;
+ unsigned int rc;
file_acl = aixacl_smb_to_aixacl(SMB_ACL_TYPE_ACCESS, theacl);
if (!file_acl)
Modified: branches/SAMBA_3_2_0/source/modules/vfs_aixacl_util.c
===================================================================
--- branches/SAMBA_3_2_0/source/modules/vfs_aixacl_util.c 2007-09-28 01:17:46 UTC (rev 25398)
+++ branches/SAMBA_3_2_0/source/modules/vfs_aixacl_util.c 2007-09-28 01:32:08 UTC (rev 25399)
@@ -209,9 +209,9 @@
struct acl *file_acl_temp = NULL;
struct acl_entry *acl_entry = NULL;
struct ace_id *ace_id = NULL;
- uint id_type;
- uint user_id;
- uint acl_length;
+ unsigned int id_type;
+ unsigned int user_id;
+ unsigned int acl_length;
int i;
DEBUG(10,("Entering aixacl_smb_to_aixacl\n"));
Modified: branches/SAMBA_3_2_0/source/modules/vfs_full_audit.c
===================================================================
--- branches/SAMBA_3_2_0/source/modules/vfs_full_audit.c 2007-09-28 01:17:46 UTC (rev 25398)
+++ branches/SAMBA_3_2_0/source/modules/vfs_full_audit.c 2007-09-28 01:32:08 UTC (rev 25399)
@@ -183,7 +183,7 @@
struct notify_event *ev),
void *private_data, void *handle_p);
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,
SMB_DEV_T dev, SMB_INO_T inode);
static size_t smb_full_audit_fget_nt_acl(vfs_handle_struct *handle, files_struct *fsp,
@@ -1460,7 +1460,7 @@
}
static int smb_full_audit_chflags(vfs_handle_struct *handle,
- const char *path, uint flags)
+ const char *path, unsigned int flags)
{
int result;
Modified: branches/SAMBA_3_2_0/source/printing/printing.c
===================================================================
--- branches/SAMBA_3_2_0/source/printing/printing.c 2007-09-28 01:17:46 UTC (rev 25398)
+++ branches/SAMBA_3_2_0/source/printing/printing.c 2007-09-28 01:32:08 UTC (rev 25399)
@@ -957,7 +957,7 @@
print_queue_struct *queue = pts->queue;
size_t len;
size_t i;
- uint qcount;
+ unsigned int qcount;
if (max_reported_jobs && (max_reported_jobs < pts->qcount))
pts->qcount = max_reported_jobs;
Modified: branches/SAMBA_3_2_0/source/rpc_parse/parse_spoolss.c
===================================================================
--- branches/SAMBA_3_2_0/source/rpc_parse/parse_spoolss.c 2007-09-28 01:17:46 UTC (rev 25398)
+++ branches/SAMBA_3_2_0/source/rpc_parse/parse_spoolss.c 2007-09-28 01:32:08 UTC (rev 25399)
@@ -2405,8 +2405,8 @@
if (MARSHALLING(ps)) {
/* Ensure the SD is 8 byte aligned in the buffer. */
- uint start = prs_offset(ps); /* Remember the start position. */
- uint off_val = 0;
+ uint32 start = prs_offset(ps); /* Remember the start position. */
+ uint32 off_val = 0;
/* Write a dummy value. */
if (!prs_uint32("offset", ps, depth, &off_val))
More information about the samba-cvs
mailing list