diff options
Diffstat (limited to 'source4/lib/registry')
| -rw-r--r-- | source4/lib/registry/common/reg_util.c | 2 | ||||
| -rw-r--r-- | source4/lib/registry/reg_backend_nt4/reg_backend_nt4.c | 16 | ||||
| -rw-r--r-- | source4/lib/registry/tools/regpatch.c | 4 |
3 files changed, 11 insertions, 11 deletions
diff --git a/source4/lib/registry/common/reg_util.c b/source4/lib/registry/common/reg_util.c index 01d75f1b90..db5e97bf7f 100644 --- a/source4/lib/registry/common/reg_util.c +++ b/source4/lib/registry/common/reg_util.c @@ -55,7 +55,7 @@ char *reg_val_data_string(REG_VAL *v) asciip = ret; for (i=0; i<reg_val_size(v); i++) { int str_rem = reg_val_size(v) * 3 - (asciip - ret); - asciip += snprintf(asciip, str_rem, "%02x", *(unsigned char *)(reg_val_data_blk(v)+i)); + asciip += snprintf(asciip, str_rem, "%02x", *(uint8_t *)(reg_val_data_blk(v)+i)); if (i < reg_val_size(v) && str_rem > 0) *asciip = ' '; asciip++; } diff --git a/source4/lib/registry/reg_backend_nt4/reg_backend_nt4.c b/source4/lib/registry/reg_backend_nt4/reg_backend_nt4.c index 627b5a8f13..fa4b3e4d18 100644 --- a/source4/lib/registry/reg_backend_nt4/reg_backend_nt4.c +++ b/source4/lib/registry/reg_backend_nt4/reg_backend_nt4.c @@ -1268,10 +1268,10 @@ static void *nt_alloc_regf_space(REG_HANDLE *h, int size, unsigned int *off) /* * Store a SID at the location provided */ -static int nt_store_SID(REG_HANDLE *regf, DOM_SID *sid, unsigned char *locn) +static int nt_store_SID(REG_HANDLE *regf, DOM_SID *sid, uint8_t *locn) { int i; - unsigned char *p = locn; + uint8_t *p = locn; if (!regf || !sid || !locn) return 0; @@ -1290,11 +1290,11 @@ static int nt_store_SID(REG_HANDLE *regf, DOM_SID *sid, unsigned char *locn) } -static int nt_store_ace(REG_HANDLE *regf, SEC_ACE *ace, unsigned char *locn) +static int nt_store_ace(REG_HANDLE *regf, SEC_ACE *ace, uint8_t *locn) { int size = 0; SEC_ACE *reg_ace = (SEC_ACE *)locn; - unsigned char *p; + uint8_t *p; if (!regf || !ace || !locn) return 0; @@ -1303,7 +1303,7 @@ static int nt_store_ace(REG_HANDLE *regf, SEC_ACE *ace, unsigned char *locn) /* Deal with the length when we have stored the SID */ - p = (unsigned char *)®_ace->info.mask; + p = (uint8_t *)®_ace->info.mask; SIVAL(p, 0, ace->info.mask); p += 4; @@ -1311,7 +1311,7 @@ static int nt_store_ace(REG_HANDLE *regf, SEC_ACE *ace, unsigned char *locn) size += 8; /* Size of the fixed header */ - p = (unsigned char *)®_ace->size; + p = (uint8_t *)®_ace->size; SSVAL(p, 0, size); @@ -1321,9 +1321,9 @@ static int nt_store_ace(REG_HANDLE *regf, SEC_ACE *ace, unsigned char *locn) /* * Store an ACL at the location provided */ -static int nt_store_acl(REG_HANDLE *regf, SEC_ACL *acl, unsigned char *locn) { +static int nt_store_acl(REG_HANDLE *regf, SEC_ACL *acl, uint8_t *locn) { int size = 0, i; - unsigned char *p = locn, *s; + uint8_t *p = locn, *s; if (!regf || !acl || !locn) return 0; diff --git a/source4/lib/registry/tools/regpatch.c b/source4/lib/registry/tools/regpatch.c index 77c0f710c1..af869d1cfa 100644 --- a/source4/lib/registry/tools/regpatch.c +++ b/source4/lib/registry/tools/regpatch.c @@ -155,7 +155,7 @@ static struct cmd_line *get_cmd_line(int fd) { struct cmd_line *cl = (CMD_LINE *)smb_xmalloc(sizeof(CMD_LINE)); int i = 0, rc; - unsigned char ch; + uint8_t ch; cl->len = INIT_ALLOC; @@ -662,7 +662,7 @@ static CMD_FILE *cmd_file_create(const char *file) * Sec Desc print functions */ -char *str_type(unsigned char type); +char *str_type(uint8_t type); static int nt_apply_reg_command_file(REG_HANDLE *r, const char *cmd_file_name) { |