The branch, v3-4-test has been updated
via 47c2dc4eee5f7644601db0c24dca0ca30b482940 (commit)
from 7ec7440fc2f78ef49cebdc819ff81db5ce9d143c (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-4-test
- Log -----------------------------------------------------------------
commit 47c2dc4eee5f7644601db0c24dca0ca30b482940
Author: Björn Jacke <[email protected]>
Date: Tue Jul 7 22:11:50 2009 +0200
s3: QNX doesn't know uint - replace with uint_t
(cherry picked from commit a28596964b44f20d794999541d38fe4bae64b56b)
-----------------------------------------------------------------------
Summary of changes:
source3/include/proto.h | 8 ++++----
source3/libsmb/clirap2.c | 8 ++++----
2 files changed, 8 insertions(+), 8 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/include/proto.h b/source3/include/proto.h
index 5873386..802c2ed 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -2732,14 +2732,14 @@ bool cli_ns_check_server_type(struct cli_state *cli,
char *workgroup, uint32 sty
bool cli_NetWkstaUserLogoff(struct cli_state *cli, const char *user, const
char *workstation);
int cli_NetPrintQEnum(struct cli_state *cli,
void (*qfn)(const char*,uint16,uint16,uint16,const char*,const
char*,const char*,const char*,const char*,uint16,uint16),
- void (*jfn)(uint16,const char*,const char*,const char*,const
char*,uint16,uint16,const char*,uint,uint,const char*));
+ void (*jfn)(uint16,const char*,const char*,const char*,const
char*,uint16,uint16,const char*,uint_t,uint_t,const char*));
int cli_NetPrintQGetInfo(struct cli_state *cli, const char *printer,
void (*qfn)(const char*,uint16,uint16,uint16,const char*,const
char*,const char*,const char*,const char*,uint16,uint16),
- void (*jfn)(uint16,const char*,const char*,const char*,const
char*,uint16,uint16,const char*,uint,uint,const char*));
+ void (*jfn)(uint16,const char*,const char*,const char*,const
char*,uint16,uint16,const char*,uint_t,uint_t,const char*));
int cli_RNetServiceEnum(struct cli_state *cli, void (*fn)(const char *, const
char *, void *), void *state);
-int cli_NetSessionEnum(struct cli_state *cli, void (*fn)(char *, char *,
uint16, uint16, uint16, uint, uint, uint, char *));
+int cli_NetSessionEnum(struct cli_state *cli, void (*fn)(char *, char *,
uint16, uint16, uint16, uint_t, uint_t, uint_t, char *));
int cli_NetSessionGetInfo(struct cli_state *cli, const char *workstation,
- void (*fn)(const char *, const char *, uint16, uint16, uint16,
uint, uint, uint, const char *));
+ void (*fn)(const char *, const char *, uint16, uint16, uint16,
uint_t, uint_t, uint_t, const char *));
int cli_NetSessionDel(struct cli_state *cli, const char *workstation);
int cli_NetConnectionEnum(struct cli_state *cli, const char *qualifier,
void (*fn)(uint16_t conid, uint16_t contype,
diff --git a/source3/libsmb/clirap2.c b/source3/libsmb/clirap2.c
index a15fa5f..4fd9dc6 100644
--- a/source3/libsmb/clirap2.c
+++ b/source3/libsmb/clirap2.c
@@ -1899,7 +1899,7 @@ bool cli_NetWkstaUserLogoff(struct cli_state *cli, const
char *user, const char
int cli_NetPrintQEnum(struct cli_state *cli,
void (*qfn)(const char*,uint16,uint16,uint16,const char*,const
char*,const char*,const char*,const char*,uint16,uint16),
- void (*jfn)(uint16,const char*,const char*,const char*,const
char*,uint16,uint16,const char*,uint,uint,const char*))
+ void (*jfn)(uint16,const char*,const char*,const char*,const
char*,uint16,uint16,const char*,uint_t,uint_t,const char*))
{
char param[WORDSIZE /* api number */
+sizeof(RAP_NetPrintQEnum_REQ) /* req string */
@@ -2075,7 +2075,7 @@ int cli_NetPrintQEnum(struct cli_state *cli,
int cli_NetPrintQGetInfo(struct cli_state *cli, const char *printer,
void (*qfn)(const char*,uint16,uint16,uint16,const char*,const
char*,const char*,const char*,const char*,uint16,uint16),
- void (*jfn)(uint16,const char*,const char*,const char*,const
char*,uint16,uint16,const char*,uint,uint,const char*))
+ void (*jfn)(uint16,const char*,const char*,const char*,const
char*,uint16,uint16,const char*,uint_t,uint_t,const char*))
{
char param[WORDSIZE /* api number */
+sizeof(RAP_NetPrintQGetInfo_REQ) /* req string */
@@ -2335,7 +2335,7 @@ int cli_RNetServiceEnum(struct cli_state *cli, void
(*fn)(const char *, const ch
Call a NetSessionEnum - list workstations with sessions to an SMB server.
****************************************************************************/
-int cli_NetSessionEnum(struct cli_state *cli, void (*fn)(char *, char *,
uint16, uint16, uint16, uint, uint, uint, char *))
+int cli_NetSessionEnum(struct cli_state *cli, void (*fn)(char *, char *,
uint16, uint16, uint16, uint_t, uint_t, uint_t, char *))
{
char param[WORDSIZE /* api number */
+sizeof(RAP_NetSessionEnum_REQ) /* parm string */
@@ -2435,7 +2435,7 @@ int cli_NetSessionEnum(struct cli_state *cli, void
(*fn)(char *, char *, uint16,
****************************************************************************/
int cli_NetSessionGetInfo(struct cli_state *cli, const char *workstation,
- void (*fn)(const char *, const char *, uint16, uint16, uint16,
uint, uint, uint, const char *))
+ void (*fn)(const char *, const char *, uint16, uint16, uint16,
uint_t, uint_t, uint_t, const char *))
{
char param[WORDSIZE /* api number */
+sizeof(RAP_NetSessionGetInfo_REQ) /* req string */
--
Samba Shared Repository
