1
0
mirror of https://github.com/samba-team/samba.git synced 2025-03-27 22:50:26 +03:00

Convert the few instances of int32 there were to int32_t.

Signed-off-by: Richard Sharpe <rsharpe@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>

Autobuild-User(master): Jeremy Allison <jra@samba.org>
Autobuild-Date(master): Sat May 16 03:09:12 CEST 2015 on sn-devel-104
This commit is contained in:
Richard Sharpe 2015-05-15 14:56:25 -07:00 committed by Jeremy Allison
parent d1278f081b
commit 12df833563
9 changed files with 17 additions and 17 deletions

View File

@ -139,7 +139,7 @@ static int upgrade_v2_to_v3(struct db_record *rec, void *priv)
bool share_info_db_init(void)
{
const char *vstring = "INFO/version";
int32 vers_id = 0;
int32_t vers_id = 0;
bool upgrade_ok = true;
NTSTATUS status;
char *db_path;

View File

@ -362,7 +362,7 @@ static bool tdbsam_upgrade_next_rid(struct db_context *db)
return true;
}
static bool tdbsam_convert(struct db_context **pp_db, const char *name, int32 from)
static bool tdbsam_convert(struct db_context **pp_db, const char *name, int32_t from)
{
struct tdbsam_convert_state state;
struct db_context *db = NULL;
@ -437,8 +437,8 @@ static bool tdbsam_convert(struct db_context **pp_db, const char *name, int32 fr
static bool tdbsam_open( const char *name )
{
int32 version;
int32 minor_version;
int32_t version;
int32_t minor_version;
NTSTATUS status;
/* check if we are already open */

View File

@ -1545,7 +1545,7 @@ static void print_queue_update_internal(struct tevent_context *ev,
*/
slprintf(keystr, sizeof(keystr)-1, "CACHE/%s", sharename);
tdb_store_int32(pdb->tdb, keystr, (int32)time(NULL));
tdb_store_int32(pdb->tdb, keystr, (int32_t)time(NULL));
/* clear the msg pending record for this queue */

View File

@ -307,7 +307,7 @@ static int package(struct pack_desc *p, ...)
int needed=0, stringneeded;
const char *str=NULL;
int is_string=0, stringused;
int32 temp;
int32_t temp;
va_start(args,p);

View File

@ -7999,7 +7999,7 @@ void reply_lockingX(struct smb_request *req)
unsigned char oplocklevel;
uint16_t num_ulocks;
uint16_t num_locks;
int32 lock_timeout;
int32_t lock_timeout;
int i;
const uint8_t *data;
bool large_file_format;

View File

@ -1068,7 +1068,7 @@ static void call_trans2open(connection_struct *conn,
char *params = *pparams;
char *pdata = *ppdata;
int deny_mode;
int32 open_attr;
int32_t open_attr;
bool oplock_request;
#if 0
bool return_additional_info;

View File

@ -77,7 +77,7 @@ struct tcpdump_file_header {
uint32_t magic;
uint16_t major;
uint16_t minor;
int32 zone;
int32_t zone;
uint32_t sigfigs;
uint32_t snaplen;
uint32_t linktype;

View File

@ -145,7 +145,7 @@ static int convert_fn(struct db_record *rec, void *private_data)
static bool idmap_tdb_upgrade(struct idmap_domain *dom, struct db_context *db)
{
int32 vers;
int32_t vers;
struct convert_fn_state s;
NTSTATUS status;
@ -161,7 +161,7 @@ static bool idmap_tdb_upgrade(struct idmap_domain *dom, struct db_context *db)
* big endian machine and will need byte-reversing.
*/
int32 wm;
int32_t wm;
status = dbwrap_fetch_int32_bystring(db, HWM_USER, &wm);
if (!NT_STATUS_IS_OK(status)) {

View File

@ -3808,13 +3808,13 @@ static int validate_ul(TALLOC_CTX *mem_ctx, const char *keystr, TDB_DATA dbuf,
struct tdb_validation_status *state)
{
struct cache_entry *centry = create_centry_validate(keystr, dbuf, state);
int32 num_entries, i;
int32_t num_entries, i;
if (!centry) {
return 1;
}
num_entries = (int32)centry_uint32(centry);
num_entries = (int32_t)centry_uint32(centry);
for (i=0; i< num_entries; i++) {
struct dom_sid sid;
@ -3839,7 +3839,7 @@ static int validate_gl(TALLOC_CTX *mem_ctx, const char *keystr, TDB_DATA dbuf,
struct tdb_validation_status *state)
{
struct cache_entry *centry = create_centry_validate(keystr, dbuf, state);
int32 num_entries, i;
int32_t num_entries, i;
if (!centry) {
return 1;
@ -3866,7 +3866,7 @@ static int validate_ug(TALLOC_CTX *mem_ctx, const char *keystr, TDB_DATA dbuf,
struct tdb_validation_status *state)
{
struct cache_entry *centry = create_centry_validate(keystr, dbuf, state);
int32 num_groups, i;
int32_t num_groups, i;
if (!centry) {
return 1;
@ -3892,7 +3892,7 @@ static int validate_ua(TALLOC_CTX *mem_ctx, const char *keystr, TDB_DATA dbuf,
struct tdb_validation_status *state)
{
struct cache_entry *centry = create_centry_validate(keystr, dbuf, state);
int32 num_aliases, i;
int32_t num_aliases, i;
if (!centry) {
return 1;
@ -3917,7 +3917,7 @@ static int validate_gm(TALLOC_CTX *mem_ctx, const char *keystr, TDB_DATA dbuf,
struct tdb_validation_status *state)
{
struct cache_entry *centry = create_centry_validate(keystr, dbuf, state);
int32 num_names, i;
int32_t num_names, i;
if (!centry) {
return 1;