s3: Remove some unused code

diff --git a/source3/include/proto.h b/source3/include/proto.h
index 177c3334d9e628f53e9d1af6c29cc27531ddc150..0660e77c732288598d84512d054f8f61064d009f 100644 (file)
--- 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);
                                             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,
 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 48c378259d3582837e094ba88680a0e01e83e007..08c0252eb831785ede72b18f44b34e6440e584af 100644 (file)
--- a/source3/libsmb/clifsinfo.c
+++ b/source3/libsmb/clifsinfo.c
@@ -348,63 +348,6 @@ fail:
        return status;
 }
 
        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;
 bool cli_get_fs_volume_info(struct cli_state *cli, fstring volume_name, uint32 *pserial_number, time_t *pdate)
 {
        bool ret = False;