Convert uint64 to uint64_t

We seemed to have very few uses of that.

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

diff --git a/source3/libnet/libnet_samsync_display.c b/source3/libnet/libnet_samsync_display.c
index d503ffb4283e30e4458288025e917f26cbf2a5f8..034a23fe227e340e7cbb1eba998bc59ef65a899f 100644 (file)
--- a/source3/libnet/libnet_samsync_display.c
+++ b/source3/libnet/libnet_samsync_display.c
@@ -98,7 +98,7 @@ static void display_domain_info(struct netr_DELTA_DOMAIN *r)
                        nt_errstr(status));
        }
 
-       u_logout = uint64s_nt_time_to_unix_abs((const uint64 *)&r->force_logoff_time);
+       u_logout = uint64s_nt_time_to_unix_abs((const uint64_t *)&r->force_logoff_time);
 
        d_printf("Domain name: %s\n", r->domain_name.string);
 

diff --git a/source3/libnet/libnet_samsync_passdb.c b/source3/libnet/libnet_samsync_passdb.c
index cb057a97f252be5fbd4a2590ad6889b6748e4ce9..cf5bef18675058eed6fd20ee2f174aaa84b839e9 100644 (file)
--- a/source3/libnet/libnet_samsync_passdb.c
+++ b/source3/libnet/libnet_samsync_passdb.c
@@ -689,9 +689,9 @@ static NTSTATUS fetch_domain_info(TALLOC_CTX *mem_ctx,
                        nt_errstr(status));
        }
 
-       u_max_age = uint64s_nt_time_to_unix_abs((uint64 *)&r->max_password_age);
-       u_min_age = uint64s_nt_time_to_unix_abs((uint64 *)&r->min_password_age);
-       u_logout = uint64s_nt_time_to_unix_abs((uint64 *)&r->force_logoff_time);
+       u_max_age = uint64s_nt_time_to_unix_abs((uint64_t *)&r->max_password_age);
+       u_min_age = uint64s_nt_time_to_unix_abs((uint64_t *)&r->min_password_age);
+       u_logout = uint64s_nt_time_to_unix_abs((uint64_t *)&r->force_logoff_time);
 
        domname = r->domain_name.string;
        if (!domname) {

diff --git a/source3/locking/locking.c b/source3/locking/locking.c
index 9dce85a1a541f992749aebdca60620a96fa1aea1..7b8bc8425fa9557d81ee3e119b239391753db3c8 100644 (file)
--- a/source3/locking/locking.c
+++ b/source3/locking/locking.c
@@ -345,7 +345,7 @@ NTSTATUS do_unlock(struct messaging_context *msg_ctx,
 ****************************************************************************/
 
 NTSTATUS do_lock_cancel(files_struct *fsp,
-                       uint64 smblctx,
+                       uint64_t smblctx,
                        uint64_t count,
                        uint64_t offset,
                        enum brl_flavour lock_flav)

diff --git a/source3/locking/proto.h b/source3/locking/proto.h
index 75faa94e09ed9f7c7067489ada99f10389dc275e..652ec2a4c66e12c69abb62eccfdfe7b7302fc7c4 100644 (file)
--- a/source3/locking/proto.h
+++ b/source3/locking/proto.h
@@ -132,7 +132,7 @@ NTSTATUS do_unlock(struct messaging_context *msg_ctx,
                        uint64_t offset,
                        enum brl_flavour lock_flav);
 NTSTATUS do_lock_cancel(files_struct *fsp,
-                       uint64 smblctx,
+                       uint64_t smblctx,
                        uint64_t count,
                        uint64_t offset,
                        enum brl_flavour lock_flav);

diff --git a/source3/registry/reg_parse_prs.c b/source3/registry/reg_parse_prs.c
index 834ba188669f8cb89e4776bf0475e8aff1916b63..feec7cb2e48579fd25ea7c8288015afb0e7b5b92 100644 (file)
--- a/source3/registry/reg_parse_prs.c
+++ b/source3/registry/reg_parse_prs.c
@@ -390,7 +390,7 @@ bool prs_uint32(const char *name, prs_struct *ps, int depth, uint32_t *data32)
 /*******************************************************************
  Stream a uint64_struct
  ********************************************************************/
-bool prs_uint64(const char *name, prs_struct *ps, int depth, uint64 *data64)
+bool prs_uint64(const char *name, prs_struct *ps, int depth, uint64_t *data64)
 {
        if (UNMARSHALLING(ps)) {
                uint32_t high, low;

diff --git a/source3/registry/reg_parse_prs.h b/source3/registry/reg_parse_prs.h
index 1bbbabd31a2e93094bc5cf3424b484785e9282a6..ee65f51ab91196cbf701d332286d0d99d0968906 100644 (file)
--- a/source3/registry/reg_parse_prs.h
+++ b/source3/registry/reg_parse_prs.h
@@ -74,7 +74,7 @@ char *prs_mem_get(prs_struct *ps, uint32_t extra_size);
 void prs_switch_type(prs_struct *ps, bool io);
 bool prs_uint16(const char *name, prs_struct *ps, int depth, uint16_t *data16);
 bool prs_uint32(const char *name, prs_struct *ps, int depth, uint32_t *data32);
-bool prs_uint64(const char *name, prs_struct *ps, int depth, uint64 *data64);
+bool prs_uint64(const char *name, prs_struct *ps, int depth, uint64_t *data64);
 bool prs_uint8s(bool charmode, const char *name, prs_struct *ps, int depth, uint8_t *data8s, int len);
 
 #endif

diff --git a/source3/winbindd/winbindd_cache.c b/source3/winbindd/winbindd_cache.c
index ea30945cf5e511ffeae9fd971dd7e93cf39ad4ae..9f6a390331f17413944a07e610006ace676a99b4 100644 (file)
--- a/source3/winbindd/winbindd_cache.c
+++ b/source3/winbindd/winbindd_cache.c
@@ -281,7 +281,7 @@ static NTTIME centry_nttime(struct cache_entry *centry)
        }
        ret = IVAL(centry->data, centry->ofs);
        centry->ofs += 4;
-       ret += (uint64)IVAL(centry->data, centry->ofs) << 32;
+       ret += (uint64_t)IVAL(centry->data, centry->ofs) << 32;
        centry->ofs += 4;
        return ret;
 }