summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2010-08-05 13:11:14 +0200
committerVolker Lendecke <vl@samba.org>2010-08-05 13:57:31 +0200
commit1cbe8b85ae155896e8a4ef39f4b129b2f1e6b1d8 (patch)
tree32611760291707d993ed564ecda2475f119bcb9c
parent6cb5a0d097e52577e956d3527b753c1bcf124d9d (diff)
downloadsamba-1cbe8b85ae155896e8a4ef39f4b129b2f1e6b1d8.tar.gz
samba-1cbe8b85ae155896e8a4ef39f4b129b2f1e6b1d8.tar.bz2
samba-1cbe8b85ae155896e8a4ef39f4b129b2f1e6b1d8.zip
s3: Remove some pointless wrapper functions
-rw-r--r--source3/include/proto.h3
-rw-r--r--source3/lib/time.c19
-rw-r--r--source3/libsmb/clifile.c11
3 files changed, 7 insertions, 26 deletions
diff --git a/source3/include/proto.h b/source3/include/proto.h
index 5d6d782e25..dbc2d40c70 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -1105,9 +1105,6 @@ int timespec_compare(const struct timespec *ts1, const struct timespec *ts2);
void round_timespec_to_sec(struct timespec *ts);
void round_timespec_to_usec(struct timespec *ts);
struct timespec interpret_long_date(const char *p);
-void cli_put_dos_date(struct cli_state *cli, char *buf, int offset, time_t unixdate);
-void cli_put_dos_date2(struct cli_state *cli, char *buf, int offset, time_t unixdate);
-void cli_put_dos_date3(struct cli_state *cli, char *buf, int offset, time_t unixdate);
void TimeInit(void);
void get_process_uptime(struct timeval *ret_time);
void get_startup_time(struct timeval *ret_time);
diff --git a/source3/lib/time.c b/source3/lib/time.c
index bb75f1f70d..71d6587199 100644
--- a/source3/lib/time.c
+++ b/source3/lib/time.c
@@ -433,25 +433,6 @@ struct timespec interpret_long_date(const char *p)
return nt_time_to_unix_timespec(&nt);
}
-/***************************************************************************
- Client versions of the above functions.
-***************************************************************************/
-
-void cli_put_dos_date(struct cli_state *cli, char *buf, int offset, time_t unixdate)
-{
- push_dos_date((uint8_t *)buf, offset, unixdate, cli->serverzone);
-}
-
-void cli_put_dos_date2(struct cli_state *cli, char *buf, int offset, time_t unixdate)
-{
- push_dos_date2((uint8_t *)buf, offset, unixdate, cli->serverzone);
-}
-
-void cli_put_dos_date3(struct cli_state *cli, char *buf, int offset, time_t unixdate)
-{
- push_dos_date3((uint8_t *)buf, offset, unixdate, cli->serverzone);
-}
-
/*******************************************************************
Re-read the smb serverzone value.
******************************************************************/
diff --git a/source3/libsmb/clifile.c b/source3/libsmb/clifile.c
index 28dcc0280a..2067b79c52 100644
--- a/source3/libsmb/clifile.c
+++ b/source3/libsmb/clifile.c
@@ -3441,9 +3441,12 @@ struct tevent_req *cli_setattrE_send(TALLOC_CTX *mem_ctx,
}
SSVAL(state->vwv+0, 0, fnum);
- cli_put_dos_date2(cli, (char *)&state->vwv[1], 0, change_time);
- cli_put_dos_date2(cli, (char *)&state->vwv[3], 0, access_time);
- cli_put_dos_date2(cli, (char *)&state->vwv[5], 0, write_time);
+ push_dos_date2((uint8_t *)&state->vwv[1], 0, change_time,
+ cli->serverzone);
+ push_dos_date2((uint8_t *)&state->vwv[3], 0, access_time,
+ cli->serverzone);
+ push_dos_date2((uint8_t *)&state->vwv[5], 0, write_time,
+ cli->serverzone);
subreq = cli_smb_send(state, ev, cli, SMBsetattrE, additional_flags,
7, state->vwv, 0, NULL);
@@ -3554,7 +3557,7 @@ struct tevent_req *cli_setatr_send(TALLOC_CTX *mem_ctx,
}
SSVAL(state->vwv+0, 0, attr);
- cli_put_dos_date3(cli, (char *)&state->vwv[1], 0, mtime);
+ push_dos_date3((uint8_t *)&state->vwv[1], 0, mtime, cli->serverzone);
bytes = talloc_array(state, uint8_t, 1);
if (tevent_req_nomem(bytes, req)) {