diff options
author | Volker Lendecke <vl@samba.org> | 2010-02-07 12:01:36 +0100 |
---|---|---|
committer | Volker Lendecke <vl@samba.org> | 2010-02-07 12:29:25 +0100 |
commit | c73ffb728099e453110ffeb0e665811b9fcec34d (patch) | |
tree | b381b621fbaf87247fed28e3dc16fbe69ec82da2 | |
parent | ff2d7d9b82a2c03cf193ed346198d396525063bc (diff) | |
download | samba-c73ffb728099e453110ffeb0e665811b9fcec34d.tar.gz samba-c73ffb728099e453110ffeb0e665811b9fcec34d.tar.bz2 samba-c73ffb728099e453110ffeb0e665811b9fcec34d.zip |
s3: Remove some unused code
-rw-r--r-- | source3/include/proto.h | 1 | ||||
-rw-r--r-- | source3/libsmb/clifsinfo.c | 57 |
2 files changed, 0 insertions, 58 deletions
diff --git a/source3/include/proto.h b/source3/include/proto.h index 177c3334d9..0660e77c73 100644 --- a/source3/include/proto.h +++ b/source3/include/proto.h @@ -2708,7 +2708,6 @@ struct tevent_req *cli_get_fs_attr_info_send(TALLOC_CTX *mem_ctx, struct cli_state *cli); NTSTATUS cli_get_fs_attr_info_recv(struct tevent_req *req, uint32_t *fs_attr); NTSTATUS cli_get_fs_attr_info(struct cli_state *cli, uint32_t *fs_attr); -bool cli_get_fs_volume_info_old(struct cli_state *cli, fstring volume_name, uint32 *pserial_number); bool cli_get_fs_volume_info(struct cli_state *cli, fstring volume_name, uint32 *pserial_number, time_t *pdate); bool cli_get_fs_full_size_info(struct cli_state *cli, uint64_t *total_allocation_units, diff --git a/source3/libsmb/clifsinfo.c b/source3/libsmb/clifsinfo.c index 48c378259d..08c0252eb8 100644 --- a/source3/libsmb/clifsinfo.c +++ b/source3/libsmb/clifsinfo.c @@ -348,63 +348,6 @@ fail: return status; } -bool cli_get_fs_volume_info_old(struct cli_state *cli, fstring volume_name, uint32 *pserial_number) -{ - bool ret = False; - uint16 setup; - char param[2]; - char *rparam=NULL, *rdata=NULL; - unsigned int rparam_count=0, rdata_count=0; - unsigned char nlen; - - setup = TRANSACT2_QFSINFO; - - SSVAL(param,0,SMB_INFO_VOLUME); - - if (!cli_send_trans(cli, SMBtrans2, - NULL, - 0, 0, - &setup, 1, 0, - param, 2, 0, - NULL, 0, 560)) { - goto cleanup; - } - - if (!cli_receive_trans(cli, SMBtrans2, - &rparam, &rparam_count, - &rdata, &rdata_count)) { - goto cleanup; - } - - if (cli_is_error(cli)) { - ret = False; - goto cleanup; - } else { - ret = True; - } - - if (rdata_count < 5) { - goto cleanup; - } - - if (pserial_number) { - *pserial_number = IVAL(rdata,0); - } - nlen = CVAL(rdata,l2_vol_cch); - clistr_pull(cli->inbuf, volume_name, rdata + l2_vol_szVolLabel, - sizeof(fstring), nlen, STR_NOALIGN); - - /* todo: but not yet needed - * return the other stuff - */ - -cleanup: - SAFE_FREE(rparam); - SAFE_FREE(rdata); - - return ret; -} - bool cli_get_fs_volume_info(struct cli_state *cli, fstring volume_name, uint32 *pserial_number, time_t *pdate) { bool ret = False; |