s3: Remove some pointless wrapper functions

diff --git a/source3/include/proto.h b/source3/include/proto.h
index 5d6d782e25e6e75553fee073394485f2426210db..dbc2d40c70a8648a37f07f71c6a61e07aae46b22 100644 (file)
--- 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 bb75f1f70db1b2377cb47efb3eb2c2401d0fbe46..71d6587199f811a7d461e5fc404b1607fcbb5897 100644 (file)
--- 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 28dcc0280a839f693b4c981ef97ea8a9eafdac18..2067b79c52762b3c076dd7d5c85bfe66929a4580 100644 (file)
--- 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)) {