summaryrefslogtreecommitdiff
path: root/source4/ntvfs/ipc
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2005-02-10 05:09:35 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:09:38 -0500
commite82aad1ce39a6b7a2e51b9e2cb494d74ec70e158 (patch)
treeb66f04c223e55e435b6ba56f4f05d2bf03132a12 /source4/ntvfs/ipc
parente3aae721a7d5c8130448d67feb3a9200e14393ac (diff)
downloadsamba-e82aad1ce39a6b7a2e51b9e2cb494d74ec70e158.tar.gz
samba-e82aad1ce39a6b7a2e51b9e2cb494d74ec70e158.tar.bz2
samba-e82aad1ce39a6b7a2e51b9e2cb494d74ec70e158.zip
r5298: - got rid of pstring.h from includes.h. This at least makes it a bit
less likely that anyone will use pstring for new code - got rid of winbind_client.h from includes.h. This one triggered a huge change, as winbind_client.h was including system/filesys.h and defining the old uint32 and uint16 types, as well as its own pstring and fstring. (This used to be commit 9db6c79e902ec538108d6b7d3324039aabe1704f)
Diffstat (limited to 'source4/ntvfs/ipc')
-rw-r--r--source4/ntvfs/ipc/ipc_rap.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/source4/ntvfs/ipc/ipc_rap.c b/source4/ntvfs/ipc/ipc_rap.c
index 7ee7d26e35..d93b67b715 100644
--- a/source4/ntvfs/ipc/ipc_rap.c
+++ b/source4/ntvfs/ipc/ipc_rap.c
@@ -53,14 +53,14 @@ static void rap_heap_restore(struct rap_string_heap *heap,
struct rap_call {
TALLOC_CTX *mem_ctx;
- uint16 callno;
+ uint16_t callno;
const char *paramdesc;
const char *datadesc;
- uint16 status;
- uint16 convert;
+ uint16_t status;
+ uint16_t convert;
- uint16 rcv_paramlen, rcv_datalen;
+ uint16_t rcv_paramlen, rcv_datalen;
struct ndr_push *ndr_push_param;
struct ndr_push *ndr_push_data;
@@ -104,7 +104,7 @@ static struct rap_call *new_rap_srv_call(TALLOC_CTX *mem_ctx,
return call;
}
-static NTSTATUS rap_srv_pull_word(struct rap_call *call, uint16 *result)
+static NTSTATUS rap_srv_pull_word(struct rap_call *call, uint16_t *result)
{
if (*call->paramdesc++ != 'W')
return NT_STATUS_INVALID_PARAMETER;
@@ -112,7 +112,7 @@ static NTSTATUS rap_srv_pull_word(struct rap_call *call, uint16 *result)
return ndr_pull_uint16(call->ndr_pull_param, NDR_SCALARS, result);
}
-static NTSTATUS rap_srv_pull_dword(struct rap_call *call, uint32 *result)
+static NTSTATUS rap_srv_pull_dword(struct rap_call *call, uint32_t *result)
{
if (*call->paramdesc++ != 'D')
return NT_STATUS_INVALID_PARAMETER;
@@ -135,7 +135,7 @@ static NTSTATUS rap_srv_pull_string(struct rap_call *call, const char **result)
return ndr_pull_string(call->ndr_pull_param, NDR_SCALARS, result);
}
-static NTSTATUS rap_srv_pull_bufsize(struct rap_call *call, uint16 *bufsize)
+static NTSTATUS rap_srv_pull_bufsize(struct rap_call *call, uint16_t *bufsize)
{
NTSTATUS result;