[SCM] Samba Shared Repository - branch v3-4-test updated - release-4-0-0alpha7-374-gc33d62c

[Günther Deschner]

The branch, v3-4-test has been updated
       via  c33d62ca2aa6c470c3dce68920ba0e7f9cdb59b3 (commit)
       via  b0948127557fab056fc81144cbcb3fe077821c03 (commit)
      from  0918711c8cfd69d751ac7d0ab553575c34ea8ff4 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-4-test


- Log -----------------------------------------------------------------
commit c33d62ca2aa6c470c3dce68920ba0e7f9cdb59b3
Author: Günther Deschner <gd at samba.org>
Date:   Sat Mar 14 01:40:32 2009 +0100

    s3-spoolss: remove more unused defines.
    
    Guenther
    (cherry picked from commit 88ca3e17432c3a9efe30b122eea491400de4bdfc)

commit b0948127557fab056fc81144cbcb3fe077821c03
Author: Günther Deschner <gd at samba.org>
Date:   Sat Mar 14 01:35:22 2009 +0100

    s3-spoolss: remove obsolete get_a_builtin_ntform.
    
    Guenther
    (cherry picked from commit 04fd767c0b244082f616b445558c80619ef0363f)

-----------------------------------------------------------------------

Summary of changes:
 source3/include/proto.h        |    1 -
 source3/include/rpc_spoolss.h  |   31 -------------------------------
 source3/printing/nt_printing.c |    7 -------
 3 files changed, 0 insertions(+), 39 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/include/proto.h b/source3/include/proto.h
index 36aad98..9db9c40 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -4793,7 +4793,6 @@ bool nt_printing_init(struct messaging_context *msg_ctx);
 uint32 update_c_setprinter(bool initialize);
 uint32 get_c_setprinter(void);
 int get_builtin_ntforms(nt_forms_struct **list);
-bool get_a_builtin_ntform(UNISTR2 *uni_formname,nt_forms_struct *form);
 bool get_a_builtin_ntform_by_string(const char *form_name, nt_forms_struct *form);
 int get_ntforms(nt_forms_struct **list);
 int write_ntforms(nt_forms_struct **list, int number);
diff --git a/source3/include/rpc_spoolss.h b/source3/include/rpc_spoolss.h
index eb2fdd5..4530802 100644
--- a/source3/include/rpc_spoolss.h
+++ b/source3/include/rpc_spoolss.h
@@ -274,23 +274,6 @@ typedef struct devicemode
 }
 DEVICEMODE;
 
-typedef struct _devmode_cont
-{
-	uint32 size;
-	uint32 devmode_ptr;
-	DEVICEMODE *devmode;
-}
-DEVMODE_CTR;
-
-typedef struct _printer_default
-{
-	uint32 datatype_ptr;
-	UNISTR2 datatype;
-	DEVMODE_CTR devmode_cont;
-	uint32 access_required;
-}
-PRINTER_DEFAULT;
-
 /********************************************/
 
 typedef struct spool_q_getprinterdata
@@ -380,20 +363,6 @@ typedef struct spool_r_setprinterdata
 }
 SPOOL_R_SETPRINTERDATA;
 
-typedef struct _form
-{
-	uint32 flags;
-	uint32 name_ptr;
-	uint32 size_x;
-	uint32 size_y;
-	uint32 left;
-	uint32 top;
-	uint32 right;
-	uint32 bottom;
-	UNISTR2 name;
-}
-FORM;
-
 typedef struct spool_q_enumprinterkey
 {
 	POLICY_HND handle;
diff --git a/source3/printing/nt_printing.c b/source3/printing/nt_printing.c
index d8658e9..12e645f 100644
--- a/source3/printing/nt_printing.c
+++ b/source3/printing/nt_printing.c
@@ -789,13 +789,6 @@ bool get_a_builtin_ntform_by_string(const char *form_name, nt_forms_struct *form
 	return (i !=count);
 }
 
-bool get_a_builtin_ntform(UNISTR2 *uni_formname,nt_forms_struct *form)
-{
-	fstring form_name;
-	unistr2_to_ascii(form_name, uni_formname, sizeof(form_name));
-	return get_a_builtin_ntform_by_string(form_name, form);
-}
-
 /****************************************************************************
  get a form struct list.
 ****************************************************************************/


-- 
Samba Shared Repository