r889: convert samba4 to use [u]int16_t instead of [u]int16

metze
(This used to be commit af6f1f8a01bebbecd99bc8c066519e89966e65e3)

6 files changed, 27 insertions, 27 deletions

diff --git a/source4/torture/rpc/dfs.c b/source4/torture/rpc/dfs.c
index 3aa17b6ecc..30c352680a 100644
--- a/source4/torture/rpc/dfs.c
+++ b/source4/torture/rpc/dfs.c
@@ -39,7 +39,7 @@ static BOOL test_Exist(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx)
 	return True;
 }
 
-static BOOL test_InfoLevel(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, uint16 level,
+static BOOL test_InfoLevel(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, uint16_t level,
 			   const char *root)
 {
 	NTSTATUS status;
@@ -64,7 +64,7 @@ static BOOL test_InfoLevel(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, uint16 le
 static BOOL test_Info(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, const char *root)
 {
 	BOOL ret = True;
-	uint16 levels[] = {1, 2, 3, 4, 100, 101, 102, 200, 300};
+	uint16_t levels[] = {1, 2, 3, 4, 100, 101, 102, 200, 300};
 	int i;
 	for (i=0;i<ARRAY_SIZE(levels);i++) {
 		if (!test_InfoLevel(p, mem_ctx, levels[i], root)) {
@@ -74,7 +74,7 @@ static BOOL test_Info(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, const char *ro
 	return ret;
 }
 
-static BOOL test_EnumLevel(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, uint16 level)
+static BOOL test_EnumLevel(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, uint16_t level)
 {
 	NTSTATUS status;
 	struct dfs_Enum r;
@@ -120,7 +120,7 @@ static BOOL test_EnumLevel(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, uint16 le
 static BOOL test_Enum(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx)
 {
 	BOOL ret = True;
-	uint16 levels[] = {1, 2, 3, 4, 200, 300};
+	uint16_t levels[] = {1, 2, 3, 4, 200, 300};
 	int i;
 	for (i=0;i<ARRAY_SIZE(levels);i++) {
 		if (!test_EnumLevel(p, mem_ctx, levels[i])) {
diff --git a/source4/torture/rpc/lsa.c b/source4/torture/rpc/lsa.c
index f3e1c04d29..306197dcf2 100644
--- a/source4/torture/rpc/lsa.c
+++ b/source4/torture/rpc/lsa.c
@@ -33,7 +33,7 @@ static BOOL test_OpenPolicy(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx)
 	struct lsa_QosInfo qos;
 	struct lsa_OpenPolicy r;
 	NTSTATUS status;
-	uint16 system_name = '\\';
+	uint16_t system_name = '\\';
 
 	printf("\ntesting OpenPolicy\n");
 
diff --git a/source4/torture/rpc/samr.c b/source4/torture/rpc/samr.c
index 4b65cc75f9..cce650983a 100644
--- a/source4/torture/rpc/samr.c
+++ b/source4/torture/rpc/samr.c
@@ -532,7 +532,7 @@ static BOOL test_SetAliasInfo(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
 	NTSTATUS status;
 	struct samr_SetAliasInfo r;
 	struct samr_QueryAliasInfo q;
-	uint16 levels[] = {2, 3};
+	uint16_t levels[] = {2, 3};
 	int i;
 	BOOL ret = True;
 
@@ -1538,7 +1538,7 @@ static BOOL test_QueryAliasInfo(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
 {
 	NTSTATUS status;
 	struct samr_QueryAliasInfo r;
-	uint16 levels[] = {1, 2, 3};
+	uint16_t levels[] = {1, 2, 3};
 	int i;
 	BOOL ret = True;
 
@@ -1564,7 +1564,7 @@ static BOOL test_QueryGroupInfo(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
 {
 	NTSTATUS status;
 	struct samr_QueryGroupInfo r;
-	uint16 levels[] = {1, 2, 3, 4};
+	uint16_t levels[] = {1, 2, 3, 4};
 	int i;
 	BOOL ret = True;
 
@@ -1592,8 +1592,8 @@ static BOOL test_SetGroupInfo(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
 	NTSTATUS status;
 	struct samr_QueryGroupInfo r;
 	struct samr_SetGroupInfo s;
-	uint16 levels[] = {1, 2, 3, 4};
-	uint16 set_ok[] = {0, 1, 1, 1};
+	uint16_t levels[] = {1, 2, 3, 4};
+	uint16_t set_ok[] = {0, 1, 1, 1};
 	int i;
 	BOOL ret = True;
 
@@ -1650,7 +1650,7 @@ static BOOL test_QueryUserInfo(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
 {
 	NTSTATUS status;
 	struct samr_QueryUserInfo r;
-	uint16 levels[] = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10,
+	uint16_t levels[] = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10,
 			   11, 12, 13, 14, 16, 17, 20, 21};
 	int i;
 	BOOL ret = True;
@@ -1677,7 +1677,7 @@ static BOOL test_QueryUserInfo2(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
 {
 	NTSTATUS status;
 	struct samr_QueryUserInfo2 r;
-	uint16 levels[] = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10,
+	uint16_t levels[] = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10,
 			   11, 12, 13, 14, 16, 17, 20, 21};
 	int i;
 	BOOL ret = True;
@@ -1968,8 +1968,8 @@ static BOOL test_GetDisplayEnumerationIndex(struct dcerpc_pipe *p, TALLOC_CTX *m
 	NTSTATUS status;
 	struct samr_GetDisplayEnumerationIndex r;
 	BOOL ret = True;
-	uint16 levels[] = {1, 2, 3, 4, 5};
-	uint16 ok_lvl[] = {1, 1, 1, 0, 0};
+	uint16_t levels[] = {1, 2, 3, 4, 5};
+	uint16_t ok_lvl[] = {1, 1, 1, 0, 0};
 	int i;
 
 	for (i=0;i<ARRAY_SIZE(levels);i++) {
@@ -2009,8 +2009,8 @@ static BOOL test_GetDisplayEnumerationIndex2(struct dcerpc_pipe *p, TALLOC_CTX *
 	NTSTATUS status;
 	struct samr_GetDisplayEnumerationIndex2 r;
 	BOOL ret = True;
-	uint16 levels[] = {1, 2, 3, 4, 5};
-	uint16 ok_lvl[] = {1, 1, 1, 0, 0};
+	uint16_t levels[] = {1, 2, 3, 4, 5};
+	uint16_t ok_lvl[] = {1, 1, 1, 0, 0};
 	int i;
 
 	for (i=0;i<ARRAY_SIZE(levels);i++) {
@@ -2048,7 +2048,7 @@ static BOOL test_QueryDisplayInfo(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
 	NTSTATUS status;
 	struct samr_QueryDisplayInfo r;
 	BOOL ret = True;
-	uint16 levels[] = {1, 2, 3, 4, 5};
+	uint16_t levels[] = {1, 2, 3, 4, 5};
 	int i;
 
 	for (i=0;i<ARRAY_SIZE(levels);i++) {
@@ -2077,7 +2077,7 @@ static BOOL test_QueryDisplayInfo2(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
 	NTSTATUS status;
 	struct samr_QueryDisplayInfo2 r;
 	BOOL ret = True;
-	uint16 levels[] = {1, 2, 3, 4, 5};
+	uint16_t levels[] = {1, 2, 3, 4, 5};
 	int i;
 
 	for (i=0;i<ARRAY_SIZE(levels);i++) {
@@ -2106,7 +2106,7 @@ static BOOL test_QueryDisplayInfo3(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
 	NTSTATUS status;
 	struct samr_QueryDisplayInfo3 r;
 	BOOL ret = True;
-	uint16 levels[] = {1, 2, 3, 4, 5};
+	uint16_t levels[] = {1, 2, 3, 4, 5};
 	int i;
 
 	for (i=0;i<ARRAY_SIZE(levels);i++) {
@@ -2135,8 +2135,8 @@ static BOOL test_QueryDomainInfo(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
 	NTSTATUS status;
 	struct samr_QueryDomainInfo r;
 	struct samr_SetDomainInfo s;
-	uint16 levels[] = {1, 2, 3, 4, 5, 6, 7, 8, 9, 11, 12, 13};
-	uint16 set_ok[] = {1, 0, 1, 1, 0, 1, 1, 0, 1,  0,  1,  0};
+	uint16_t levels[] = {1, 2, 3, 4, 5, 6, 7, 8, 9, 11, 12, 13};
+	uint16_t set_ok[] = {1, 0, 1, 1, 0, 1, 1, 0, 1,  0,  1,  0};
 	int i;
 	BOOL ret = True;
 
@@ -2195,7 +2195,7 @@ static BOOL test_QueryDomainInfo2(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
 {
 	NTSTATUS status;
 	struct samr_QueryDomainInfo2 r;
-	uint16 levels[] = {1, 2, 3, 4, 5, 6, 7, 8, 9, 11, 12, 13};
+	uint16_t levels[] = {1, 2, 3, 4, 5, 6, 7, 8, 9, 11, 12, 13};
 	int i;
 	BOOL ret = True;
 
diff --git a/source4/torture/rpc/spoolss.c b/source4/torture/rpc/spoolss.c
index 6e6d325ab0..74860cd369 100644
--- a/source4/torture/rpc/spoolss.c
+++ b/source4/torture/rpc/spoolss.c
@@ -26,7 +26,7 @@ static BOOL test_GetPrinter(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
 {
 	NTSTATUS status;
 	struct spoolss_GetPrinter r;
-	uint16 levels[] = {1, 2, 3, 4, 5, 6, 7};
+	uint16_t levels[] = {1, 2, 3, 4, 5, 6, 7};
 	int i;
 	BOOL ret = True;
 	
@@ -751,7 +751,7 @@ static BOOL test_EnumPrinters(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx)
 {
 	struct spoolss_EnumPrinters r;
 	NTSTATUS status;
-	uint16 levels[] = {1, 2, 4, 5};
+	uint16_t levels[] = {1, 2, 4, 5};
 	int i;
 	BOOL ret = True;
 
@@ -867,7 +867,7 @@ static BOOL test_EnumPrinterDrivers(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx)
 {
 	struct spoolss_EnumPrinterDrivers r;
 	NTSTATUS status;
-	uint16 levels[] = {1, 2, 3};
+	uint16_t levels[] = {1, 2, 3};
 	int i;
 	BOOL ret = True;
 
diff --git a/source4/torture/rpc/winreg.c b/source4/torture/rpc/winreg.c
index 7fa93aa0c9..3a1d7be68b 100644
--- a/source4/torture/rpc/winreg.c
+++ b/source4/torture/rpc/winreg.c
@@ -409,7 +409,7 @@ static BOOL test_AbortSystemShutdown(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx)
 {
 	struct winreg_AbortSystemShutdown r;
 	NTSTATUS status;
-	uint16 server = 0x0;
+	uint16_t server = 0x0;
 
 	r.in.server = &server;
 	
diff --git a/source4/torture/rpc/wkssvc.c b/source4/torture/rpc/wkssvc.c
index b1dc2edfcf..4768163d5c 100644
--- a/source4/torture/rpc/wkssvc.c
+++ b/source4/torture/rpc/wkssvc.c
@@ -27,7 +27,7 @@ static BOOL test_NetWkstaGetInfo(struct dcerpc_pipe *p,
 {
 	NTSTATUS status;
 	struct wkssvc_NetWkstaGetInfo r;
-	uint16 levels[] = {100, 101, 102, 502};
+	uint16_t levels[] = {100, 101, 102, 502};
 	int i;
 	BOOL ret = True;