diff options
author | Richard Sharpe <rsharpe@samba.org> | 2015-05-13 17:26:01 -0700 |
---|---|---|
committer | Jeremy Allison <jra@samba.org> | 2015-05-14 22:16:56 +0200 |
commit | 57568f1900152c4cb381e151049414086bada14b (patch) | |
tree | dd8fce80c579dd5314863cf3e55dd5a60108f862 /source3/registry | |
parent | 059a6e00251acc29dbb4efce3bbea231ba5ba153 (diff) | |
download | samba-57568f1900152c4cb381e151049414086bada14b.tar.gz |
Convert all uint32/16/8 to _t in a grab-bag of remaining files.
I still need to fix the rpc stuff, but we are almost there.
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): Thu May 14 22:16:56 CEST 2015 on sn-devel-104
Diffstat (limited to 'source3/registry')
-rw-r--r-- | source3/registry/reg_parse_prs.c | 2 | ||||
-rw-r--r-- | source3/registry/reg_parse_prs.h | 2 | ||||
-rw-r--r-- | source3/registry/regfio.c | 16 |
3 files changed, 10 insertions, 10 deletions
diff --git a/source3/registry/reg_parse_prs.c b/source3/registry/reg_parse_prs.c index 57038dfa61b..834ba188669 100644 --- a/source3/registry/reg_parse_prs.c +++ b/source3/registry/reg_parse_prs.c @@ -333,7 +333,7 @@ void prs_switch_type(prs_struct *ps, bool io) Stream a uint16. ********************************************************************/ -bool prs_uint16(const char *name, prs_struct *ps, int depth, uint16 *data16) +bool prs_uint16(const char *name, prs_struct *ps, int depth, uint16_t *data16) { char *q = prs_mem_get(ps, sizeof(uint16_t)); if (q == NULL) diff --git a/source3/registry/reg_parse_prs.h b/source3/registry/reg_parse_prs.h index 9793fd39687..1bbbabd31a2 100644 --- a/source3/registry/reg_parse_prs.h +++ b/source3/registry/reg_parse_prs.h @@ -72,7 +72,7 @@ bool prs_align(prs_struct *ps); bool prs_align_uint64(prs_struct *ps); 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 *data16); +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_uint8s(bool charmode, const char *name, prs_struct *ps, int depth, uint8_t *data8s, int len); diff --git a/source3/registry/regfio.c b/source3/registry/regfio.c index 1493b6c94ab..5de2901946c 100644 --- a/source3/registry/regfio.c +++ b/source3/registry/regfio.c @@ -246,7 +246,7 @@ static bool prs_regf_block( const char *desc, prs_struct *ps, int depth, REGF_FI prs_debug(ps, depth, desc, "prs_regf_block"); depth++; - if ( !prs_uint8s( True, "header", ps, depth, (uint8*)file->header, sizeof( file->header )) ) + if ( !prs_uint8s( True, "header", ps, depth, (uint8_t *)file->header, sizeof( file->header )) ) return False; /* yes, these values are always identical so store them only once */ @@ -308,7 +308,7 @@ static bool prs_hbin_block( const char *desc, prs_struct *ps, int depth, REGF_HB prs_debug(ps, depth, desc, "prs_regf_block"); depth++; - if ( !prs_uint8s( True, "header", ps, depth, (uint8*)hbin->header, sizeof( hbin->header )) ) + if ( !prs_uint8s( True, "header", ps, depth, (uint8_t*)hbin->header, sizeof( hbin->header )) ) return False; if ( !prs_uint32( "first_hbin_off", ps, depth, &hbin->first_hbin_off )) @@ -357,7 +357,7 @@ static bool prs_nk_rec( const char *desc, prs_struct *ps, int depth, REGF_NK_REC if ( !prs_uint32( "rec_size", ps, depth, &nk->rec_size )) return False; - if ( !prs_uint8s( True, "header", ps, depth, (uint8*)nk->header, sizeof( nk->header )) ) + if ( !prs_uint8s( True, "header", ps, depth, (uint8_t *)nk->header, sizeof( nk->header )) ) return False; if ( !prs_uint16( "key_type", ps, depth, &nk->key_type )) @@ -418,7 +418,7 @@ static bool prs_nk_rec( const char *desc, prs_struct *ps, int depth, REGF_NK_REC return False; } - if ( !prs_uint8s( True, "name", ps, depth, (uint8*)nk->keyname, name_length) ) + if ( !prs_uint8s( True, "name", ps, depth, (uint8_t *)nk->keyname, name_length) ) return False; if ( UNMARSHALLING(ps) ) @@ -682,7 +682,7 @@ static bool hbin_prs_lf_records( const char *desc, REGF_HBIN *hbin, int depth, R if ( !prs_uint32( "rec_size", &hbin->ps, depth, &lf->rec_size )) return False; - if ( !prs_uint8s( True, "header", &hbin->ps, depth, (uint8*)lf->header, sizeof( lf->header )) ) + if ( !prs_uint8s( True, "header", &hbin->ps, depth, (uint8_t *)lf->header, sizeof( lf->header )) ) return False; if ( !prs_uint16( "num_keys", &hbin->ps, depth, &lf->num_keys)) @@ -740,7 +740,7 @@ static bool hbin_prs_sk_rec( const char *desc, REGF_HBIN *hbin, int depth, REGF_ if ( !prs_uint32( "rec_size", &hbin->ps, depth, &sk->rec_size )) return False; - if ( !prs_uint8s( True, "header", ps, depth, (uint8*)sk->header, sizeof( sk->header )) ) + if ( !prs_uint8s( True, "header", ps, depth, (uint8_t *)sk->header, sizeof( sk->header )) ) return False; if ( !prs_uint16( "tag", ps, depth, &tag)) return False; @@ -816,7 +816,7 @@ static bool hbin_prs_vk_rec( const char *desc, REGF_HBIN *hbin, int depth, REGF_ if ( !prs_uint32( "rec_size", &hbin->ps, depth, &vk->rec_size )) return False; - if ( !prs_uint8s( True, "header", ps, depth, (uint8*)vk->header, sizeof( vk->header )) ) + if ( !prs_uint8s( True, "header", ps, depth, (uint8_t *)vk->header, sizeof( vk->header )) ) return False; if ( MARSHALLING(&hbin->ps) ) @@ -845,7 +845,7 @@ static bool hbin_prs_vk_rec( const char *desc, REGF_HBIN *hbin, int depth, REGF_ if ( !(vk->valuename = PRS_ALLOC_MEM( ps, char, name_length+1 ))) return False; } - if ( !prs_uint8s( True, "name", ps, depth, (uint8*)vk->valuename, name_length ) ) + if ( !prs_uint8s( True, "name", ps, depth, (uint8_t *)vk->valuename, name_length ) ) return False; } |