s3-spoolss: remove more unused marshalling code.

Guenther

2 files changed, 0 insertions, 170 deletions

diff --git a/source3/include/proto.h b/source3/include/proto.h
index 95651e5a9e..9badb95a1c 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -5838,24 +5838,6 @@ bool make_spoolss_q_getprinterdata(SPOOL_Q_GETPRINTERDATA *q_u,
 				   const char *valuename, uint32 size);
 bool spoolss_io_q_getprinterdata(const char *desc, SPOOL_Q_GETPRINTERDATA *q_u, prs_struct *ps, int depth);
 bool spoolss_io_r_getprinterdata(const char *desc, SPOOL_R_GETPRINTERDATA *r_u, prs_struct *ps, int depth);
-bool smb_io_printer_info_0(const char *desc, RPC_BUFFER *buffer, PRINTER_INFO_0 *info, int depth);
-bool smb_io_printer_info_1(const char *desc, RPC_BUFFER *buffer, PRINTER_INFO_1 *info, int depth);
-bool smb_io_printer_info_2(const char *desc, RPC_BUFFER *buffer, PRINTER_INFO_2 *info, int depth);
-bool smb_io_printer_info_3(const char *desc, RPC_BUFFER *buffer, PRINTER_INFO_3 *info, int depth);
-bool smb_io_printer_info_4(const char *desc, RPC_BUFFER *buffer, PRINTER_INFO_4 *info, int depth);
-bool smb_io_printer_info_5(const char *desc, RPC_BUFFER *buffer, PRINTER_INFO_5 *info, int depth);
-bool smb_io_printer_info_6(const char *desc, RPC_BUFFER *buffer,
-			   PRINTER_INFO_6 *info, int depth);
-bool smb_io_printer_info_7(const char *desc, RPC_BUFFER *buffer, PRINTER_INFO_7 *info, int depth);
-uint32 spoolss_size_printer_info_0(PRINTER_INFO_0 *info);
-uint32 spoolss_size_printer_info_1(PRINTER_INFO_1 *info);
-uint32 spoolss_size_printer_info_2(PRINTER_INFO_2 *info);
-uint32 spoolss_size_printer_info_4(PRINTER_INFO_4 *info);
-uint32 spoolss_size_printer_info_5(PRINTER_INFO_5 *info);
-uint32 spoolss_size_printer_info_6(PRINTER_INFO_6 *info);
-uint32 spoolss_size_printer_info_3(PRINTER_INFO_3 *info);
-uint32 spoolss_size_printer_info_7(PRINTER_INFO_7 *info);
-uint32 spoolss_size_string_array(uint16 *string);
 uint32 spoolss_size_printer_enum_values(PRINTER_ENUM_VALUES *p);
 bool make_spoolss_buffer5(TALLOC_CTX *mem_ctx, BUFFER5 *buf5, uint32 len, uint16 *src);
 bool spoolss_io_r_enumprinterdata(const char *desc, SPOOL_R_ENUMPRINTERDATA *r_u, prs_struct *ps, int depth);
@@ -5870,14 +5852,6 @@ bool make_spoolss_q_setprinterdata(SPOOL_Q_SETPRINTERDATA *q_u, const POLICY_HND
 				   char* value, uint32 data_type, char* data, uint32 data_size);
 bool spoolss_io_q_setprinterdata(const char *desc, SPOOL_Q_SETPRINTERDATA *q_u, prs_struct *ps, int depth);
 bool spoolss_io_r_setprinterdata(const char *desc, SPOOL_R_SETPRINTERDATA *r_u, prs_struct *ps, int depth);
-void free_devmode(DEVICEMODE *devmode);
-void free_printer_info_1(PRINTER_INFO_1 *printer);
-void free_printer_info_2(PRINTER_INFO_2 *printer);
-void free_printer_info_3(PRINTER_INFO_3 *printer);
-void free_printer_info_4(PRINTER_INFO_4 *printer);
-void free_printer_info_5(PRINTER_INFO_5 *printer);
-void free_printer_info_6(PRINTER_INFO_6 *printer);
-void free_printer_info_7(PRINTER_INFO_7 *printer);
 bool make_spoolss_q_enumprinterkey(SPOOL_Q_ENUMPRINTERKEY *q_u, 
 				   POLICY_HND *hnd, const char *key, 
 				   uint32 size);
diff --git a/source3/include/rpc_spoolss.h b/source3/include/rpc_spoolss.h
index e6a279497d..eb2fdd5309 100644
--- a/source3/include/rpc_spoolss.h
+++ b/source3/include/rpc_spoolss.h
@@ -311,150 +311,6 @@ typedef struct spool_r_getprinterdata
 }
 SPOOL_R_GETPRINTERDATA;
 
-typedef struct printer_info_0
-{
-	UNISTR printername;
-	UNISTR servername;
-	uint32 cjobs;
-	uint32 total_jobs;
-	uint32 total_bytes;
-	
-	uint16 year;
-	uint16 month;
-	uint16 dayofweek;
-	uint16 day;
-	uint16 hour;
-	uint16 minute;
-	uint16 second;
-	uint16 milliseconds;
-
-	uint32 global_counter;
-	uint32 total_pages;
-
-	uint16 major_version;
-	uint16 build_version;
-
-	uint32 unknown7;
-	uint32 unknown8;
-	uint32 unknown9;
-	uint32 session_counter;
-	uint32 unknown11;
-	uint32 printer_errors;
-	uint32 unknown13;
-	uint32 unknown14;
-	uint32 unknown15;
-	uint32 unknown16;
-	uint32 change_id;
-	uint32 unknown18;
-	uint32 status;
-	uint32 unknown20;
-	uint32 c_setprinter;
-
-	uint16 unknown22;
-	uint16 unknown23;
-	uint16 unknown24;
-	uint16 unknown25;
-	uint16 unknown26;
-	uint16 unknown27;
-	uint16 unknown28;
-	uint16 unknown29;
-} PRINTER_INFO_0;
-
-typedef struct printer_info_1
-{
-	uint32 flags;
-	UNISTR description;
-	UNISTR name;
-	UNISTR comment;
-}
-PRINTER_INFO_1;
-
-typedef struct printer_info_2
-{
-	UNISTR servername;
-	UNISTR printername;
-	UNISTR sharename;
-	UNISTR portname;
-	UNISTR drivername;
-	UNISTR comment;
-	UNISTR location;
-	DEVICEMODE *devmode;
-	UNISTR sepfile;
-	UNISTR printprocessor;
-	UNISTR datatype;
-	UNISTR parameters;
-	SEC_DESC *secdesc;
-	uint32 attributes;
-	uint32 priority;
-	uint32 defaultpriority;
-	uint32 starttime;
-	uint32 untiltime;
-	uint32 status;
-	uint32 cjobs;
-	uint32 averageppm;
-}
-PRINTER_INFO_2;
-
-typedef struct printer_info_3
-{
-	SEC_DESC *secdesc;
-}
-PRINTER_INFO_3;
-
-typedef struct printer_info_4
-{
-	UNISTR printername;
-	UNISTR servername;
-	uint32 attributes;
-}
-PRINTER_INFO_4;
-
-typedef struct printer_info_5
-{
-	UNISTR printername;
-	UNISTR portname;
-	uint32 attributes;
-	uint32 device_not_selected_timeout;
-	uint32 transmission_retry_timeout;
-}
-PRINTER_INFO_5;
-
-typedef struct printer_info_6
-{
-	uint32 status;
-}
-PRINTER_INFO_6;
-
-typedef struct printer_info_7
-{
-	UNISTR guid; /* text form of printer guid */
-	uint32 action;
-}
-PRINTER_INFO_7;
-
-typedef struct printer_info_ctr_info
-{
-	PRINTER_INFO_0 *printers_0;
-	PRINTER_INFO_1 *printers_1;
-	PRINTER_INFO_2 *printers_2;
-	PRINTER_INFO_3 *printers_3;
-	PRINTER_INFO_4 *printers_4;
-	PRINTER_INFO_5 *printers_5;
-	PRINTER_INFO_7 *printers_7;
-}
-PRINTER_INFO_CTR;
-
-typedef struct printer_info_info
-{
-	union
-	{
-		PRINTER_INFO_0 *info0;
-		PRINTER_INFO_1 *info1;
-		PRINTER_INFO_2 *info2;
-		void *info;
-	} printer;
-} PRINTER_INFO;
-
 typedef struct add_jobinfo_1
 {
 	UNISTR path;